diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta index b22cc1cd15..9e8363178a 100644 --- a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr-theme-Confluence" -PKG_VERSION="84817e6" +PKG_VERSION="a62f4d4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 38e464484a..dbb9b6d1da 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr" -PKG_VERSION="84817e6" +PKG_VERSION="a62f4d4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-901.01-ee1a1e2c428b5923da9c39f5a78bc9208e4f2047.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-901.01-ee1a1e2c428b5923da9c39f5a78bc9208e4f2047.patch deleted file mode 100644 index ee5b7d24c9..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-901.01-ee1a1e2c428b5923da9c39f5a78bc9208e4f2047.patch +++ /dev/null @@ -1,255 +0,0 @@ -From ee1a1e2c428b5923da9c39f5a78bc9208e4f2047 Mon Sep 17 00:00:00 2001 -From: CrystalP -Date: Mon, 2 Jan 2012 02:48:24 -0500 -Subject: [PATCH] [WIN] fix reporting system memory > 4GB. Need to use - GlobalMemoryEx/MEMORYSTATUSEX instead of GlobalMemory - ---- - xbmc/GUIInfoManager.cpp | 13 ++++---- - xbmc/guilib/TextureBundleXPR.cpp | 9 +++-- - xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp | 7 ++-- - xbmc/linux/PlatformDefs.h | 12 ++++---- - xbmc/linux/XSyncUtils.cpp | 36 ++++++++++----------- - xbmc/linux/XSyncUtils.h | 2 +- - xbmc/windows/GUIWindowDebugInfo.cpp | 11 ++++--- - 7 files changed, 46 insertions(+), 44 deletions(-) - -diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp -index 0e73d84..1faac26 100644 ---- a/xbmc/GUIInfoManager.cpp -+++ b/xbmc/GUIInfoManager.cpp -@@ -1393,21 +1393,22 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow) - case SYSTEM_USED_MEMORY_PERCENT: - case SYSTEM_TOTAL_MEMORY: - { -- MEMORYSTATUS stat; -- GlobalMemoryStatus(&stat); -- int iMemPercentFree = 100 - ((int)( 100.0f* (stat.dwTotalPhys - stat.dwAvailPhys)/stat.dwTotalPhys + 0.5f )); -+ MEMORYSTATUSEX stat; -+ stat.dwLength = sizeof(MEMORYSTATUSEX); -+ GlobalMemoryStatusEx(&stat); -+ int iMemPercentFree = 100 - ((int)( 100.0f* (stat.ullTotalPhys - stat.ullAvailPhys)/stat.ullTotalPhys + 0.5f )); - int iMemPercentUsed = 100 - iMemPercentFree; - - if (info == SYSTEM_FREE_MEMORY) -- strLabel.Format("%luMB", (ULONG)(stat.dwAvailPhys/MB)); -+ strLabel.Format("%luMB", (ULONG)(stat.ullAvailPhys/MB)); - else if (info == SYSTEM_FREE_MEMORY_PERCENT) - strLabel.Format("%i%%", iMemPercentFree); - else if (info == SYSTEM_USED_MEMORY) -- strLabel.Format("%luMB", (ULONG)((stat.dwTotalPhys - stat.dwAvailPhys)/MB)); -+ strLabel.Format("%luMB", (ULONG)((stat.ullTotalPhys - stat.ullAvailPhys)/MB)); - else if (info == SYSTEM_USED_MEMORY_PERCENT) - strLabel.Format("%i%%", iMemPercentUsed); - else if (info == SYSTEM_TOTAL_MEMORY) -- strLabel.Format("%luMB", (ULONG)(stat.dwTotalPhys/MB)); -+ strLabel.Format("%luMB", (ULONG)(stat.ullTotalPhys/MB)); - } - break; - case SYSTEM_SCREEN_MODE: -diff --git a/xbmc/guilib/TextureBundleXPR.cpp b/xbmc/guilib/TextureBundleXPR.cpp -index d6df822..037b4c6 100644 ---- a/xbmc/guilib/TextureBundleXPR.cpp -+++ b/xbmc/guilib/TextureBundleXPR.cpp -@@ -279,10 +279,11 @@ bool CTextureBundleXPR::LoadFile(const CStdString& Filename, CAutoTexBuffer& Unp - if (!buffer || !UnpackedBuf.Set((BYTE*)XPhysicalAlloc(file->second.UnpackedSize, MAXULONG_PTR, 128, PAGE_READWRITE))) - { // failed due to lack of memory - #ifndef _LINUX -- MEMORYSTATUS stat; -- GlobalMemoryStatus(&stat); -- CLog::Log(LOGERROR, "Out of memory loading texture: %s (need %lu bytes, have %lu bytes)", name.c_str(), -- file->second.UnpackedSize + file->second.PackedSize, stat.dwAvailPhys); -+ MEMORYSTATUSEX stat; -+ stat.dwLength = sizeof(MEMORYSTATUSEX); -+ GlobalMemoryStatusEx(&stat); -+ CLog::Log(LOGERROR, "Out of memory loading texture: %s (need %lu bytes, have %"PRIu64" bytes)", name.c_str(), -+ file->second.UnpackedSize + file->second.PackedSize, stat.ullAvailPhys); - #elif defined(__APPLE__) || defined(__FreeBSD__) - CLog::Log(LOGERROR, "Out of memory loading texture: %s (need %d bytes)", name.c_str(), - file->second.UnpackedSize + file->second.PackedSize); -diff --git a/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp b/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp -index 22ebe2e..910b0cc 100644 ---- a/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp -+++ b/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp -@@ -434,9 +434,10 @@ - - PyObject* XBMC_GetFreeMem(PyObject *self, PyObject *args) - { -- MEMORYSTATUS stat; -- GlobalMemoryStatus(&stat); -- return PyInt_FromLong( stat.dwAvailPhys / ( 1024 * 1024 ) ); -+ MEMORYSTATUSEX stat; -+ stat.dwLength = sizeof(MEMORYSTATUSEX); -+ GlobalMemoryStatusEx(&stat); -+ return PyInt_FromLong( stat.ullAvailPhys / ( 1024 * 1024 ) ); - } - - // getCpuTemp() method -diff --git a/xbmc/linux/PlatformDefs.h b/xbmc/linux/PlatformDefs.h -index 8910bbc..aaed576 100644 ---- a/xbmc/linux/PlatformDefs.h -+++ b/xbmc/linux/PlatformDefs.h -@@ -423,18 +423,18 @@ struct _stati64 { - #define _stat stat - - // Memory --typedef struct _MEMORYSTATUS -+typedef struct _MEMORYSTATUSEX - { - DWORD dwLength; - DWORD dwMemoryLoad; - - uint64_t dwTotalPhys; - uint64_t dwAvailPhys; -- uint64_t dwTotalPageFile; -- uint64_t dwAvailPageFile; -- uint64_t dwTotalVirtual; -- uint64_t dwAvailVirtual; --} MEMORYSTATUS, *LPMEMORYSTATUS; -+ uint64_t ullTotalPageFile; -+ uint64_t ullAvailPageFile; -+ uint64_t ullTotalVirtual; -+ uint64_t ullAvailVirtual; -+} MEMORYSTATUSEX, *LPMEMORYSTATUSEX; - - // Common HRESULT values - #ifndef NOERROR -diff --git a/xbmc/linux/XSyncUtils.cpp b/xbmc/linux/XSyncUtils.cpp -index 454ff85..19c4b5a 100644 ---- a/xbmc/linux/XSyncUtils.cpp -+++ b/xbmc/linux/XSyncUtils.cpp -@@ -47,13 +47,12 @@ - static FILE* procMeminfoFP = NULL; - #endif - --void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) -+void GlobalMemoryStatusEx(LPMEMORYSTATUSEX lpBuffer) - { - if (!lpBuffer) - return; - -- memset(lpBuffer, 0, sizeof(MEMORYSTATUS)); -- lpBuffer->dwLength = sizeof(MEMORYSTATUS); -+ memset(lpBuffer, 0, sizeof(MEMORYSTATUSEX)); - - #ifdef __APPLE__ - uint64_t physmem; -@@ -63,7 +62,7 @@ void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) - - // Total physical memory. - if (sysctl(mib, miblen, &physmem, &len, NULL, 0) == 0 && len == sizeof (physmem)) -- lpBuffer->dwTotalPhys = physmem; -+ lpBuffer->ullTotalPhys = physmem; - - // Virtual memory. - mib[0] = CTL_VM; mib[1] = VM_SWAPUSAGE; -@@ -71,8 +70,8 @@ void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) - len = sizeof(struct xsw_usage); - if (sysctl(mib, miblen, &swap, &len, NULL, 0) == 0) - { -- lpBuffer->dwAvailPageFile = swap.xsu_avail; -- lpBuffer->dwTotalVirtual = lpBuffer->dwTotalPhys + swap.xsu_total; -+ lpBuffer->ullAvailPageFile = swap.xsu_avail; -+ lpBuffer->ullTotalVirtual = lpBuffer->ullTotalPhys + swap.xsu_total; - } - - // In use. -@@ -89,8 +88,8 @@ void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) - { - uint64_t used = (vm_stat.active_count + vm_stat.inactive_count + vm_stat.wire_count) * pageSize; - -- lpBuffer->dwAvailPhys = lpBuffer->dwTotalPhys - used; -- lpBuffer->dwAvailVirtual = lpBuffer->dwAvailPhys; // FIXME. -+ lpBuffer->ullAvailPhys = lpBuffer->ullTotalPhys - used; -+ lpBuffer->ullAvailVirtual = lpBuffer->ullAvailPhys; // FIXME. - } - } - #elif defined(__FreeBSD__) -@@ -101,8 +100,8 @@ void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) - /* physmem */ - len = sizeof(physmem); - if (sysctlbyname("hw.physmem", &physmem, &len, NULL, 0) == 0) { -- lpBuffer->dwTotalPhys = physmem; -- lpBuffer->dwTotalVirtual = physmem; -+ lpBuffer->ullTotalPhys = physmem; -+ lpBuffer->ullTotalVirtual = physmem; - } - /* pagesize */ - len = sizeof(pagesize); -@@ -122,11 +121,11 @@ void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) - mem_free *= pagesize; - - /* mem_avail = mem_inactive + mem_cache + mem_free */ -- lpBuffer->dwAvailPhys = mem_inactive + mem_cache + mem_free; -- lpBuffer->dwAvailVirtual = mem_inactive + mem_cache + mem_free; -+ lpBuffer->ullAvailPhys = mem_inactive + mem_cache + mem_free; -+ lpBuffer->ullAvailVirtual = mem_inactive + mem_cache + mem_free; - - if (sysctlbyname("vm.stats.vm.v_swappgsout", &swap_free, &len, NULL, 0) == 0) -- lpBuffer->dwAvailPageFile = swap_free * pagesize; -+ lpBuffer->ullAvailPageFile = swap_free * pagesize; - #else - struct sysinfo info; - char name[32]; -@@ -159,12 +158,11 @@ void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) - rewind(procMeminfoFP); - fflush(procMeminfoFP); - } -- lpBuffer->dwLength = sizeof(MEMORYSTATUS); -- lpBuffer->dwAvailPageFile = (info.freeswap * info.mem_unit); -- lpBuffer->dwAvailPhys = ((info.freeram + info.bufferram) * info.mem_unit); -- lpBuffer->dwAvailVirtual = ((info.freeram + info.bufferram) * info.mem_unit); -- lpBuffer->dwTotalPhys = (info.totalram * info.mem_unit); -- lpBuffer->dwTotalVirtual = (info.totalram * info.mem_unit); -+ lpBuffer->ullAvailPageFile = (info.freeswap * info.mem_unit); -+ lpBuffer->ullAvailPhys = ((info.freeram + info.bufferram) * info.mem_unit); -+ lpBuffer->ullAvailVirtual = ((info.freeram + info.bufferram) * info.mem_unit); -+ lpBuffer->ullTotalPhys = (info.totalram * info.mem_unit); -+ lpBuffer->ullTotalVirtual = (info.totalram * info.mem_unit); - #endif - } - -diff --git a/xbmc/linux/XSyncUtils.h b/xbmc/linux/XSyncUtils.h -index c8effa2..f3ad36f 100644 ---- a/xbmc/linux/XSyncUtils.h -+++ b/xbmc/linux/XSyncUtils.h -@@ -36,7 +36,7 @@ - #define WAIT_ABANDONED ((STATUS_ABANDONED_WAIT_0 ) + 0 ) - #define WAIT_ABANDONED_0 ((STATUS_ABANDONED_WAIT_0 ) + 0 ) - --void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer); -+void GlobalMemoryStatusEx(LPMEMORYSTATUSEX lpBuffer); - - #endif - -diff --git a/xbmc/windows/GUIWindowDebugInfo.cpp b/xbmc/windows/GUIWindowDebugInfo.cpp -index 1b2bafa..916b032 100644 ---- a/xbmc/windows/GUIWindowDebugInfo.cpp -+++ b/xbmc/windows/GUIWindowDebugInfo.cpp -@@ -97,17 +97,18 @@ void CGUIWindowDebugInfo::Process(unsigned int currentTime, CDirtyRegionList &di - CStdString info; - if (LOG_LEVEL_DEBUG_FREEMEM <= g_advancedSettings.m_logLevel) - { -- MEMORYSTATUS stat; -- GlobalMemoryStatus(&stat); -+ MEMORYSTATUSEX stat; -+ stat.dwLength = sizeof(MEMORYSTATUSEX); -+ GlobalMemoryStatusEx(&stat); - CStdString profiling = CGUIControlProfiler::IsRunning() ? " (profiling)" : ""; - CStdString strCores = g_cpuInfo.GetCoresUsageString(); - #if !defined(_LINUX) -- info.Format("LOG: %sxbmc.log\nMEM: %d/%d KB - FPS: %2.1f fps\nCPU: %s%s", g_settings.m_logFolder.c_str(), -- stat.dwAvailPhys/1024, stat.dwTotalPhys/1024, g_infoManager.GetFPS(), strCores.c_str(), profiling.c_str()); -+ info.Format("LOG: %sxbmc.log\nMEM: %"PRIu64"/%"PRIu64" KB - FPS: %2.1f fps\nCPU: %s%s", g_settings.m_logFolder.c_str(), -+ stat.ullAvailPhys/1024, stat.ullTotalPhys/1024, g_infoManager.GetFPS(), strCores.c_str(), profiling.c_str()); - #else - double dCPU = m_resourceCounter.GetCPUUsage(); - info.Format("LOG: %sxbmc.log\nMEM: %"PRIu64"/%"PRIu64" KB - FPS: %2.1f fps\nCPU: %s (CPU-XBMC %4.2f%%%s)", g_settings.m_logFolder.c_str(), -- stat.dwAvailPhys/1024, stat.dwTotalPhys/1024, g_infoManager.GetFPS(), strCores.c_str(), dCPU, profiling.c_str()); -+ stat.ullAvailPhys/1024, stat.ullTotalPhys/1024, g_infoManager.GetFPS(), strCores.c_str(), dCPU, profiling.c_str()); - #endif - } - --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-901.02-2f91d0ca3735ab9b1abbfe6e3c6613e56951b7d2.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-901.02-2f91d0ca3735ab9b1abbfe6e3c6613e56951b7d2.patch deleted file mode 100644 index 47a1a55512..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-901.02-2f91d0ca3735ab9b1abbfe6e3c6613e56951b7d2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2f91d0ca3735ab9b1abbfe6e3c6613e56951b7d2 Mon Sep 17 00:00:00 2001 -From: wsoltys -Date: Mon, 2 Jan 2012 11:13:02 +0100 -Subject: [PATCH] fixed: Linux compiler error (hopefully) - ---- - xbmc/linux/PlatformDefs.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/linux/PlatformDefs.h b/xbmc/linux/PlatformDefs.h -index aaed576..33d1c96 100644 ---- a/xbmc/linux/PlatformDefs.h -+++ b/xbmc/linux/PlatformDefs.h -@@ -428,8 +428,8 @@ struct _stati64 { - DWORD dwLength; - DWORD dwMemoryLoad; - -- uint64_t dwTotalPhys; -- uint64_t dwAvailPhys; -+ uint64_t ullTotalPhys; -+ uint64_t ullAvailPhys; - uint64_t ullTotalPageFile; - uint64_t ullAvailPageFile; - uint64_t ullTotalVirtual; --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-901.03-32df6ef9fc30cd2215e2a0886ceb5dab368ee31a.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-901.03-32df6ef9fc30cd2215e2a0886ceb5dab368ee31a.patch deleted file mode 100644 index 559a4b8cfb..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-901.03-32df6ef9fc30cd2215e2a0886ceb5dab368ee31a.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 32df6ef9fc30cd2215e2a0886ceb5dab368ee31a Mon Sep 17 00:00:00 2001 -From: arnova -Date: Mon, 2 Jan 2012 11:41:02 +0100 -Subject: [PATCH] fixed: Linux compiler error (again) - ---- - xbmc/GUIInfoManager.cpp | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp -index 1faac26..0102008 100644 ---- a/xbmc/GUIInfoManager.cpp -+++ b/xbmc/GUIInfoManager.cpp -@@ -1708,9 +1708,10 @@ bool CGUIInfoManager::GetInt(int &value, int info, int contextWindow, const CGUI - case SYSTEM_FREE_MEMORY: - case SYSTEM_USED_MEMORY: - { -- MEMORYSTATUS stat; -- GlobalMemoryStatus(&stat); -- int memPercentUsed = (int)( 100.0f* (stat.dwTotalPhys - stat.dwAvailPhys)/stat.dwTotalPhys + 0.5f ); -+ MEMORYSTATUSEX stat; -+ stat.dwLength = sizeof(MEMORYSTATUSEX); -+ GlobalMemoryStatusEx(&stat); -+ int memPercentUsed = (int)( 100.0f* (stat.ullTotalPhys - stat.ullAvailPhys)/stat.ullTotalPhys + 0.5f ); - if (info == SYSTEM_FREE_MEMORY) - value = 100 - memPercentUsed; - else --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-951-vdpau_fix_deinterlacing_if_flag_toggles.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-951-vdpau_fix_deinterlacing_if_flag_toggles.patch deleted file mode 100644 index 83b3ba6054..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-951-vdpau_fix_deinterlacing_if_flag_toggles.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index d4892b5..697431c 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -943,6 +943,7 @@ bool CVDPAU::ConfigVDPAU(AVCodecContext* avctx, int ref_frames) - - m_vdpauOutputMethod = OUTPUT_NONE; - -+ m_binterlacedFrame = false; - return true; - } - -@@ -1203,8 +1204,14 @@ int CVDPAU::Decode(AVCodecContext *avctx, AVFrame *pFrame) - m_DVDVideoPics.pop(); - } - -+ if (!m_binterlacedFrame && m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED) -+ { -+ m_binterlacedFrame = m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED; -+ CLog::Log(LOGNOTICE, "CVDPAU::ConfigOutputMethod: detected interlaced frame"); -+ } -+ - if (mode == VS_DEINTERLACEMODE_FORCE -- || (mode == VS_DEINTERLACEMODE_AUTO && m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED)) -+ || (mode == VS_DEINTERLACEMODE_AUTO && m_binterlacedFrame)) - { - if((method == VS_INTERLACEMETHOD_AUTO_ION - || method == VS_INTERLACEMETHOD_VDPAU_BOB -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -index 2056de1..fc1b9d0 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -@@ -209,6 +209,7 @@ public: - uint32_t max_references; - Display* m_Display; - bool vdpauConfigured; -+ bool m_binterlacedFrame; - - - VdpVideoMixerPictureStructure m_mixerfield; diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-991-pathsubst.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-991-pathsubst.patch deleted file mode 100644 index 729af06bcb..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-991-pathsubst.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 36eb715..c776f65 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -4322,7 +4322,7 @@ void CApplication::CheckScreenSaverAndDPMS() - WakeUpScreenSaver(); - } - else if (maybeScreensaver -- && elapsed > g_guiSettings.GetInt("screensaver.time") * 60) -+ && elapsed > g_guiSettings.GetInt("screensaver.time") * 10) - { - ActivateScreenSaver(); - } -diff --git a/xbmc/filesystem/DirectoryCache.cpp b/xbmc/filesystem/DirectoryCache.cpp -index e3fb399..84bc32e 100644 ---- a/xbmc/filesystem/DirectoryCache.cpp -+++ b/xbmc/filesystem/DirectoryCache.cpp -@@ -67,7 +67,7 @@ bool CDirectoryCache::GetDirectory(const CStdString& strPath, CFileItemList &ite - { - CSingleLock lock (m_cs); - -- CStdString storedPath = strPath; -+ CStdString storedPath = URIUtils::SubstitutePath(strPath); - URIUtils::RemoveSlashAtEnd(storedPath); - - ciCache i = m_cache.find(storedPath); -@@ -106,7 +106,7 @@ void CDirectoryCache::SetDirectory(const CStdString& strPath, const CFileItemLis - // this is the best solution for now. - CSingleLock lock (m_cs); - -- CStdString storedPath = strPath; -+ CStdString storedPath = URIUtils::SubstitutePath(strPath); - URIUtils::RemoveSlashAtEnd(storedPath); - - ClearDirectory(storedPath); -@@ -130,7 +130,7 @@ void CDirectoryCache::ClearDirectory(const CStdString& strPath) - { - CSingleLock lock (m_cs); - -- CStdString storedPath = strPath; -+ CStdString storedPath = URIUtils::SubstitutePath(strPath); - URIUtils::RemoveSlashAtEnd(storedPath); - - iCache i = m_cache.find(storedPath); -@@ -142,7 +142,7 @@ void CDirectoryCache::ClearSubPaths(const CStdString& strPath) - { - CSingleLock lock (m_cs); - -- CStdString storedPath = strPath; -+ CStdString storedPath = URIUtils::SubstitutePath(strPath); - URIUtils::RemoveSlashAtEnd(storedPath); - - iCache i = m_cache.begin(); -diff --git a/xbmc/filesystem/File.cpp b/xbmc/filesystem/File.cpp -index 415f2bf..375226e 100644 ---- a/xbmc/filesystem/File.cpp -+++ b/xbmc/filesystem/File.cpp -@@ -217,16 +217,15 @@ bool CFile::Open(const CStdString& strFileName, unsigned int flags) - try - { - bool bPathInCache; -- CURL url2(strFileName); -- if (url2.GetProtocol() == "zip") -- url2.SetOptions(""); -- if (!g_directoryCache.FileExists(url2.Get(), bPathInCache) ) -+ CURL url(URIUtils::SubstitutePath(strFileName)); -+ if (url.GetProtocol() == "zip") -+ url.SetOptions(""); -+ if (!g_directoryCache.FileExists(url.Get(), bPathInCache) ) - { - if (bPathInCache) - return false; - } - -- CURL url(URIUtils::SubstitutePath(strFileName)); - if ( (flags & READ_NO_CACHE) == 0 && URIUtils::IsInternetStream(url) && !CUtil::IsPicture(strFileName) ) - m_flags |= READ_CACHED; - -@@ -344,7 +343,7 @@ bool CFile::OpenForWrite(const CStdString& strFileName, bool bOverWrite) - - bool CFile::Exists(const CStdString& strFileName, bool bUseCache /* = true */) - { -- CURL url; -+ CURL url(URIUtils::SubstitutePath(strFileName)); - - try - { -@@ -354,14 +353,12 @@ bool CFile::Exists(const CStdString& strFileName, bool bUseCache /* = true */) - if (bUseCache) - { - bool bPathInCache; -- if (g_directoryCache.FileExists(strFileName, bPathInCache) ) -+ if (g_directoryCache.FileExists(url.Get(), bPathInCache) ) - return true; - if (bPathInCache) - return false; - } - -- url = URIUtils::SubstitutePath(strFileName); -- - auto_ptr pFile(CFileFactory::CreateLoader(url)); - if (!pFile.get()) - return false; diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-992-067004b0301366cb4bafc22dff21ec396e044bb7.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-992-067004b0301366cb4bafc22dff21ec396e044bb7.patch deleted file mode 100644 index 1944407da6..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-992-067004b0301366cb4bafc22dff21ec396e044bb7.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 067004b0301366cb4bafc22dff21ec396e044bb7 Mon Sep 17 00:00:00 2001 -From: arnova -Date: Wed, 21 Dec 2011 13:59:13 +0100 -Subject: [PATCH] [SDL] fixed: Crash when mixer fails to initialise - ---- - xbmc/guilib/GUIAudioManager.cpp | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/xbmc/guilib/GUIAudioManager.cpp b/xbmc/guilib/GUIAudioManager.cpp -index 83f4e40..db58426 100644 ---- a/xbmc/guilib/GUIAudioManager.cpp -+++ b/xbmc/guilib/GUIAudioManager.cpp -@@ -73,8 +73,10 @@ void CGUIAudioManager::Initialize(int iDevice) - #elif defined(HAS_SDL_AUDIO) - Mix_CloseAudio(); - if (Mix_OpenAudio(44100, AUDIO_S16, 2, 4096)) -- CLog::Log(LOGERROR, "Unable to open audio mixer"); -- Mix_Volume(0, (int)(128.f * (g_settings.m_nVolumeLevel - VOLUME_MINIMUM) / (float)(VOLUME_MAXIMUM - VOLUME_MINIMUM))); -+ CLog::Log(LOGERROR, "Unable to open audio mixer"); -+ else -+ Mix_Volume(0, (int)(128.f * (g_settings.m_nVolumeLevel - VOLUME_MINIMUM) / (float)(VOLUME_MAXIMUM - VOLUME_MINIMUM))); -+ - m_bInitialized = true; - #endif - } --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-993-do_not_unload_libcurl.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-993-do_not_unload_libcurl.patch deleted file mode 100644 index 49f4059029..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-993-do_not_unload_libcurl.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/xbmc/filesystem/DllLibCurl.cpp b/xbmc/filesystem/DllLibCurl.cpp -index f93e693..65ecad8 100644 ---- a/xbmc/filesystem/DllLibCurl.cpp -+++ b/xbmc/filesystem/DllLibCurl.cpp -@@ -39,7 +39,7 @@ bool DllLibCurlGlobal::Load() - CSingleLock lock(m_critSection); - if(g_curlReferences > 0) - { -- g_curlReferences++; -+ //g_curlReferences++; - return true; - } - -@@ -56,13 +56,16 @@ bool DllLibCurlGlobal::Load() - } - - /* check idle will clean up the last one */ -- g_curlReferences = 2; -+ //g_curlReferences = 2; -+ g_curlReferences = 1; - - return true; - } - - void DllLibCurlGlobal::Unload() - { -+ return; -+ /* - CSingleLock lock(m_critSection); - if (--g_curlReferences == 0) - { -@@ -75,19 +78,22 @@ void DllLibCurlGlobal::Unload() - DllDynamic::Unload(); - } - -- /* CheckIdle will clear this one up */ -+ // CheckIdle will clear this one up - if(g_curlReferences == 1) - g_curlTimeout = XbmcThreads::SystemClockMillis(); -+ */ - } - - void DllLibCurlGlobal::CheckIdle() - { - /* avoid locking section here, to avoid stalling gfx thread on loads*/ -+ return; -+ /* - if(g_curlReferences == 0) - return; - - CSingleLock lock(m_critSection); -- /* 20 seconds idle time before closing handle */ -+ // 20 seconds idle time before closing handle - const unsigned int idletime = 30000; - - VEC_CURLSESSIONS::iterator it = m_sessions.begin(); -@@ -112,9 +118,10 @@ void DllLibCurlGlobal::CheckIdle() - it++; - } - -- /* check if we should unload the dll */ -+ // check if we should unload the dll - if(g_curlReferences == 1 && XbmcThreads::SystemClockMillis() - g_curlTimeout > idletime) - Unload(); -+ */ - } - - void DllLibCurlGlobal::easy_aquire(const char *protocol, const char *hostname, CURL_HANDLE** easy_handle, CURLM** multi_handle) - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-994-505b702af7025ad977558e75d25764744c47f5a3.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-994-505b702af7025ad977558e75d25764744c47f5a3.patch deleted file mode 100644 index ba54709dab..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-994-505b702af7025ad977558e75d25764744c47f5a3.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 505b702af7025ad977558e75d25764744c47f5a3 Mon Sep 17 00:00:00 2001 -From: vdrfan -Date: Wed, 28 Dec 2011 00:31:07 +0100 -Subject: [PATCH] fixed: reverted File.cpp parts of - 23607e247c0074d88464a39eca643897550cb70 as they were - causing troubles - ---- - xbmc/filesystem/File.cpp | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/xbmc/filesystem/File.cpp b/xbmc/filesystem/File.cpp -index 375226e..ef16255 100644 ---- a/xbmc/filesystem/File.cpp -+++ b/xbmc/filesystem/File.cpp -@@ -217,15 +217,16 @@ bool CFile::Open(const CStdString& strFileName, unsigned int flags) - try - { - bool bPathInCache; -- CURL url(URIUtils::SubstitutePath(strFileName)); -- if (url.GetProtocol() == "zip") -- url.SetOptions(""); -- if (!g_directoryCache.FileExists(url.Get(), bPathInCache) ) -+ CURL url2(strFileName); -+ if (url2.GetProtocol() == "zip") -+ url2.SetOptions(""); -+ if (!g_directoryCache.FileExists(url2.Get(), bPathInCache) ) - { - if (bPathInCache) - return false; - } - -+ CURL url(URIUtils::SubstitutePath(strFileName)); - if ( (flags & READ_NO_CACHE) == 0 && URIUtils::IsInternetStream(url) && !CUtil::IsPicture(strFileName) ) - m_flags |= READ_CACHED; - -@@ -343,7 +344,7 @@ bool CFile::OpenForWrite(const CStdString& strFileName, bool bOverWrite) - - bool CFile::Exists(const CStdString& strFileName, bool bUseCache /* = true */) - { -- CURL url(URIUtils::SubstitutePath(strFileName)); -+ CURL url; - - try - { -@@ -353,12 +354,13 @@ bool CFile::Exists(const CStdString& strFileName, bool bUseCache /* = true */) - if (bUseCache) - { - bool bPathInCache; -- if (g_directoryCache.FileExists(url.Get(), bPathInCache) ) -+ if (g_directoryCache.FileExists(strFileName, bPathInCache) ) - return true; - if (bPathInCache) - return false; - } - -+ url = URIUtils::SubstitutePath(strFileName); - auto_ptr pFile(CFileFactory::CreateLoader(url)); - if (!pFile.get()) - return false; --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.01-Rearrange_Autorun.cpp_so_audio_cds_actually_play_on.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.01-Rearrange_Autorun.cpp_so_audio_cds_actually_play_on.patch deleted file mode 100644 index ad2123c5b2..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.01-Rearrange_Autorun.cpp_so_audio_cds_actually_play_on.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 71a2ad0ebd13e0e2d5e830170705f9290cd06c51 Mon Sep 17 00:00:00 2001 -From: Lee Pollock -Date: Tue, 29 Nov 2011 19:01:56 +0000 -Subject: [PATCH] Rearrange Autorun.cpp so audio cds actually play on - PlayDVD() - ---- - xbmc/Autorun.cpp | 52 ++++++++++++++++++++++++++++++++-------------------- - xbmc/Autorun.h | 2 +- - 2 files changed, 33 insertions(+), 21 deletions(-) - -diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp -index 292c66d..f7ae918 100644 ---- a/xbmc/Autorun.cpp -+++ b/xbmc/Autorun.cpp -@@ -69,38 +69,25 @@ void CAutorun::ExecuteAutorun( bool bypassSettings, bool ignoreplaying, bool sta - g_application.ResetScreenSaver(); - g_application.WakeUpScreenSaverAndDPMS(); // turn off the screensaver if it's active - -- if ( pInfo->IsAudio( 1 ) ) -- { -- if( !bypassSettings && !g_guiSettings.GetBool("audiocds.autorun") ) -- return; -- -- if (!g_passwordManager.IsMasterLockUnlocked(false)) -- if (g_settings.GetCurrentProfile().musicLocked()) -- return ; -- -- RunCdda(); -- } -- else -- { -- RunMedia(bypassSettings, startFromBeginning); -- } -+ RunMedia(bypassSettings, startFromBeginning); - } - --void CAutorun::RunCdda() -+bool CAutorun::RunCdda() - { - CFileItemList vecItems; - - auto_ptr pDir ( CFactoryDirectory::Create( "cdda://local/" ) ); - if ( !pDir->GetDirectory( "cdda://local/", vecItems ) ) -- return ; -+ return false; - - if ( vecItems.Size() <= 0 ) -- return ; -+ return false; - - g_playlistPlayer.ClearPlaylist(PLAYLIST_MUSIC); - g_playlistPlayer.Add(PLAYLIST_MUSIC, vecItems); - g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_MUSIC); - g_playlistPlayer.Play(); -+ return true; - } - - void CAutorun::RunMedia(bool bypassSettings, bool startFromBeginning) -@@ -167,8 +154,22 @@ bool CAutorun::RunDisc(IDirectory* pDir, const CStdString& strDrive, int& nAdded - // is this a root folder we have to check the content to determine a disc type - if( bRoot ) - { -+ // check for audio cd first -+ CCdInfo* pInfo = g_mediaManager.GetCdInfo(); -+ -+ if ( pInfo->IsAudio( 1 ) ) -+ { -+ if( !bypassSettings && !g_guiSettings.GetBool("audiocds.autorun") ) -+ return false; - -- // check root folders first, for normal structured dvd's -+ if (!g_passwordManager.IsMasterLockUnlocked(false)) -+ if (g_settings.GetCurrentProfile().musicLocked()) -+ return false; -+ bPlaying = RunCdda(); -+ return bPlaying; -+ } -+ -+ // check root folders next, for normal structured dvd's - for (int i = 0; i < vecItems.Size(); i++) - { - CFileItemPtr pItem = vecItems[i]; -@@ -390,9 +391,20 @@ bool CAutorun::IsEnabled() const - - bool CAutorun::PlayDisc(const CStdString& path, bool startFromBeginning) - { -+ int nSize = g_playlistPlayer.GetPlaylist( PLAYLIST_MUSIC ).size(); - int nAddedToPlaylist = 0; - auto_ptr pDir ( CFactoryDirectory::Create( path )); -- return RunDisc(pDir.get(), path, nAddedToPlaylist, true, true, startFromBeginning); -+ bool bPlaying = RunDisc(pDir.get(), path, nAddedToPlaylist, true, true, startFromBeginning); -+ if ( !bPlaying && nAddedToPlaylist > 0 ) -+ { -+ CGUIMessage msg( GUI_MSG_PLAYLIST_CHANGED, 0, 0 ); -+ g_windowManager.SendMessage( msg ); -+ g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_MUSIC); -+ // Start playing the items we inserted -+ g_playlistPlayer.Play(nSize); -+ bPlaying = true; -+ } -+ return bPlaying; - } - - bool CAutorun::PlayDiscAskResume(const CStdString& path) -diff --git a/xbmc/Autorun.h b/xbmc/Autorun.h -index 39f34ae..7280d9d 100644 ---- a/xbmc/Autorun.h -+++ b/xbmc/Autorun.h -@@ -56,7 +56,7 @@ class CAutorun - void HandleAutorun(); - static void ExecuteAutorun(bool bypassSettings = false, bool ignoreplaying = false, bool startFromBeginning = false); - protected: -- static void RunCdda(); -+ static bool RunCdda(); - static void RunMedia(bool bypassSettings, bool startFromBeginning); - static bool RunDisc(XFILE::IDirectory* pDir, const CStdString& strDrive, int& nAddedToPlaylist, bool bRoot, bool bypassSettings, bool startFromBeginning); - bool m_bEnable; --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.02-fix_resume_function_on_DVD_discs.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.02-fix_resume_function_on_DVD_discs.patch deleted file mode 100644 index 6ca67e7659..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.02-fix_resume_function_on_DVD_discs.patch +++ /dev/null @@ -1,228 +0,0 @@ -From 89135dd485e785fc4fa43e6919d9920696bc1f41 Mon Sep 17 00:00:00 2001 -From: Voyager-xbmc -Date: Sun, 25 Dec 2011 21:00:27 +0100 -Subject: [PATCH] Fixed resume function on DVD discs and refactoring PlayDisc - to include/replace RunMedia functionality - ---- - xbmc/Application.cpp | 8 +++-- - xbmc/Autorun.cpp | 65 +++++++++++++-------------------- - xbmc/Autorun.h | 5 +-- - xbmc/dialogs/GUIDialogContextMenu.cpp | 4 +- - xbmc/interfaces/Builtins.cpp | 2 +- - xbmc/utils/SaveFileStateJob.h | 7 ++-- - 6 files changed, 39 insertions(+), 52 deletions(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 6c12234..99c4e6c 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -3544,7 +3544,9 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart) - #ifdef HAS_DVD_DRIVE - // Display the Play Eject dialog - if (CGUIDialogPlayEject::ShowAndGetInput(item)) -- return MEDIA_DETECT::CAutorun::PlayDiscAskResume(item.GetPath()); -+ // PlayDiscAskResume takes path to disc. No parameter means default DVD drive. -+ // Can't do better as CGUIDialogPlayEject calls CMediaManager::IsDiscInDrive, which assumes default DVD drive anyway -+ return MEDIA_DETECT::CAutorun::PlayDiscAskResume(); - #endif - return true; - } -@@ -3640,9 +3642,9 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart) - options.starttime = 0.0f; - CBookmark bookmark; - CStdString path = item.GetPath(); -- if (item.IsDVD()) -+ if (item.HasVideoInfoTag() && item.GetVideoInfoTag()->m_strFileNameAndPath.Find("removable://") == 0) - path = item.GetVideoInfoTag()->m_strFileNameAndPath; -- if (item.HasProperty("original_listitem_url") && URIUtils::IsPlugin(item.GetProperty("original_listitem_url").asString())) -+ else if (item.HasProperty("original_listitem_url") && URIUtils::IsPlugin(item.GetProperty("original_listitem_url").asString())) - path = item.GetProperty("original_listitem_url").asString(); - if(dbs.GetResumeBookMark(path, bookmark)) - { -diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp -index f7ae918..8eef37e 100644 ---- a/xbmc/Autorun.cpp -+++ b/xbmc/Autorun.cpp -@@ -69,7 +69,7 @@ void CAutorun::ExecuteAutorun( bool bypassSettings, bool ignoreplaying, bool sta - g_application.ResetScreenSaver(); - g_application.WakeUpScreenSaverAndDPMS(); // turn off the screensaver if it's active - -- RunMedia(bypassSettings, startFromBeginning); -+ PlayDisc("", bypassSettings, startFromBeginning); - } - - bool CAutorun::RunCdda() -@@ -90,42 +90,47 @@ bool CAutorun::RunCdda() - return true; - } - --void CAutorun::RunMedia(bool bypassSettings, bool startFromBeginning) -+bool CAutorun::PlayDisc(const CStdString& path, bool bypassSettings, bool startFromBeginning) - { - if ( !bypassSettings && !g_guiSettings.GetBool("audiocds.autorun") && !g_guiSettings.GetBool("dvds.autorun")) -- return ; -+ return false; - - int nSize = g_playlistPlayer.GetPlaylist( PLAYLIST_MUSIC ).size(); - int nAddedToPlaylist = 0; --#ifdef _WIN32 -- auto_ptr pDir ( CFactoryDirectory::Create( g_mediaManager.TranslateDevicePath("") )); -- bool bPlaying = RunDisc(pDir.get(), g_mediaManager.TranslateDevicePath(""), nAddedToPlaylist, true, bypassSettings, startFromBeginning); --#else -- CCdInfo* pInfo = g_mediaManager.GetCdInfo(); - -- if ( pInfo == NULL ) -- return ; -+ CStdString mediaPath = path; - -- bool bPlaying; -- if (pInfo->IsISOUDF(1) || pInfo->IsISOHFS(1) || pInfo->IsIso9660(1) || pInfo->IsIso9660Interactive(1)) -- { -- auto_ptr pDir ( CFactoryDirectory::Create( "iso9660://" )); -- bPlaying = RunDisc(pDir.get(), "iso9660://", nAddedToPlaylist, true, bypassSettings, startFromBeginning); -- } -- else -+#ifdef _WIN32 -+ if (mediaPath.IsEmpty()) -+ mediaPath = g_mediaManager.TranslateDevicePath(""); -+ -+#else -+ if (mediaPath.IsEmpty()) - { -- auto_ptr pDir ( CFactoryDirectory::Create( "D:\\" ) ); -- bPlaying = RunDisc(pDir.get(), "D:\\", nAddedToPlaylist, true, bypassSettings, startFromBeginning); -+ CCdInfo* pInfo = g_mediaManager.GetCdInfo(); -+ if ( pInfo == NULL ) -+ return false; -+ -+ if (pInfo->IsISOUDF(1) || pInfo->IsISOHFS(1) || pInfo->IsIso9660(1) || pInfo->IsIso9660Interactive(1)) -+ mediaPath = "iso9660://"; -+ else -+ mediaPath = "D:\\"; // Is this XBOX remnant?? - } - #endif -+ -+ auto_ptr pDir ( CFactoryDirectory::Create( mediaPath )); -+ bool bPlaying = RunDisc(pDir.get(), mediaPath, nAddedToPlaylist, true, bypassSettings, startFromBeginning); -+ - if ( !bPlaying && nAddedToPlaylist > 0 ) - { - CGUIMessage msg( GUI_MSG_PLAYLIST_CHANGED, 0, 0 ); - g_windowManager.SendMessage( msg ); - g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_MUSIC); - // Start playing the items we inserted -- g_playlistPlayer.Play(nSize); -+ return g_playlistPlayer.Play(nSize); - } -+ -+ return bPlaying; - } - - /** -@@ -389,27 +394,9 @@ bool CAutorun::IsEnabled() const - return m_bEnable; - } - --bool CAutorun::PlayDisc(const CStdString& path, bool startFromBeginning) --{ -- int nSize = g_playlistPlayer.GetPlaylist( PLAYLIST_MUSIC ).size(); -- int nAddedToPlaylist = 0; -- auto_ptr pDir ( CFactoryDirectory::Create( path )); -- bool bPlaying = RunDisc(pDir.get(), path, nAddedToPlaylist, true, true, startFromBeginning); -- if ( !bPlaying && nAddedToPlaylist > 0 ) -- { -- CGUIMessage msg( GUI_MSG_PLAYLIST_CHANGED, 0, 0 ); -- g_windowManager.SendMessage( msg ); -- g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_MUSIC); -- // Start playing the items we inserted -- g_playlistPlayer.Play(nSize); -- bPlaying = true; -- } -- return bPlaying; --} -- - bool CAutorun::PlayDiscAskResume(const CStdString& path) - { -- return PlayDisc(path, !CanResumePlayDVD(path) || CGUIDialogYesNo::ShowAndGetInput(341, -1, -1, -1, 13404, 12021)); -+ return PlayDisc(path, true, !CanResumePlayDVD(path) || CGUIDialogYesNo::ShowAndGetInput(341, -1, -1, -1, 13404, 12021)); - } - - bool CAutorun::CanResumePlayDVD(const CStdString& path) -diff --git a/xbmc/Autorun.h b/xbmc/Autorun.h -index 7280d9d..693476e 100644 ---- a/xbmc/Autorun.h -+++ b/xbmc/Autorun.h -@@ -48,8 +48,8 @@ class CAutorun - CAutorun(); - virtual ~CAutorun(); - static bool CanResumePlayDVD(const CStdString& path); -- static bool PlayDisc(const CStdString& path, bool startFromBeginning); -- static bool PlayDiscAskResume(const CStdString& path); -+ static bool PlayDisc(const CStdString& path="", bool bypassSettings = false, bool startFromBeginning = false); -+ static bool PlayDiscAskResume(const CStdString& path=""); - bool IsEnabled() const; - void Enable(); - void Disable(); -@@ -57,7 +57,6 @@ class CAutorun - static void ExecuteAutorun(bool bypassSettings = false, bool ignoreplaying = false, bool startFromBeginning = false); - protected: - static bool RunCdda(); -- static void RunMedia(bool bypassSettings, bool startFromBeginning); - static bool RunDisc(XFILE::IDirectory* pDir, const CStdString& strDrive, int& nAddedToPlaylist, bool bRoot, bool bypassSettings, bool startFromBeginning); - bool m_bEnable; - }; -diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp -index 1d28a76..092591a 100644 ---- a/xbmc/dialogs/GUIDialogContextMenu.cpp -+++ b/xbmc/dialogs/GUIDialogContextMenu.cpp -@@ -393,10 +393,10 @@ bool CGUIDialogContextMenu::OnContextButton(const CStdString &type, const CFileI - - #ifdef HAS_DVD_DRIVE - case CONTEXT_BUTTON_PLAY_DISC: -- return MEDIA_DETECT::CAutorun::PlayDisc(item->GetPath(), true); // restart -+ return MEDIA_DETECT::CAutorun::PlayDisc(item->GetPath(), true, true); // restart - - case CONTEXT_BUTTON_RESUME_DISC: -- return MEDIA_DETECT::CAutorun::PlayDisc(item->GetPath(), false);// resume -+ return MEDIA_DETECT::CAutorun::PlayDisc(item->GetPath(), true, false); // resume - - case CONTEXT_BUTTON_EJECT_DISC: - #ifdef _WIN32 -diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp -index 2b940d6..2667f69 100644 ---- a/xbmc/interfaces/Builtins.cpp -+++ b/xbmc/interfaces/Builtins.cpp -@@ -941,7 +941,7 @@ int CBuiltins::Execute(const CStdString& execString) - bool restart = false; - if (params.size() > 0 && params[0].CompareNoCase("restart") == 0) - restart = true; -- CAutorun::PlayDisc(g_mediaManager.GetDiscPath(), restart); -+ CAutorun::PlayDisc(g_mediaManager.GetDiscPath(), true, restart); - #endif - } - else if (execute.Equals("ripcd")) -diff --git a/xbmc/utils/SaveFileStateJob.h b/xbmc/utils/SaveFileStateJob.h -index 1504a74..534ef4b 100644 ---- a/xbmc/utils/SaveFileStateJob.h -+++ b/xbmc/utils/SaveFileStateJob.h -@@ -24,13 +24,12 @@ class CSaveFileStateJob : public CJob - bool CSaveFileStateJob::DoWork() - { - CStdString progressTrackingFile = m_item.GetPath(); -- if (m_item.HasProperty("original_listitem_url") && -+ if (m_item.HasVideoInfoTag() && m_item.GetVideoInfoTag()->m_strFileNameAndPath.Find("removable://") == 0) -+ progressTrackingFile = m_item.GetVideoInfoTag()->m_strFileNameAndPath; // this variable contains removable:// suffixed by disc label+uniqueid or is empty if label not uniquely identified -+ else if (m_item.HasProperty("original_listitem_url") && - URIUtils::IsPlugin(m_item.GetProperty("original_listitem_url").asString())) - progressTrackingFile = m_item.GetProperty("original_listitem_url").asString(); - -- if (m_item.IsDVD()) -- progressTrackingFile = m_item.GetVideoInfoTag()->m_strFileNameAndPath; // this variable contains removable:// suffixed by disc label+uniqueid or is empty if label not uniquely identified -- - if (progressTrackingFile != "") - { - if (m_item.IsVideo()) --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.03-fix_cdda_dvd_playdisk.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.03-fix_cdda_dvd_playdisk.patch deleted file mode 100644 index 23e4c257fe..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.03-fix_cdda_dvd_playdisk.patch +++ /dev/null @@ -1,124 +0,0 @@ -From ee8b61c8687ad6a2c0c58c476b69d1b58364d43c Mon Sep 17 00:00:00 2001 -From: elupus -Date: Wed, 28 Dec 2011 22:34:33 +0100 -Subject: [PATCH] fixed: cdda/dvd playdisk (attempt 4) - -It still needs more work.. ---- - xbmc/Autorun.cpp | 62 +++++++++++++---------------------------------------- - xbmc/Autorun.h | 1 - - 2 files changed, 15 insertions(+), 48 deletions(-) - -diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp -index 8eef37e..4f49ff0 100644 ---- a/xbmc/Autorun.cpp -+++ b/xbmc/Autorun.cpp -@@ -42,6 +42,7 @@ - #include "video/VideoDatabase.h" - #include "dialogs/GUIDialogYesNo.h" - #include "utils/URIUtils.h" -+#include "utils/log.h" - - using namespace std; - using namespace XFILE; -@@ -72,24 +73,6 @@ void CAutorun::ExecuteAutorun( bool bypassSettings, bool ignoreplaying, bool sta - PlayDisc("", bypassSettings, startFromBeginning); - } - --bool CAutorun::RunCdda() --{ -- CFileItemList vecItems; -- -- auto_ptr pDir ( CFactoryDirectory::Create( "cdda://local/" ) ); -- if ( !pDir->GetDirectory( "cdda://local/", vecItems ) ) -- return false; -- -- if ( vecItems.Size() <= 0 ) -- return false; -- -- g_playlistPlayer.ClearPlaylist(PLAYLIST_MUSIC); -- g_playlistPlayer.Add(PLAYLIST_MUSIC, vecItems); -- g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_MUSIC); -- g_playlistPlayer.Play(); -- return true; --} -- - bool CAutorun::PlayDisc(const CStdString& path, bool bypassSettings, bool startFromBeginning) - { - if ( !bypassSettings && !g_guiSettings.GetBool("audiocds.autorun") && !g_guiSettings.GetBool("dvds.autorun")) -@@ -98,24 +81,24 @@ bool CAutorun::PlayDisc(const CStdString& path, bool bypassSettings, bool startF - int nSize = g_playlistPlayer.GetPlaylist( PLAYLIST_MUSIC ).size(); - int nAddedToPlaylist = 0; - -- CStdString mediaPath = path; -+ CStdString mediaPath; -+ -+ CCdInfo* pInfo = g_mediaManager.GetCdInfo(path); -+ if (pInfo == NULL) -+ return false; -+ -+ if (mediaPath.IsEmpty() && pInfo->IsAudio(1)) -+ mediaPath = "cdda://local/"; -+ -+ if (mediaPath.IsEmpty() && (pInfo->IsISOUDF(1) || pInfo->IsISOHFS(1) || pInfo->IsIso9660(1) || pInfo->IsIso9660Interactive(1))) -+ mediaPath = "iso9660://"; - --#ifdef _WIN32 - if (mediaPath.IsEmpty()) -- mediaPath = g_mediaManager.TranslateDevicePath(""); -+ mediaPath = path; - --#else -+#ifdef _WIN32 - if (mediaPath.IsEmpty()) -- { -- CCdInfo* pInfo = g_mediaManager.GetCdInfo(); -- if ( pInfo == NULL ) -- return false; -- -- if (pInfo->IsISOUDF(1) || pInfo->IsISOHFS(1) || pInfo->IsIso9660(1) || pInfo->IsIso9660Interactive(1)) -- mediaPath = "iso9660://"; -- else -- mediaPath = "D:\\"; // Is this XBOX remnant?? -- } -+ mediaPath = g_mediaManager.TranslateDevicePath(""); - #endif - - auto_ptr pDir ( CFactoryDirectory::Create( mediaPath )); -@@ -159,21 +142,6 @@ bool CAutorun::RunDisc(IDirectory* pDir, const CStdString& strDrive, int& nAdded - // is this a root folder we have to check the content to determine a disc type - if( bRoot ) - { -- // check for audio cd first -- CCdInfo* pInfo = g_mediaManager.GetCdInfo(); -- -- if ( pInfo->IsAudio( 1 ) ) -- { -- if( !bypassSettings && !g_guiSettings.GetBool("audiocds.autorun") ) -- return false; -- -- if (!g_passwordManager.IsMasterLockUnlocked(false)) -- if (g_settings.GetCurrentProfile().musicLocked()) -- return false; -- bPlaying = RunCdda(); -- return bPlaying; -- } -- - // check root folders next, for normal structured dvd's - for (int i = 0; i < vecItems.Size(); i++) - { -diff --git a/xbmc/Autorun.h b/xbmc/Autorun.h -index 693476e..4461b74 100644 ---- a/xbmc/Autorun.h -+++ b/xbmc/Autorun.h -@@ -56,7 +56,6 @@ class CAutorun - void HandleAutorun(); - static void ExecuteAutorun(bool bypassSettings = false, bool ignoreplaying = false, bool startFromBeginning = false); - protected: -- static bool RunCdda(); - static bool RunDisc(XFILE::IDirectory* pDir, const CStdString& strDrive, int& nAddedToPlaylist, bool bRoot, bool bypassSettings, bool startFromBeginning); - bool m_bEnable; - }; --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.04-fix_remaining_dvd_resume_issue_and_soft_eject_problem.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.04-fix_remaining_dvd_resume_issue_and_soft_eject_problem.patch deleted file mode 100644 index de19f5d4fa..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9991.04-fix_remaining_dvd_resume_issue_and_soft_eject_problem.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e441ca60e52ce8bdeb50538ef6b048ee196935e2 Mon Sep 17 00:00:00 2001 -From: Voyager-xbmc -Date: Thu, 29 Dec 2011 08:34:08 +0100 -Subject: [PATCH] Fix remaining dvd resume issue and soft eject problem - ---- - xbmc/Autorun.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp -index 4f49ff0..4bd823f 100644 ---- a/xbmc/Autorun.cpp -+++ b/xbmc/Autorun.cpp -@@ -97,7 +97,7 @@ bool CAutorun::PlayDisc(const CStdString& path, bool bypassSettings, bool startF - mediaPath = path; - - #ifdef _WIN32 -- if (mediaPath.IsEmpty()) -+ if (mediaPath.IsEmpty() || mediaPath.CompareNoCase("iso9660://") == 0) - mediaPath = g_mediaManager.TranslateDevicePath(""); - #endif - --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9992.01-dvdplayer_use_selection_streams_to_calculate_HasVideo_and_HasAudio.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9992.01-dvdplayer_use_selection_streams_to_calculate_HasVideo_and_HasAudio.patch deleted file mode 100644 index d0a828b3bc..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9992.01-dvdplayer_use_selection_streams_to_calculate_HasVideo_and_HasAudio.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 38fa2ee5403310b381a6ac35859af4bed0c3e567 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Mon, 19 Dec 2011 20:27:13 +0100 -Subject: [PATCH] dvdplayer: use selection streams to calculate HasVideo and - HasAudio - ---- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 12 ++++-------- - xbmc/cores/dvdplayer/DVDPlayer.h | 6 +++--- - 2 files changed, 7 insertions(+), 11 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 6061909..4e3ea71 100644 ---- a/xbmc/cores/dvdplayer/DVDPlayer.cpp -+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -131,7 +131,7 @@ bool CSelectionStreams::Get(StreamType type, CDemuxStream::EFlags flag, Selectio - return false; - } - --int CSelectionStreams::IndexOf(StreamType type, int source, int id) -+int CSelectionStreams::IndexOf(StreamType type, int source, int id) const - { - CSingleLock lock(m_section); - int count = -1; -@@ -153,7 +153,7 @@ int CSelectionStreams::IndexOf(StreamType type, int source, int id) - return -1; - } - --int CSelectionStreams::IndexOf(StreamType type, CDVDPlayer& p) -+int CSelectionStreams::IndexOf(StreamType type, CDVDPlayer& p) const - { - if (p.m_pInputStream && p.m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD)) - { -@@ -2255,16 +2255,12 @@ bool CDVDPlayer::IsPaused() const - - bool CDVDPlayer::HasVideo() const - { -- if (m_pInputStream) -- { -- if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD) || m_CurrentVideo.id >= 0) return true; -- } -- return false; -+ return m_SelectionStreams.Count(STREAM_VIDEO) > 0 ? true : false; - } - - bool CDVDPlayer::HasAudio() const - { -- return (m_CurrentAudio.id >= 0); -+ return m_SelectionStreams.Count(STREAM_AUDIO) > 0 ? true : false; - } - - bool CDVDPlayer::IsPassthrough() const -diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h -index 9ceca9c..4afb5e2 100644 ---- a/xbmc/cores/dvdplayer/DVDPlayer.h -+++ b/xbmc/cores/dvdplayer/DVDPlayer.h -@@ -119,9 +119,9 @@ class CSelectionStreams - } - std::vector m_Streams; - -- int IndexOf (StreamType type, int source, int id); -- int IndexOf (StreamType type, CDVDPlayer& p); -- int Count (StreamType type) { return IndexOf(type, STREAM_SOURCE_NONE, -1) + 1; } -+ int IndexOf (StreamType type, int source, int id) const; -+ int IndexOf (StreamType type, CDVDPlayer& p) const; -+ int Count (StreamType type) const { return IndexOf(type, STREAM_SOURCE_NONE, -1) + 1; } - SelectionStream& Get (StreamType type, int index); - bool Get (StreamType type, CDemuxStream::EFlags flag, SelectionStream& out); - --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9992.02-fix_playback_of_dvd_dvd-iso_and_video_ts.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9992.02-fix_playback_of_dvd_dvd-iso_and_video_ts.patch deleted file mode 100644 index 226c06c4fc..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9992.02-fix_playback_of_dvd_dvd-iso_and_video_ts.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 566136bb6a26ed6ef753434f31ef633de449cefc Mon Sep 17 00:00:00 2001 -From: CrystalP -Date: Sun, 25 Dec 2011 21:34:27 -0500 -Subject: [PATCH] fix playback of dvd, dvd iso and video_ts - -m_SelectionStreams is empty when playing a DVD or iso image of a dvd. -m_SelectionStreams doesn't contain video streams when playing a video_ts -folder. ---- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 4e3ea71..b868cd0 100644 ---- a/xbmc/cores/dvdplayer/DVDPlayer.cpp -+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -2255,6 +2255,8 @@ bool CDVDPlayer::IsPaused() const - - bool CDVDPlayer::HasVideo() const - { -+ if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD)) return true; -+ - return m_SelectionStreams.Count(STREAM_VIDEO) > 0 ? true : false; - } - --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9993-dont_deref_null_pointers.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9993-dont_deref_null_pointers.patch deleted file mode 100644 index 641c7e3b2e..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9993-dont_deref_null_pointers.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit bee67c6b7129a6764c964a93e35e33b7cf2b35ea -Author: spiff -Date: Wed Jan 18 16:33:47 2012 +0100 - - fixed: don't deref null pointers, not even in release builds - -diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp -index dc5c366..a7d96c0 100644 ---- a/xbmc/addons/AddonInstaller.cpp -+++ b/xbmc/addons/AddonInstaller.cpp -@@ -262,6 +262,9 @@ void CAddonInstaller::InstallFromXBMCRepo(const set &addonIDs) - bool CAddonInstaller::CheckDependencies(const AddonPtr &addon) - { - assert(addon.get()); -+ if (!addon) -+ return false; -+ - ADDONDEPS deps = addon->GetDeps(); - CAddonDatabase database; - database.Open(); \ No newline at end of file diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9993-fix_12378.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9993-fix_12378.patch deleted file mode 100644 index a80e6c4e27..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9993-fix_12378.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 895d659a6accdae7eb668eebe9426e4820f5928a Mon Sep 17 00:00:00 2001 -From: vdrfan -Date: Fri, 30 Dec 2011 00:29:16 +0100 -Subject: [PATCH] fixed: service addons are not started after installation - (fixes #12378) - ---- - xbmc/addons/AddonInstaller.cpp | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp -index 7de9eee..9272386 100644 ---- a/xbmc/addons/AddonInstaller.cpp -+++ b/xbmc/addons/AddonInstaller.cpp -@@ -20,6 +20,7 @@ - */ - - #include "AddonInstaller.h" -+#include "Service.h" - #include "utils/log.h" - #include "utils/URIUtils.h" - #include "Util.h" -@@ -419,6 +420,14 @@ bool CAddonInstallJob::OnPreInstall() - g_application.getApplicationMessenger().ExecBuiltIn("UnloadSkin", true); - return true; - } -+ -+ if (m_addon->Type() == ADDON_SERVICE) -+ { -+ boost::shared_ptr service = boost::dynamic_pointer_cast(m_addon); -+ if (service) -+ service->Stop(); -+ return true; -+ } - return false; - } - -@@ -511,6 +520,13 @@ void CAddonInstallJob::OnPostInstall(bool reloadAddon) - g_application.getApplicationMessenger().ExecBuiltIn("ReloadSkin"); - } - } -+ -+ if (m_addon->Type() == ADDON_SERVICE) -+ { -+ boost::shared_ptr service = boost::dynamic_pointer_cast(m_addon); -+ if (service) -+ service->Start(); -+ } - } - - void CAddonInstallJob::ReportInstallError(const CStdString& addonID, --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9994-avoid_including_Autorun.h_all_over_xbmc.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9994-avoid_including_Autorun.h_all_over_xbmc.patch deleted file mode 100644 index 2b6c72cb73..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9994-avoid_including_Autorun.h_all_over_xbmc.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 825175e4a300ea1409cc288f675c570b2cc4b46a Mon Sep 17 00:00:00 2001 -From: elupus -Date: Wed, 28 Dec 2011 21:16:02 +0100 -Subject: [PATCH] changed: avoid including Autorun.h all over xbmc - ---- - xbmc/Application.cpp | 4 +++- - xbmc/Application.h | 8 ++++++-- - xbmc/music/windows/GUIWindowMusicSongs.cpp | 1 + - xbmc/pictures/GUIWindowPictures.cpp | 1 + - xbmc/video/windows/GUIWindowVideoBase.cpp | 1 + - xbmc/windows/GUIWindowFileManager.cpp | 1 + - 6 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 99c4e6c..1f39273 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -364,10 +364,12 @@ - m_bEnableLegacyRes = false; - m_bSystemScreenSaverEnable = false; - m_pInertialScrollingHandler = new CInertialScrollingHandler(); -+ m_Autorun = new CAutorun(); - } - - CApplication::~CApplication(void) - { -+ delete m_Autorun; - delete m_currentStack; - - #ifdef HAS_KARAOKE -@@ -4794,7 +4796,7 @@ void CApplication::ProcessSlow() - #ifdef HAS_DVD_DRIVE - // checks whats in the DVD drive and tries to autostart the content (xbox games, dvd, cdda, avi files...) - if (!IsPlayingVideo()) -- m_Autorun.HandleAutorun(); -+ m_Autorun->HandleAutorun(); - #endif - - // update upnp server/renderer states -diff --git a/xbmc/Application.h b/xbmc/Application.h -index d4bb9b3..5c08305 100644 ---- a/xbmc/Application.h -+++ b/xbmc/Application.h -@@ -38,6 +38,11 @@ - typedef boost::shared_ptr AddonPtr; - } - -+namespace MEDIA_DETECT -+{ -+ class CAutorun; -+} -+ - #include "cores/IPlayer.h" - #include "cores/playercorefactory/PlayerCoreFactory.h" - #include "PlayListPlayer.h" -@@ -47,7 +52,6 @@ - #ifdef _WIN32 - #include "win32/WIN32Util.h" - #endif --#include "Autorun.h" - #include "video/Bookmark.h" - #include "utils/Stopwatch.h" - #include "ApplicationMessenger.h" -@@ -211,7 +215,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs - #endif - - #ifdef HAS_DVD_DRIVE -- MEDIA_DETECT::CAutorun m_Autorun; -+ MEDIA_DETECT::CAutorun* m_Autorun; - #endif - - #if !defined(_WIN32) && defined(HAS_DVD_DRIVE) -diff --git a/xbmc/music/windows/GUIWindowMusicSongs.cpp b/xbmc/music/windows/GUIWindowMusicSongs.cpp -index b5c032d..e5e3b7e 100644 ---- a/xbmc/music/windows/GUIWindowMusicSongs.cpp -+++ b/xbmc/music/windows/GUIWindowMusicSongs.cpp -@@ -37,6 +37,7 @@ - #include "guilib/LocalizeStrings.h" - #include "utils/log.h" - #include "utils/URIUtils.h" -+#include "Autorun.h" - - #define CONTROL_BTNVIEWASICONS 2 - #define CONTROL_BTNSORTBY 3 -diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp -index 2518976..707faca 100644 ---- a/xbmc/pictures/GUIWindowPictures.cpp -+++ b/xbmc/pictures/GUIWindowPictures.cpp -@@ -40,6 +40,7 @@ - #include "utils/TimeUtils.h" - #include "utils/log.h" - #include "utils/URIUtils.h" -+#include "Autorun.h" - - #define CONTROL_BTNVIEWASICONS 2 - #define CONTROL_BTNSORTBY 3 -diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp -index 9f7c6a1..0512ad7 100644 ---- a/xbmc/video/windows/GUIWindowVideoBase.cpp -+++ b/xbmc/video/windows/GUIWindowVideoBase.cpp -@@ -65,6 +65,7 @@ - #include "GUIUserMessages.h" - #include "addons/Skin.h" - #include "storage/MediaManager.h" -+#include "Autorun.h" - - using namespace std; - using namespace XFILE; -diff --git a/xbmc/windows/GUIWindowFileManager.cpp b/xbmc/windows/GUIWindowFileManager.cpp -index 67e5330..e9d8896 100644 ---- a/xbmc/windows/GUIWindowFileManager.cpp -+++ b/xbmc/windows/GUIWindowFileManager.cpp -@@ -58,6 +58,7 @@ - #include "utils/FileOperationJob.h" - #include "utils/FileUtils.h" - #include "utils/URIUtils.h" -+#include "Autorun.h" - - using namespace std; - using namespace XFILE; --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9995.01-addon_updates.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9995.01-addon_updates.patch deleted file mode 100644 index a08aa4f9da..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9995.01-addon_updates.patch +++ /dev/null @@ -1,1447 +0,0 @@ -diff -Naur xbmc-22ad8e4/addons/metadata.albums.allmusic.com/addon.xml xbmc-22ad8e4.patch/addons/metadata.albums.allmusic.com/addon.xml ---- xbmc-22ad8e4/addons/metadata.albums.allmusic.com/addon.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.albums.allmusic.com/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -13,10 +13,12 @@ - language="en" - library="allmusic.xml"/> - -+ Информация за албуми от AllMusic.com - AllMusic album information - Alben Scraper für AllMusic.com - Scraper de Álbums de AllMusic - Scraper d'albums musicaux AllMusic -+ AllMusic.com -albumitietojen lataaja - AllMusic.com album információk - AllMusic-albuminfo - Informacje o albumach z AllMusic -@@ -25,6 +27,10 @@ - Информация об альбоме из AllMusic - AllMusic albuminformation - AllMusic音乐专辑信息 -+ Попълнете метаинформацията в библиотеката си от AllMusic.com. -+Уебсайтът allmusic.com е създаден през 19995, като място за страстни музикални фенове. -+Редакторският колектив AMG заедно със стотици експерти (и малко фанатици на тема allmusic.com) са направили сайта един от най-подробните (и най-често ползваните) източници на информация на музикална тема. Всички те са се посветили на създаването и поддържането на базата от данни, на разпространяването на съдържание от AMG, което се очаква от любителите на музика и професионалисти в музикалния отрасъл. -+Засегнати са всички жанрове и стилове музика. От най-комерсиалните и популярни до най-невъзприетите. Критиката към артисти и албуми се прави в контекста на съответните им жанрове - от опера до гаражен рок. Така се осигури актуална информация за почитателите на всеки стил, за любимите им артисти и се представят нови творби. - Use AllMusic.com to fill your library metadata information. - The allmusic website was created in 1995 as a place for music fans to indulge their passion. - The AMG editorial staff, along with hundreds of expert contributors (all music fanatics in their own right), has made allmusic the most comprehensive music reference source on the planet. They are all dedicated to creating and maintaining the knowledgeable, spirited content that music lovers and industry professionals have come to expect from AMG. -@@ -37,6 +43,10 @@ - La página web allmusic fue creada en el 1995 cómo un sitio donde los fans podíaan compartir su pasión por la música. - El equipo de AMG, junto con cuentos de colaboradores expertos (todos ellos fans de la música) han hecho de allmusic uno de los sitios más extensos del planeta. Todos ellos intentan crear y mantener unos contenidos que los amantes de la música y los profesionales del sector obtienen de AMG. - Todos los géneros y estilos musicales tienen cabida, desde los más comerciales hasta los más oscuros. En allmusic se critican los álbumes y los artistas en el entorno que les corresponde - desde opera, pasando por rock hasta country tradicional. Así se asegura que los fans de cualquier estilo de música puedan depender de nosotros para mantenerse al día de las novedades de sus artistas favoritos y descubrir nuevos sonidos. -+ Käytä AllMusic.com -sivustoa täyttämään kirjastosi metatiedot. -+AllMusic.com -sivusto luotiin vuonna 1995 paikaksi, jossa musiikkifanit voivat tyydyttää intohimonsa musiikkiin. -+AMG-toimituksen henkilökunta, satojen asiansa tuntevien lahjoittajien kanssa (kaikki musiikkifanaatikot), ovat tehneet AllMusic.com -sivustosta koko planeetan kattavimman musiikkitietolähteen. He ovat kaikki sitoutuneita luomaan ja ylläpitämään asioista perillä olevaa henkevää sisältöä, jota musiikista pitävät ja musiikkialan ammattilaiset odottavat AMG:ltä. -+Kaikki musiikin lajityypit ja tyylisuunnat ovat edustettuina täällä, vaihdellen kaupallisesti suosituimmista kaikista huomaamattomimpiin. Me arvostelemme albumit ja esittäjät heidän oman lajityyppinsä sisällä - oopperasta ja autotallirokista aina perinteiseen country-musiikkiin. Tämä varmistaa, että minkä tahansa tyylisuunnan fanit voivat luottaa, että samalla kun pidämme heidät ajan tasalla heidän lempiartististansa, niin esittelemme myös heille uusia äänimaailmoita. - Utiliser AllMusic.com pour la récupération des méta-données. - Le site web AllMusic a été créé en 1995 afin que les fans de musique puissent assouvir leur passion. - L'équipe rédactionnelle d'AMG, forte de ses centaines de contributeurs avisés (tous passionnés de musique à part entière), a fait de AllMusic la source de référence la plus complète de toute la planète. Chacun s'investissant dans la construction et la maintenance d'un contenu aussi passionné et judicieux que tout amoureux de musique ou tout professionnel de l'industrie serait en droit d'attendre d'AMG. -diff -Naur xbmc-22ad8e4/addons/metadata.artists.allmusic.com/addon.xml xbmc-22ad8e4.patch/addons/metadata.artists.allmusic.com/addon.xml ---- xbmc-22ad8e4/addons/metadata.artists.allmusic.com/addon.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.artists.allmusic.com/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -13,9 +13,11 @@ - language="en" - library="allmusic.xml"/> - -+ Инф. за артисти от AllMusic + снимки на артисти от HTBackdrops - AllMusic artist information + HTBackdrops artist images - Scraper für Künstler-Informationen von AllMusic.com - Descarga información de Artistas de AllMusic -+ AllMusic.com -esittäjätietojen ja HTBackdrops-esittäjäkuvien lataaja - Scraper d'artistes musicaux AllMusic - AllMusic előadó információk - AllMusic-artiestinfo -@@ -25,6 +27,9 @@ - Информация об исполнителе из AllMusic - AllMusic artistinformation + HTBackdrops artistbilder - AllMusic艺术家信息 -+ Попълнете метаинформацията в библиотеката си от AllMusic.com -+Уебсайтът allmusic.com е създаден през 19995, като място за страстни музикални фенове. Засегнати са всички жанрове и стилове музика. От най-комерсиалните и популярни до най-невъзприетите. Критиката към артисти и албуми се прави в контекста на съответните им жанрове - от опера до гаражен рок. -+Home Theater Backdrops (HTBackdrops.com) представлява база от данни с изображения задвижвана от общността около уебсайта. Съдържа висококачествени изображенията на артисти под формата на миниатюри и fanarts. Всички те са създадени или произхождат от общността. Моля, обмислете възможността да качите изображения за любимите ви артисти. - Use AllMusic.com to fill your libray metadata information. - The allmusic website was created in 1995 as a place for music fans to indulge their passion. All genres and styles of music are covered here, ranging from the most commercially popular to the most obscure. We critique albums and artists within the context of their own genres - from opera to garage rock to traditional country. - -@@ -37,6 +42,9 @@ - La página web allmusic fue creada en el 1995 cómo un sitio donde los fans podíaan compartir su pasión por la música. - El equipo de AMG, junto con cuentos de colaboradores expertos (todos ellos fans de la música) han hecho de allmusic uno de los sitios más extensos del planeta. Todos ellos intentan crear y mantener unos contenidos que los amantes de la música y los profesionales del sector obtienen de AMG. - Todos los géneros y estilos musicales tienen cabida, desde los más comerciales hasta los más oscuros. En allmusic se critican los álbumes y los artistas en el entorno que les corresponde - desde opera, pasando por rock hasta country tradicional. Así se asegura que los fans de cualquier estilo de música puedan depender de nosotros para mantenerse al día de las novedades de sus artistas favoritos y descubrir nuevos sonidos. -+ Käytä AllMusic.com -sivustoa täyttämään kirjastosi metatiedot. -+AllMusic.com -sivusto luotiin vuonna 1995 paikaksi, jossa musiikkifanit voivat tyydyttää intohimonsa musiikkiin. Kaikki musiikin lajityypit ja tyylisuunnat ovat edustettuina täällä, vaihdellen kaupallisesti suosituimmista kaikkein huomaamattomimpiin. Me arvostelemme albumit ja esittäjät heidän oman lajityyppinsä sisällä - oopperasta ja autotallirokista aina perinteiseen country-musiikkiin. -+HTBackdrops.com -sivusto on yhteisön ylläpitämä tietokanta korkealaatuisille esittäjä- ja fanitaidekuville. Sivuston jäsenet ovat luoneet kaikki sivuston kuvat. Lähetä meille itse tekemäsi suosikkiartistiesi kuvat, jotta voimme lisätä ne tietokantaan. - Utiliser AllMusic.com pour la récupération des méta-données. - Le site web AllMusic a été créé en 1995 afin que les fans de musique puissent assouvir leur passion. - L'équipe rédactionnelle d'AMG, forte de ses centaines de contributeurs avisés (tous passionnés de musique à part entière), a fait de AllMusic la source de référence la plus complète de toute la planète. Chacun s'investissant dans la construction et la maintenance d'un contenu aussi passionné et judicieux que tout amoureux de musique ou tout professionnel de l'industrie serait en droit d'attendre d'AMG. -diff -Naur xbmc-22ad8e4/addons/metadata.artists.allmusic.com/resources/language/Swedish/strings.xml xbmc-22ad8e4.patch/addons/metadata.artists.allmusic.com/resources/language/Swedish/strings.xml ---- xbmc-22ad8e4/addons/metadata.artists.allmusic.com/resources/language/Swedish/strings.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.artists.allmusic.com/resources/language/Swedish/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -2,11 +2,11 @@ - - - -- -+ - - -- Aktivera fanart -+ Ladda ner fanart från HTBackdrops.com - Hämta artistminiatyr från Allmusic.com - Hämta artistminiatyr från Last.fm -- Hämta artistminiatyr från HTBackdrops -+ Hämta artistminiatyr från HTBackdrops.com - -\ No newline at end of file -diff -Naur xbmc-22ad8e4/addons/metadata.common.allmusic.com/addon.xml xbmc-22ad8e4.patch/addons/metadata.common.allmusic.com/addon.xml ---- xbmc-22ad8e4/addons/metadata.common.allmusic.com/addon.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.allmusic.com/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -11,9 +11,11 @@ - - all - 20000 -+ Библиотека за сваляне на музикална инф. от AllMusic - AllMusic Music Scraper Library - Musik-Scraper für AllMusic.com - Scraper de música de AllMusic -+ AllMusic musiikkitietojen lataajan kirjasto - Scraper AllMusic pour la musique - AllMusic zenei adat leolvasó - AllMusic-scraperfuncties -@@ -23,9 +25,11 @@ - Музыкальная Информация AllMusic - Skrapa för AllMusic.com - AllMusic音乐刮削器代码库 -+ Извлича инф. за музикални файлове от www.allmusic.com - Download Music information from www.allmusic.com - Downloade Musik Informationen von www.allmusic.com - Descarga información musical de www.allmusic.com -+ Lataa musiikkitietoja osoitteesta www.allmusic.com - Télécharger les infos musicales depuis www.allmusic.com - Zene információk letöltése a www.allmusic.com webhelyről - Muziekinformatie ophalen van www.allmusic.com -diff -Naur xbmc-22ad8e4/addons/metadata.common.hdtrailers.net/addon.xml xbmc-22ad8e4.patch/addons/metadata.common.hdtrailers.net/addon.xml ---- xbmc-22ad8e4/addons/metadata.common.hdtrailers.net/addon.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.hdtrailers.net/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,7 +1,7 @@ - - - - -@@ -9,25 +9,31 @@ - - -+ Библиотека за сваляне на инф. от HD-Trailers.net - HD-Trailers.net Scraper Library - Scraper für Trailer von HD-Trailers.net - Scraper de Trailers de HD-Trailers.net -+ HD-Trailers.net trailerilataajan kirjasto - Scraper HD-Trailers.net pour les bande-annonces - HD-Trailers.net leolvasó-könyvtár - HD-Trailers.net Scraper Collectie - Scraper zwiastunów HD-Trailers.net - Scraper de trailers de HD-Trailers.net - Обработчик для трейлеров с HD-Trailers.net -+ Skrapa för HD-Trailers.net - HD-Trailers.net刮削器代码库 -+ Сваля трейлъри на филми от www.hd-trailers.net - Download Movie Trailers from www.hd-trailers.net - Downloade Trailer von www.hd-trailers.net - Descarga trailers de www.hd-trailers.net -+ Lataa elokuvien trailereita osoitteesta www.hd-trailers.net - Télécharge les bande-annonces de films depuis www.hd-trailers.net - Filmelőzetesek letöltése a www.hd-trailers.net-ről - Download trailers van www.hd-trailers.net - Pobieraj zwiastuny filmowe z www.hd-trailers.net - Descarregar trailers de www.hd-trailers.net - Загружать трейлеры с www.hd-trailers.net -+ Ladda ner filmtrailers från www.hd-trailers.net - 从www.hd-trailers.net下载电影预告片 - 20000 - all -diff -Naur xbmc-22ad8e4/addons/metadata.common.hdtrailers.net/hdtrailers.xml xbmc-22ad8e4.patch/addons/metadata.common.hdtrailers.net/hdtrailers.xml ---- xbmc-22ad8e4/addons/metadata.common.hdtrailers.net/hdtrailers.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.hdtrailers.net/hdtrailers.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -25,19 +25,19 @@ - - - -- -- ">Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p -+ -+ ">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p - - - - - -- -- ">Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p -+ -+ ">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p - - -- -- ">Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p -+ -+ ">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p - - - -@@ -45,16 +45,16 @@ - - - -- -- ">Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p -+ -+ ">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p - - -- -- ">Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p -+ -+ ">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p - - -- -- ">Trailer</td>.*?sid=(\d*)" rel="lightbox\[res1080p -+ -+ ">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res1080p - - - -diff -Naur xbmc-22ad8e4/addons/metadata.common.htbackdrops.com/addon.xml xbmc-22ad8e4.patch/addons/metadata.common.htbackdrops.com/addon.xml ---- xbmc-22ad8e4/addons/metadata.common.htbackdrops.com/addon.xml 2011-12-24 19:47:44.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.htbackdrops.com/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -11,25 +11,31 @@ - - all - 20000 -+ Библиотека за сваляне на инф. от HTBackdrops - HTBackdrops Scraper Library - Scraper für Hintergründe von HTBackdrops - Scraper de HTBackdrops -+ HTBackdrops taustakuvalataajan kirjasto - Scraper HTBackdrops - HTBackdrops leolvasó-könyvtár - HTBackdrops-scraperfuncties - Scraper biblioteki HTBackdrops - Biblioteca de fundos HTBackdrops - Обработчик Фоновых изображений с HTBackdrops -+ Skrapa för HTBackdrops - HTBackdrops刮削器代码库 -+ Сваля декорации от www.htbackdrops.com - Download backdrops from www.htbackdrops.com - Downloade Hintergründe von www.htbackdrops.com - Descarga fanart y fotos de artistas de www.htbackdrops.com -+ Lataa taustakuvia osoitteesta www.htbackdrops.com - Télécharge les backdrops depuis www.htbackgrops.com - Fanartképek letöltése www.htbackdrops.com webhelyről - Achtergronden ophalen van www.htbackdrops.com - Pobieraj tła z www.htbackdrops.com - Descarregar fundos de www.htbackdrops.com - Загружать фоновые изображения с www.htbackdrops.com -+ Ladda ner bakgrundsbilder från www.htbackdrops.com - 从www.htbackdrops.com下载背景图 - - -diff -Naur xbmc-22ad8e4/addons/metadata.common.imdb.com/addon.xml xbmc-22ad8e4.patch/addons/metadata.common.imdb.com/addon.xml ---- xbmc-22ad8e4/addons/metadata.common.imdb.com/addon.xml 2011-12-24 19:47:44.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.imdb.com/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,7 +1,7 @@ - - - - -@@ -11,14 +11,18 @@ - - all - 20000 -+ Библиотека за сваляне на инф. от IMDB - IMDB Scraper Library -+ IMDB elokuvatietojen lataaja - IMDB leolvasó-könyvtár - IMDB 스크래퍼 라이브러리 - IMDB Scraper Bibliotheek - Scraper IMDb - Scraper de filmes IMDb -- IMDB Skrapbibliotek -+ Skrapa för IMDB -+ Сваля информация за филми от www.imdb.com - Download Movie information from www.imdb.com -+ Lataa elokuvatietoja osoitteesta www.imdb.com - Film információk letöltése a www.imdb.com webhelyről - www.imdb.com 에서 영화 정보 다운로드 - Download film informatie van www.imdb.com -diff -Naur xbmc-22ad8e4/addons/metadata.common.imdb.com/changelog.txt xbmc-22ad8e4.patch/addons/metadata.common.imdb.com/changelog.txt ---- xbmc-22ad8e4/addons/metadata.common.imdb.com/changelog.txt 2011-12-24 19:47:44.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.imdb.com/changelog.txt 2012-01-19 16:07:11.000000000 +0100 -@@ -1,3 +1,9 @@ -+[B]2.1.5[/B] -+- fixed: Cleanup and factored out Genres to common -+ -+[B]2.1.4[/B] -+- fixed: fetching directors and writers due to site changes -+ - [B]2.1.3[/B] - - fixed: make sure IMDb rating is geting fetched in every region - -@@ -38,4 +44,4 @@ - - changed: adapted new IMDb layout - - [B]1.0.5[/B] --- fixed: tack /combined onto the end of the url to work around the new layout of IMDb -\ No newline at end of file -+- fixed: tack /combined onto the end of the url to work around the new layout of IMDb -diff -Naur xbmc-22ad8e4/addons/metadata.common.imdb.com/imdb.xml xbmc-22ad8e4.patch/addons/metadata.common.imdb.com/imdb.xml ---- xbmc-22ad8e4/addons/metadata.common.imdb.com/imdb.xml 2011-12-24 19:47:44.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.imdb.com/imdb.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,64 +1,23 @@ -  -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ itemprop="genre"[^>]+>([^<]+)</a> -+ - - -- -- -- -+ -+ -+ -+ - - -- -+ - - - -@@ -67,6 +26,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -75,6 +40,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -92,6 +63,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -109,28 +86,46 @@ - - - -+ -+ -+ -+ -+ -+ - - - - Director[s]?.*?</h4>(.*?)<div class - - -- <a href="/name[^>]*>([^<]*)< -+ href="/name[^>]*>([^<]*)< - - - - -+ -+ -+ -+ -+ -+ - - - - Writer[s]?.*?</h4>(.*?)<div class - - -- <a href="/name[^>]*>([^<]*)< -+ href="/name[^>]*>([^<]*)< - - - - -+ -+ -+ -+ -+ -+ - - - -@@ -145,6 +140,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -159,6 +160,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -170,6 +177,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -181,6 +194,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -diff -Naur xbmc-22ad8e4/addons/metadata.common.last.fm/addon.xml xbmc-22ad8e4.patch/addons/metadata.common.last.fm/addon.xml ---- xbmc-22ad8e4/addons/metadata.common.last.fm/addon.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.last.fm/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -11,9 +11,11 @@ - - all - 20000 -+ Библиотека за сваляне на инф. от LastFM - LastFM Scraper Library - Musik-Scraper für LastFM - Scraper de música de LastFM -+ LastFM musiikkitietojen lataaja - Scraper LastFM - LastFM leolvasó-könyvtár - LastFM-scraperfuncties -@@ -22,9 +24,11 @@ - Обработчик для LastFM - Skrapebibliotek för LastFM - LastFM刮削器代码库 -+ Извлича инф. за музикални файлове от www.last.fm - Download Music information from www.last.fm - Downloade Musik informationen von www.last.fm - Descargar información musical de www.last.fm -+ Lataa musiikkitietoja osoitteesta www.last.fm - Télécharge les infos musicales depuis www.last.fm - Zene információk letöltése a www.last.fm webhelyről - Muziekinfo ophalen van LastFM -diff -Naur xbmc-22ad8e4/addons/metadata.common.themoviedb.org/addon.xml xbmc-22ad8e4.patch/addons/metadata.common.themoviedb.org/addon.xml ---- xbmc-22ad8e4/addons/metadata.common.themoviedb.org/addon.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.themoviedb.org/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,7 +1,7 @@ - - - - -@@ -11,8 +11,10 @@ - - all - 20000 -+ Библиотека за сваляне на инф. от TMDb - TMDb Scraper Library - Scraper de peliculas de TMDb -+ TMDb elokuvatietojen lataajan kirjasto - Scraper TMDb - TMDb leolvasó-könyvtár - TMDb-scraperfuncties -@@ -22,8 +24,10 @@ - Обработчик для TMDb - Skrapebibliotek för TMDb - TMDb刮削器代码库 -+ Сваля миниатюри и fanarts от www.themoviedb.org - Download thumbs and fanarts from www.themoviedb.org - Descarga posters y fanart de www.themoviedb.org -+ Lataa pienoiskuvia ja fanitaidetta www.themoviedb.org -sivustolta - Télécharge vignettes et backdrops depuis www.themoviedb.org - Bélyeg- és fanartképek letöltése a www.themoviedb.org webhelyről - Miniaturen en fanart ophalen van www.themoviedb.org -diff -Naur xbmc-22ad8e4/addons/metadata.common.themoviedb.org/tmdb.xml xbmc-22ad8e4.patch/addons/metadata.common.themoviedb.org/tmdb.xml ---- xbmc-22ad8e4/addons/metadata.common.themoviedb.org/tmdb.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.common.themoviedb.org/tmdb.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,19 +1,43 @@ - -- -+ -+ - -- -- tt([0-9]+) -+ -+ - -- -- ^([0-9]+)$ -+ -+ -+ -+ -+ -+ -+ "US","certification":"([^"]*) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - - - - -- -- "overview":"(.*?)", -+ -+ "overview":"(.*?)", -+ -+ -+ ^$ -+ -+ -+ (.+) - - - "overview":"(.{180,}?)[.?!] -@@ -21,35 +45,102 @@ - - - -- -+ -+ -+ -+ "overview":"(.*?)", -+ -+ -+ "overview":"(.{180,}?)[.?!] -+ -+ -+ -+ -+ -+ - -- -- tt([0-9]+) -+ -+ - -- -- ^([0-9]+)$ -+ -+ -+ -+ -+ -+ -+ "belongs_to_collection":{"id":[0-9]+,"name":"([^"]*) -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - - - - -- -- "name":"([^"]*)","job":"Actor","department":"Actors","character":"([^"]*) -+ -+ "cast":\[([^\]]*) -+ -+ -+ "name":"([^"]*)","character":"([^"]*) - -- -- "name":"([^"]*)","job":"Actor","department":"Actors","character":"([^"]*)","id":[0-9]+,"order":[0-9]*,"cast_id":[0-9]*,"url":"[^"]*","profile":"http://(.*?)w[0-9]+([^"]*)" -+ -+ "name":"([^"]*)","character":"([^"]*)","order":[0-9]*,"profile_path":"([^"]*)" - - - - -- -+ -+ - -- -- tt([0-9]+) -+ -+ - -- -- ^([0-9]+)$ -+ -+ -+ -+ -+ -+ -+ "crew":\[([^\]]*) -+ -+ -+ "name":"([^"]*)","department":"Directing","job":"Director" -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ "crew":\[([^\]]*) -+ -+ -+ "name":"([^"]*)","department":"Writing", -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -57,7 +148,7 @@ - - - -- "genres":\[([^\]]*) -+ "genres":\[([^\]]*) - - - "name":"([^"]*) -@@ -65,13 +156,11 @@ - - - -+ - - -- -- tt([0-9]+) -- -- -- ^([0-9]+)$ -+ -+ - - - -@@ -79,17 +168,18 @@ - - - -- "rating":([^,]*)," -+ "vote_average":([^,]*)," - - -- "votes":([0-9]+) -+ "vote_count":([0-9]+) - - - - -+ - - -- -+ - ^([0-9]+)$ - - -@@ -97,70 +187,84 @@ - - - -- -- "trailer":".*?youtube.com/watch\?v=([^"]*) -+ -+ "youtube":\[{([^\]]*) -+ -+ -+ "source":"([^"]*) - - (.+) - - -+ - - -- -- tt([0-9]+) -- -- -- ^([0-9]+)$ -+ -+ - - - - - - -- -- /tt([0-9]+) -- -- -- <id>([0-9]*)</id> -+ -+ - - - - - - -- -- "type":"backdrop","size":"original".*?"url":"(.*?)original([^"]*) -+ -+ "backdrops":\[{([^\]]*) -+ -+ -+ "file_path":"([^"]*) - - (.+) - - -+ - - -- -- tt([0-9]+) -- -- -- ^([0-9]+)$ -+ -+ - - - - - - -- -- /tt([0-9]+) -- -- -- <id>([0-9]*)</id> -+ -+ - - - - - - -- -- "type":"poster","size":"original".*?"url":"(.*?)original([^"]*) -+ -+ "id":([0-9]*), -+ -+ -+ "posters":\[{([^\]]*) -+ -+ -+ "file_path":"([^"]*) - - (.+) - - -+ -+ -+ -+ "posters":\[{([^\]]*) -+ -+ -+ "file_path":"([^"]*) -+ -+ (.+) -+ -+ -+ - -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/addon.xml xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/addon.xml ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/addon.xml 2011-12-24 19:47:46.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,38 +1,44 @@ - - - - -- -- -- -- -+ -+ -+ -+ - - - -+ Сваля инф. за филми от TMDB - TMDB Movie Scraper - Film-Scraper für TheMovieDB - Scraper de películas de TheMovieDB -+ TMDB elokuvatietojen lataaja - TMDB filmadat leolvasó - TMDb-filmscraper - Scraper filmowy TMDB - Scraper de filmes TMDb - Scraper de filme TMDb - Обработчик Фильмов для TMDB -+ Skrapa för TMDb - TMDB电影刮削器 -+ themoviedb.org е безплатна и отворена база от данни за филми. Задвижва се изцяло от потребителите си - хора като вас. Милиони хора по света всеки месец ползват TMDb, благодарение на многофункционалното API. Едновременно с това е и източник на информация за медийни центрове, като XBMC, които извличат метаинформация за филми, постери и Fanart. - themoviedb.org is a free and open movie database. It's completely user driven by people like you. TMDb is currently used by millions of people every month and with their powerful API, it is also used by many popular media centers like XBMC to retrieve Movie Metadata, Posters and Fanart to enrich the user's experience. - TheMovieDB.org ist eine freie und offene Film-Datenbank. Sie wird nur User wie dir betrieben. TheMovieDB wird zur Zeit monatlich von Millionen genutzt. Mit der mächtigen API wird sie auch von vielen Media-Center, wie z.B. XBMC, genutzt um Filme-Meta-Daten, Poster und Fanrts zu beziehen, damit der User sein Media-Center verschönern kann - themovieDB.org es una base de datos de películas gratuita y abierta. Es una página web que se basa en contenido subido por los usuarios. TMDb es usada diariamente por mucha gente gracias a su API, que es usada por más programas aparte de XBMC para descargar información de películas así como Posters o Fanart (Fondos de escritorio basados en películas usados en distintos skins) para enriquecer la experiencia de usar XBMC. -+ themoviedb.org on vapaa ja avoin elokuvatietokanta. Se on täysin käyttäjien ylläpitämä. TMDb:a käyttää miljoonat ihmiset joka kuukausi, sitä käytetään käyttäjäkokemuksen rikastuttamiseen monissa muissakin suosituissa XBMC:n kaltaisissa ohjelmissa lataamalla elokuvien tietoja, julisteita ja fanitaidetta. - A themoviedb.org egy ingyenes és nyílt filmadatbázis. Teljes egészében olyan felhasználók töltik fel, mint például Te. A TMDb-t havonta emberek milliói használják és a hatékony API-n keresztül számos népszerű média center is, mint például az XBMC a filmadatok, poszterek, fanartképek letöltésére. - Themoviedb.org is een vrije en open filmdatabank. Gebruikers zoals jij vormen de motor van deze site. Op dit moment gebruiken elke maand miljoenen mensen TMDb. De krachtige API van de site laat mediacenters zoals XBMC toe om metadata, posters en fanart op te halen en zo de gebruikerservaring te verrijken. - themoviedb.org jest wolną i otwartą filmową bazą danych. Jest zarządzana całkowicie przez osoby takie jak Ty. Obecnie odwiedzają ją miliony osób miesięcznie, a dzięki dostępności API jest używana w wielu media center, takich jak XBMC, do pobierania informacji o filmach, plakatów i fanartów. - O themoviedb.org é uma base de dados de filmes livre e aberta. É completamente actualizado por pessoas como você e usado por milhões todos os meses. Com o poderoso motor de busca disponível, também se tornou no favorito de muitos softwares média center, como o popular XBMC, para obter informação, posters e fanart que enriquecem a experiência do utilizador. - themoviedb.org este o bază de date de filme gratuită și deschisă. Este actualizată de oameni ca și tine. TMDb este curent folosită de milioane de oameni în fiecare lună și datorită API-ului puternic, este de asemena folosită de multe centre media populare ca XBMC pentru a obține informații despre filme, afișe și imagini produse de fani (Fanart) care îmbogățesc experiența utilizatorului. - themoviedb.org это бесплатная и открытая база данных фильмов. Она полностью поддерживается такими же людьми как и ты. В данный момент TMDb используется миллионами людей каждый месяц, и, с его мощным API, используется различными популярными медиа-центрами, такими как XBMC, для получения к Фильмам мета-данных, постеров и фанарта в целях улучшения пользовательского опыта. -+ themoviedb.org är en fri och öppen filmdatabas. Det drivs helt av människor som dig. TMDb används av miljontals människor varje månad och med deras kraftfulla API, är det också använt av många populära mediacenter som XBMC för att hämta filmmetadata, omslag och fanart för att förgylla användarens upplevelse. - themoviedb.org是一个开放和自由的电影数据库。它完全由象你一样的用户来掌控。TMDb每月为上百万用户提供服务，并通过强大的API界面为许多流行的媒体中心系统如XBMC提供电影资料、封面海报和同人画以丰富用户的体验。 - all - -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/changelog.txt xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/changelog.txt ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/changelog.txt 2011-12-24 19:47:46.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/changelog.txt 2012-01-19 16:07:11.000000000 +0100 -@@ -1,3 +1,6 @@ -+[B]3.0.0[/B] -+- major rewrite: utilize TMDb API v3, scraping set information, prioritize posters on the selected language -+ - [B]2.0.1[/B] - - fixed: imdb url nfo not resolving tmdb id - -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml 2011-12-24 19:47:46.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,6 +1,9 @@ - - - Fanart inschakelen -- Trailers van HD-Trailers.net inschakelen -+ Trailer inschakelen (HD-Trailers.net) - Voorkeurstaal -+ Verkrijg waardering van IMDb -+ Trailer inschakelen (YouTube) -+ Behoud originele titel - -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/English/strings.xml xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/English/strings.xml ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/English/strings.xml 2011-12-24 19:47:46.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/English/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,8 +1,8 @@ - - - Enable Fanart -- Enable Trailer -- Prefer Trailer from HD-Trailers.net -+ Enable Trailer (YouTube) -+ Enable Trailer (HD-Trailers.net) - Preferred language - Get rating from IMDb - Keep Original Title -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -0,0 +1,9 @@ -+ -+ -+ Fanitaide käytössä -+ Trailerit käytössä (YouTube) -+ Trailerit käytössä (HD-Trailers.net) -+ Ensisijainen kieli -+ Hae arvosana IMDb:stä -+ Näytä alkuperäinen nimi -+ -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/German/strings.xml xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/German/strings.xml ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/German/strings.xml 2011-12-24 19:47:46.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/German/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,7 +1,9 @@ - - - Aktiviere Fanart -- Aktiviere Trailer von HD-Trailers.net -+ Aktiviere Trailer (HD-Trailers.net) - Bevorzugte Sprache - Bewertung von IMDb nutzen -+ Aktiviere Trailer (YouTube) -+ Behalte original Filmtitel bei - -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml 2011-12-24 19:47:46.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,8 +1,8 @@ -  - - Fanartképek engedélyezése -- Filmelőzetesek engedélyezése -- Filmelőzetesek inkább a HD-Trailers.net-ről -+ Filmelőzetesek engedélyezése (YouTube) -+ Filmelőzetesek engedélyezése (HD-Trailers.net) - Preferált nyelv - Értékelés az IMDb-ről - Eredeti filmcím megtartása -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml 2011-12-24 19:47:46.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -2,10 +2,13 @@ - - - -- -+ - - - Aktivera fanart -- Aktivera trailers från HD-Trailers.net -+ Aktivera trailers (HD-Trailers.net) - Föredraget språk -- -\ No newline at end of file -+ Hämta betyg från IMDb -+ Aktivera trailers (YouTube) -+ Behåll originaltitel -+ -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/settings.xml xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/settings.xml ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/resources/settings.xml 2011-12-24 19:47:46.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/resources/settings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -5,5 +5,5 @@ - - - -- -+ - -diff -Naur xbmc-22ad8e4/addons/metadata.themoviedb.org/tmdb.xml xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/tmdb.xml ---- xbmc-22ad8e4/addons/metadata.themoviedb.org/tmdb.xml 2011-12-24 19:47:46.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.themoviedb.org/tmdb.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,7 +1,7 @@ -  -- -+ - -- -+ - - (.+) - -@@ -9,31 +9,28 @@ - - - -- -+ - (themoviedb.org/movie/)([0-9]*) - -- -+ - imdb....?/title/tt([0-9]*) - -- -+ - imdb....?/Title\?([0-9]*) - - - -- -+ - "movie","id":([0-9]*), - - - - -- -- "name":"([^"]*).*?"id":([^,]*).*?"released":"([0-9]*) -+ -+ "id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-.*?"title":"([^"]*) - -- -- "original_name":"([^"]*).*?"id":([^,]*).*?"released":"([0-9]*) -- -- -- "alternative_name":"([^"]*).*?"id":([^,]*).*?"released":"([0-9]*) -+ -+ "id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)- - - - -@@ -41,54 +38,81 @@ - - - -- "movie","id":([0-9]*), -+ "id":([0-9]*),"imdb - - -- "movie","id":[0-9]*,"imdb_id":"([^"]*) -+ "id":[0-9]*,"imdb_id":"([^"]*) -+ -+ -+ "original_title":"([^"]*) -+ -+ -+ "title":"([^"]*) -+ -+ -+ ^$ - -- -- "original_name":"([^"]*) -+ -+ (.+) - -- -- "name":"([^"]*) -+ -+ - -- -- "original_name":"([^"]*) -+ -+ - - -- "released":"([0-9]+)- -+ "release_date":"([0-9]+)- - -- -- "runtime":([0-9]+) -+ -+ "runtime":([0-9]+) - -- -- "tagline":"([^"]*) -+ -+ ^$ - -- -- "certification":"([^"]*) -+ -+ (.+) - -- -+ -+ "tagline":"([^"]*) -+ -+ -+ ^$ -+ -+ - (.+) - - -- "studios":\[([^\]]*) -+ "production_companies":\[([^\]]*) - - - "name":"([^"]*) - - -- "countries":\[([^\]]*) -+ "production_countries":\[([^\]]*) - - - "name":"([^"]*) - -- -- "name":"([^"]*)","job":"Director" -+ -+ -+ "id":[0-9]*,"imdb_id":"([^"]*) -+ -+ IMDb -+ -+ -+ TMDb -+ -+ -+ -+ -+ -+ - -- -- "name":"([^"]*)","job":"[^"]*","department":"Writing" -+ -+ - -- -+ - - - -@@ -100,9 +124,6 @@ - - - -- -- "movie","id":[0-9]*,"imdb_id":"([^"]*) -- - - - -@@ -114,23 +135,47 @@ - - - -- "original_name":"([^"]*) -+ "original_title":"([^"]*) - - 480p - - - -- "original_name":"([^"]*) -+ "original_title":"([^"]*) - - 720p - - - -- "original_name":"([^"]*) -+ "original_title":"([^"]*) - - 1080p - - - - -+ -+ -+ -+ "title":"([^"]*) -+ -+ -+ -+ -+ -+ -+ -+ "runtime":([0-9]+) -+ -+ -+ -+ -+ -+ -+ -+ "tagline":"([^"]*) -+ -+ -+ -+ - -diff -Naur xbmc-22ad8e4/addons/metadata.tvdb.com/addon.xml xbmc-22ad8e4.patch/addons/metadata.tvdb.com/addon.xml ---- xbmc-22ad8e4/addons/metadata.tvdb.com/addon.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.tvdb.com/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -1,7 +1,7 @@ - - - - -@@ -11,25 +11,31 @@ - library="tvdb.xml" - cachepersistence="00:15"/> - -+ Изтегля информация за ТВ Сериали от TheTVDB.com - Fetch TV show metadata from TheTVDB.com - Scraper für Fernsehserien von TheTVDB.com - Descarga información de Series de TV desde TVDB.com -+ Nouda TV-ohjelmien tietoja TheTVDB.com -sivustolta - Scraper TheTVDB.com pour les séries TV - TV műsor információk a TheTVDB.com-ról - Seriemetadata ophalen van TheTVDB.com - Pobieraj dane o serialach TV z TheTVDB.com - Scraper de séries de TV TVDB.com - Загрузка информации о ТВ-шоу с TheTVDB.com -+ Skrapa för TV-seriemetadata från TVDB.com - 从TheTVDB.com获取电视剧集信息 -+ TheTVDB.com предоставя информация за ТВ Сериали. Сайтът представлява една огромна, безплатна и отворена база от данни. Всеки може да редактира (наличната информация) или да добавя нова. Съдържа подробни данни за много сериали и на различни езици. Цялото съдържание на сайта и публикуваните изображения са предоставени от потребители за потребителите. Съдържанието на сайтът и базата от данни е с отворен код под лиценза GPL. - TheTVDB.com is a TV Scraper. The site is a massive open database that can be modified by anybody and contains full meta data for many shows in different languages. All content and images on the site have been contributed by their users for users and have a high standard or quality. The database schema and website are open source under the GPL. - TheTVDB.com ist ein Scraper für TV-Serien. Die Seite hat eine riesige offene Datenbank, welche von jedem geändert werden kann. Sie enthält weitreichende Meta-Daten für viele TV-Serien in verschiedenen Sprachen. Alle Inhalte und Bilder dieser Seite stammen von User für User und haben eine hohe Qualität. Das Datenbankschema und die Webseite sind OpenSource unter dem GPL-Recht - TheTVDB.com es un scraper para series de televisión. Esta pagina web es una base de datos immensa que puede ser modificada por cualquiera y contiene informaciós de series y capítulos en distintos idiomas. Todo el contenido y las imágenes de este sitio han sido creadas y enviadas por sus usuarios bajo unas estrictas normas de tamaño y calidad. El esquema de la base de datos y la página web són consultables y de código abierto bajo licencia GPL. -+ TheTVDB.com on TV-ohjelmatietojen lataaja. Sivusto on massiivinen avoin tietokanta, jonka tietoja kaikki pystyy muokkaamaan ja se sisältää täydet tiedot monista TV-ohjelmista usealla eri kielellä. Kaikki sivuston sisältö ja kuvat on korkealaatuisia ja käyttäjien lahjoittamia. Tietokanta ja sivusto ovat GPL-lisenssin alaisia. - TheTVDB.com est un scraper TV. Le site est une immense base de données libre qui peut être modifiée par n'importe qui et qui contient toutes les infos pour beaucoup de séries en différentes langues. Toutes les infos et images du site proviennent de contributions d'utilisateurs pour les utilisateurs et sont d'excellente qualité. Le schéma de la base de données et le site Web sont en open source sous licence GPL. - A TheTVDB.com egy TV műsor leolvasó. Az oldal egy hatalmas adatbázis amit bárki szabadon módosíthat és rengeteg TV műsor adatait tartalmazza különböző nyelveken. A minőségi tartalom és képanyag ezen az oldalon felhasználóktól származik más felhasználók számára. Az adatbázisstruktúra és a weblap nyílt forráskódú a GPL licenc alatt. - TheTVDB.com is een seriescraper. De site is een gigantische open databank die iedereen kan aanpassen en uitbreiden, en biedt metadata aan voor TV-series in verschillende talen. Alle inhoud en afbeeldingen zijn afkomstig van gebruikers en moeten een grondige kwaliteitscontrole doorstaan. Het databankschema en de websitecode zijn vrijgegeven onder de open source GPL-licentie. - TheTVDB.com jest scraperem TV. Ten serwis jest ogromną, wielojęzykową i otwartą bazą danych o serialach, którą może edytować każdy. Zawartość tego serwisu została dostarczona przez użytkowników, dla użytkowników. Dostępne materiały mają wysoki standard lub jakość. - O TheTVDB.com é um motor de busca para séries de TV. O site é uma gigantesca base de dados aberta que pode ser alterada por qualquer pessoa e contém informação em várias línguas. Todos os conteúdos do site foram enviados por utilizadores com um elevado padrão de qualidade. A base de dados e site funcionam sob uma licença GPL de software livre. - TheTVDB.com это обработчик для ТВ-шоу. Сайт представляет собой массивную открытую базу данных, которая может быть изменене кем угодно и содержит полные мета-данные для многих шоу и сериалов на различных языках. Все содержанимое и изображения на сайте были выложены его пользователями для пользователей, и имеют высокий уровень или качество. Схемы базы данных и веб-сайт выполнены под открытым исходным кодом и доступны по лицензии GPL. -+ TVDB.com är en TV-skrapa. Sajten är en massiv öppen databas som kan ändras av vem som helst och innehåller full metadata för mängder av serier på olika språk. Allt innehåll och bilder på sajten har bidragits av användare för användare och har en hög standard eller kvalitet. Databasschemat och webbsidan är licensierat som GPL. - TheTVDB.com是一个电视刮削器。该网站是一个巨大的开放式数据库，任何人都可以修改，包含多语言的许多电视剧集资料。网站设定了高品质标准，所有图片和内容都由用户提供。数据库结构和网站均在GPL许可下开源。 - all - -diff -Naur xbmc-22ad8e4/addons/metadata.tvdb.com/changelog.txt xbmc-22ad8e4.patch/addons/metadata.tvdb.com/changelog.txt ---- xbmc-22ad8e4/addons/metadata.tvdb.com/changelog.txt 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.tvdb.com/changelog.txt 2012-01-19 16:07:11.000000000 +0100 -@@ -1,3 +1,6 @@ -+[B]1.2.4[/B] -+- Added: support for imdb url nfo's -+ - [B]1.2.3[/B] - - Fixed: fixed broken scraping under certain circumtaces - -@@ -20,4 +23,4 @@ - - Fixed: fallback to other image languages if preferred doesn't exist - - [B]1.0.7[/B] --- Fixed: season thumbs -\ No newline at end of file -+- Fixed: season thumbs -diff -Naur xbmc-22ad8e4/addons/metadata.tvdb.com/resources/language/Swedish/strings.xml xbmc-22ad8e4.patch/addons/metadata.tvdb.com/resources/language/Swedish/strings.xml ---- xbmc-22ad8e4/addons/metadata.tvdb.com/resources/language/Swedish/strings.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.tvdb.com/resources/language/Swedish/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -2,12 +2,12 @@ - - - -- -+ - - - Använd DVD-ordning - Använd absolut ordning (singelsäsong) - Aktivera fanart -- Föredra posters -+ Föredra omslag - Språk - -\ No newline at end of file -diff -Naur xbmc-22ad8e4/addons/metadata.tvdb.com/tvdb.xml xbmc-22ad8e4.patch/addons/metadata.tvdb.com/tvdb.xml ---- xbmc-22ad8e4/addons/metadata.tvdb.com/tvdb.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.tvdb.com/tvdb.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -5,8 +5,20 @@ - - http://(?:www\.)?thetvdb.com/(?:index\.php)?\?tab=series&id=([0-9]+) - -+ -+ imdb....?/title/tt([0-9]*) -+ -+ -+ imdb....?/Title\?([0-9]*) -+ - - -+ -+ -+ <seriesid>([0-9]*)</seriesid> -+ -+ -+ - - - (.*?http://www.thetvdb.com.*) -diff -Naur xbmc-22ad8e4/addons/metadata.yahoomusic.com/addon.xml xbmc-22ad8e4.patch/addons/metadata.yahoomusic.com/addon.xml ---- xbmc-22ad8e4/addons/metadata.yahoomusic.com/addon.xml 2011-12-24 19:47:45.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.yahoomusic.com/addon.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -10,15 +10,21 @@ - language="en" - library="yahoomusic.xml"/> - -+ Сваля инф. за музикални клипове от Yahoo! - Yahoo! Music Video Scraper -+ Yahoo! musiikkivideotietojen lataaja - Yahoo! videóklip leolvasó - 야후! 뮤직 비디오 스크래퍼 - Scraper teledysków Yahoo! - Scraper de música Yahoo! -+ Skrapa för Yahoo! musik -+ Сваля информация за музикални клипове - Download Music Video information -+ Lataa musiikkivideoiden tiedot - Videóklip információk letöltése a Yahoo! webhelyről - 뮤직 비디오 정보 다운로드 - Pobieraj informacje o teledyskach z music.yahoo.com - Descarregar informação de filmes de music.yahoo.com -+ Ladda ner musikvideoinformation från music.yahoo.com - - -diff -Naur xbmc-22ad8e4/addons/metadata.yahoomusic.com/resources/language/Finnish/strings.xml xbmc-22ad8e4.patch/addons/metadata.yahoomusic.com/resources/language/Finnish/strings.xml ---- xbmc-22ad8e4/addons/metadata.yahoomusic.com/resources/language/Finnish/strings.xml 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.yahoomusic.com/resources/language/Finnish/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -0,0 +1,5 @@ -+ -+ -+ -+ Pienoiskuvien koko -+ -diff -Naur xbmc-22ad8e4/addons/metadata.yahoomusic.com/resources/language/Swedish/strings.xml xbmc-22ad8e4.patch/addons/metadata.yahoomusic.com/resources/language/Swedish/strings.xml ---- xbmc-22ad8e4/addons/metadata.yahoomusic.com/resources/language/Swedish/strings.xml 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-22ad8e4.patch/addons/metadata.yahoomusic.com/resources/language/Swedish/strings.xml 2012-01-19 16:07:11.000000000 +0100 -@@ -0,0 +1,9 @@ -+ -+ -+ -+ -+ -+ -+ -+ Miniatyrstorlek -+ diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9996-fix_crypted_dvd_playback.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9996-fix_crypted_dvd_playback.patch deleted file mode 100644 index 71c63633b5..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9996-fix_crypted_dvd_playback.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dda8fc7e4312acc0353c320174a6c7a009b4c57f Mon Sep 17 00:00:00 2001 -From: CrystalP -Date: Mon, 26 Dec 2011 14:17:03 -0500 -Subject: [PATCH] fix crypted dvd playback - -with recent changes to playdisc, CDVDInputStreamNavigator::Open now -receives a full path, which must be truncated more completely or libdvdcss -won't be able to decrypt. ---- - .../DVDInputStreams/DVDInputStreamNavigator.cpp | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp -index d4cc77b..b9f42ca 100644 ---- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp -+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp -@@ -80,6 +80,9 @@ bool CDVDInputStreamNavigator::Open(const char* strFile, const std::string& cont - { - strDVDFile[strlen(strDVDFile) - 13] = '\0'; - } -+ if (strncasecmp(strDVDFile + strlen(strDVDFile) - 8, "VIDEO_TS", 8) == 0) -+ strDVDFile[strlen(strDVDFile) - 9] = '\0'; -+ - #if defined(__APPLE__) && !defined(__arm__) - // if physical DVDs, libdvdnav wants "/dev/rdiskN" device name for OSX, - // strDVDFile will get realloc'ed and replaced IF this is a physical DVD. --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.01-PVR-PR390.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.01-PVR-PR390.patch deleted file mode 100644 index 3738e45c1d..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.01-PVR-PR390.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 994a4cb70a9437105ef9c176d5d79939382d22e8 Mon Sep 17 00:00:00 2001 -From: Gregor Fuis -Date: Mon, 2 Jan 2012 17:13:54 +0100 -Subject: [PATCH] tvheadend pvr client: retry connecting within timout - ---- - xbmc/pvrclients/tvheadend/HTSPConnection.cpp | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/xbmc/pvrclients/tvheadend/HTSPConnection.cpp b/xbmc/pvrclients/tvheadend/HTSPConnection.cpp -index 5f5865d..4adb45b 100644 ---- a/xbmc/pvrclients/tvheadend/HTSPConnection.cpp -+++ b/xbmc/pvrclients/tvheadend/HTSPConnection.cpp -@@ -57,12 +57,20 @@ bool CHTSPConnection::Connect() - if (m_bIsConnected) - return true; - -+ cTimeMs RetryTimeout; - char errbuf[1024]; - int errlen = sizeof(errbuf); - - XBMC->Log(LOG_DEBUG, "%s - connecting to '%s', port '%d'", __FUNCTION__, m_strHostname.c_str(), m_iPortnumber); - -- m_fd = tcp_connect(m_strHostname.c_str(), m_iPortnumber, errbuf, errlen, m_iConnectTimeout); -+ m_fd = INVALID_SOCKET; -+ while (m_fd == INVALID_SOCKET && RetryTimeout.Elapsed() < (uint)m_iConnectTimeout * 1000) -+ { -+ m_fd = tcp_connect(m_strHostname.c_str(), m_iPortnumber, errbuf, errlen, -+ m_iConnectTimeout * 1000 - RetryTimeout.Elapsed()); -+ cCondWait::SleepMs(100); -+ } -+ - if(m_fd == INVALID_SOCKET) - { - XBMC->Log(LOG_ERROR, "%s - failed to connect to the backend (%s)", __FUNCTION__, errbuf); --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.02-PVR-PR366.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.02-PVR-PR366.patch deleted file mode 100644 index 593f26c646..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.02-PVR-PR366.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 949162c47809bb7e9ae2e2b24aad7776a737ecc4 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Tue, 3 Jan 2012 02:09:37 +0100 -Subject: [PATCH] pvr: remove deleted channels from the internal group too. - closes #366 - ---- - xbmc/pvr/channels/PVRChannelGroup.cpp | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/xbmc/pvr/channels/PVRChannelGroup.cpp b/xbmc/pvr/channels/PVRChannelGroup.cpp -index 9748fb0..0f74527 100644 ---- a/xbmc/pvr/channels/PVRChannelGroup.cpp -+++ b/xbmc/pvr/channels/PVRChannelGroup.cpp -@@ -608,11 +608,8 @@ bool CPVRChannelGroup::RemoveDeletedChannels(const CPVRChannelGroup &channels) - /* since it was not found in the internal group, it was deleted from the backend */ - channel->Delete(); - } -- else -- { -- erase(begin() + iChannelPtr); -- } - -+ erase(begin() + iChannelPtr); - m_bChanged = true; - bReturn = true; - } --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.03-PR613.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.03-PR613.patch deleted file mode 100644 index ee26e060c0..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.03-PR613.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 3daa7b4ea1ef04a347d660f4c696beaaeb30a83e Mon Sep 17 00:00:00 2001 -From: xbmc -Date: Fri, 6 Jan 2012 16:07:30 +0100 -Subject: [PATCH] vdpau: fix segfault on recovery - ---- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 74 +++++++++++++++--------- - 1 files changed, 46 insertions(+), 28 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 823686c..efd05de 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -207,6 +207,16 @@ void CVDPAU::Close() - FiniVDPAUOutput(); - FiniVDPAUProcs(); - -+ while (!m_videoSurfaces.empty()) -+ { -+ vdpau_render_state *render = m_videoSurfaces.back(); -+ m_videoSurfaces.pop_back(); -+ if (render->bitstream_buffers_allocated) -+ m_dllAvUtil.av_freep(&render->bitstream_buffers); -+ render->bitstream_buffers_allocated = 0; -+ free(render); -+ } -+ - g_Windowing.Unregister(this); - m_dllAvUtil.Unload(); - } -@@ -698,10 +708,13 @@ void CVDPAU::InitVDPAUProcs() - VdpStatus vdp_st; - - // Create Device -+ // tested on 64bit Ubuntu 11.10 and it deadlocked without this -+ XLockDisplay(m_Display); - vdp_st = dl_vdp_device_create_x11(m_Display, //x_display, - mScreen, //x_screen, - &vdp_device, - &vdp_get_proc_address); -+ XUnlockDisplay(m_Display); - - CLog::Log(LOGNOTICE,"vdp_device = 0x%08x vdp_st = 0x%08x",vdp_device,vdp_st); - if (vdp_st != VDP_STATUS_OK) -@@ -779,16 +792,6 @@ void CVDPAU::InitVDPAUProcs() - - void CVDPAU::FiniVDPAUProcs() - { -- while (!m_videoSurfaces.empty()) -- { -- vdpau_render_state *render = m_videoSurfaces.back(); -- m_videoSurfaces.pop_back(); -- if (render->bitstream_buffers_allocated) -- m_dllAvUtil.av_freep(&render->bitstream_buffers); -- render->bitstream_buffers_allocated = 0; -- free(render); -- } -- - if (vdp_device == VDP_INVALID_HANDLE) return; - - VdpStatus vdp_st; -@@ -827,16 +830,14 @@ void CVDPAU::FiniVDPAUOutput() - return; - decoder = VDP_INVALID_HANDLE; - -- while (!m_videoSurfaces.empty()) -+ for (unsigned int i = 0; i < m_videoSurfaces.size(); ++i) - { -- vdpau_render_state *render = m_videoSurfaces.back(); -- m_videoSurfaces.pop_back(); -- if (render->bitstream_buffers_allocated) -- m_dllAvUtil.av_freep(&render->bitstream_buffers); -- render->bitstream_buffers_allocated = 0; -- vdp_st = vdp_video_surface_destroy(render->surface); -- render->surface = VDP_INVALID_HANDLE; -- free(render); -+ vdpau_render_state *render = m_videoSurfaces[i]; -+ if (render->surface != VDP_INVALID_HANDLE) -+ { -+ vdp_st = vdp_video_surface_destroy(render->surface); -+ render->surface = VDP_INVALID_HANDLE; -+ } - if (CheckStatus(vdp_st, __LINE__)) - return; - } -@@ -999,14 +1000,14 @@ bool CVDPAU::FiniOutputMethod() - { - CLog::Log(LOGDEBUG, "GLX: Destroying glPixmap"); - glXDestroyPixmap(m_Display, m_glPixmap); -- m_glPixmap = NULL; -+ m_glPixmap = None; - } - - if (m_Pixmap) - { - CLog::Log(LOGDEBUG, "GLX: Destroying XPixmap"); - XFreePixmap(m_Display, m_Pixmap); -- m_Pixmap = NULL; -+ m_Pixmap = None; - } - - outputSurface = presentSurface = VDP_INVALID_HANDLE; -@@ -1086,7 +1087,8 @@ bool CVDPAU::IsSurfaceValid(vdpau_render_state *render) - { - // find render state in queue - bool found(false); -- for(unsigned int i = 0; i < m_videoSurfaces.size(); ++i) -+ unsigned int i; -+ for(i = 0; i < m_videoSurfaces.size(); ++i) - { - if(m_videoSurfaces[i] == render) - { -@@ -1094,7 +1096,18 @@ bool CVDPAU::IsSurfaceValid(vdpau_render_state *render) - break; - } - } -- return found; -+ if (!found) -+ { -+ CLog::Log(LOGERROR,"%s - video surface not found", __FUNCTION__); -+ return false; -+ } -+ if (m_videoSurfaces[i]->surface == VDP_INVALID_HANDLE) -+ { -+ m_videoSurfaces[i]->state = 0; -+ return false; -+ } -+ -+ return true; - } - - int CVDPAU::FFGetBuffer(AVCodecContext *avctx, AVFrame *pic) -@@ -1140,11 +1153,17 @@ int CVDPAU::FFGetBuffer(AVCodecContext *avctx, AVFrame *pic) - CLog::Log(LOGWARNING, "CVDPAU::FFGetBuffer - calloc failed"); - return -1; - } -+ render->surface = VDP_INVALID_HANDLE; -+ vdp->m_videoSurfaces.push_back(render); -+ } -+ -+ if (render->surface == VDP_INVALID_HANDLE) -+ { - vdp_st = vdp->vdp_video_surface_create(vdp->vdp_device, -- vdp->vdp_chroma_type, -- avctx->coded_width, -- avctx->coded_height, -- &render->surface); -+ vdp->vdp_chroma_type, -+ avctx->coded_width, -+ avctx->coded_height, -+ &render->surface); - vdp->CheckStatus(vdp_st, __LINE__); - if (vdp_st != VDP_STATUS_OK) - { -@@ -1152,7 +1171,6 @@ int CVDPAU::FFGetBuffer(AVCodecContext *avctx, AVFrame *pic) - CLog::Log(LOGERROR, "CVDPAU::FFGetBuffer - No Video surface available could be created"); - return -1; - } -- vdp->m_videoSurfaces.push_back(render); - } - - if (render == NULL) --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.03-PR636.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.03-PR636.patch deleted file mode 100644 index 4c6e173aef..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.03-PR636.patch +++ /dev/null @@ -1,121 +0,0 @@ -From ac6a16ff11ba6087cba773938c34558a4bce4837 Mon Sep 17 00:00:00 2001 -From: Jonathan Marshall -Date: Wed, 18 Jan 2012 11:48:17 +1300 -Subject: [PATCH] Fix finding of local thumbs/fanart for VIDEO_TS/BDMV items - in the parent folder - ---- - xbmc/FileItem.cpp | 45 +++++++++++++++++++++++++++++++-------------- - xbmc/FileItem.h | 14 ++++++++++++++ - 2 files changed, 45 insertions(+), 14 deletions(-) - -diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp -index 8e2f1df..c21c0f4 100644 ---- a/xbmc/FileItem.cpp -+++ b/xbmc/FileItem.cpp -@@ -2112,25 +2112,11 @@ void CFileItemList::StackFolders() - if (!dvdPath.IsEmpty()) - { - // NOTE: should this be done for the CD# folders too? -- /* set the thumbnail based on folder */ -- item->SetCachedVideoThumb(); -- if (!item->HasThumbnail()) -- item->SetUserVideoThumb(); -- - item->m_bIsFolder = false; - item->SetPath(dvdPath); - item->SetLabel2(""); - item->SetLabelPreformated(true); - m_sortMethod = SORT_METHOD_NONE; /* sorting is now broken */ -- -- /* override the previously set thumb if video_ts.ifo has any */ -- /* otherwise user can't set icon on the stacked file as that */ -- /* will allways be set on the video_ts.ifo file */ -- CStdString thumb(item->GetCachedVideoThumb()); -- if(CFile::Exists(thumb)) -- item->SetThumbnailImage(thumb); -- else -- item->SetUserVideoThumb(); - } - } - } -@@ -2646,6 +2632,15 @@ CStdString CFileItem::GetUserVideoThumb() const - if (CFile::Exists(fileThumb)) - return fileThumb; - -+ if (IsOpticalMediaFile()) -+ { // special case for optical media "folders" - check the parent folder (or parent of parent) -+ // TODO: A better way to handle this would be to treat stacked folders as folders rather than files. -+ CFileItem item(GetLocalMetadataPath(), true); -+ CStdString thumb(item.GetUserVideoThumb()); -+ if (!thumb.IsEmpty()) -+ return thumb; -+ } -+ - // 2. - check movie.tbn, as long as it's not a folder - if (!m_bIsFolder) - { -@@ -2886,6 +2881,12 @@ CStdString CFileItem::GetLocalFanart() const - - CFileItemList items; - CDirectory::GetDirectory(strDir, items, g_settings.m_pictureExtensions, false, false, DIR_CACHE_ALWAYS, false, true); -+ if (IsOpticalMediaFile()) -+ { // grab from the optical media parent folder as well - see GetUserVideoThumb -+ CFileItemList moreItems; -+ CDirectory::GetDirectory(GetLocalMetadataPath(), moreItems, g_settings.m_pictureExtensions, false, false, DIR_CACHE_ALWAYS, false, true); -+ items.Append(moreItems); -+ } - - CStdStringArray fanarts; - StringUtils::SplitString(g_advancedSettings.m_fanartImages, "|", fanarts); -@@ -2912,6 +2913,22 @@ CStdString CFileItem::GetLocalFanart() const - return ""; - } - -+CStdString CFileItem::GetLocalMetadataPath() const -+{ -+ if (m_bIsFolder && !IsFileFolder()) -+ return m_strPath; -+ -+ CStdString parent(URIUtils::GetParentPath(m_strPath)); -+ CStdString parentFolder(parent); -+ URIUtils::RemoveSlashAtEnd(parentFolder); -+ parentFolder = URIUtils::GetFileName(parentFolder); -+ if (parentFolder == "VIDEO_TS" || parentFolder == "BDMV") -+ { // go back up another one -+ parent = URIUtils::GetParentPath(parent); -+ } -+ return parent; -+} -+ - CStdString CFileItem::GetCachedFanart() const - { - return CThumbnailCache::GetFanart(*this); -diff --git a/xbmc/FileItem.h b/xbmc/FileItem.h -index d621880..c5a748b 100644 ---- a/xbmc/FileItem.h -+++ b/xbmc/FileItem.h -@@ -258,6 +258,20 @@ class CFileItem : - void SetUserVideoThumb(); - void SetUserMusicThumb(bool alwaysCheckRemote = false); - -+ /*! \brief Get the path where we expect local metadata to reside. -+ For a folder, this is just the existing path (eg tvshow folder) -+ For a file, this is the parent path, with exceptions made for VIDEO_TS and BDMV files -+ -+ Three cases are handled: -+ -+ /foo/bar/movie_name/file_name -> /foo/bar/movie_name/ -+ /foo/bar/movie_name/VIDEO_TS/file_name -> /foo/bar/movie_name/ -+ /foo/bar/movie_name/BDMV/file_name -> /foo/bar/movie_name/ -+ -+ \sa URIUtils::GetParentPath -+ */ -+ CStdString GetLocalMetadataPath() const; -+ - // finds a matching local trailer file - CStdString FindTrailer() const; - --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.03-fix_movie.nfo_not_being_picked_up_in_the_movie_folder_of_bluray_or_dvd_rips.patch.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.03-fix_movie.nfo_not_being_picked_up_in_the_movie_folder_of_bluray_or_dvd_rips.patch.patch deleted file mode 100644 index ef93b9fdf1..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-9997.03-fix_movie.nfo_not_being_picked_up_in_the_movie_folder_of_bluray_or_dvd_rips.patch.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fb3128b24683e3b700f10aa3f8e3c58eb0a2c41a Mon Sep 17 00:00:00 2001 -From: Jonathan Marshall -Date: Thu, 19 Jan 2012 12:18:17 +1300 -Subject: [PATCH] fix movie.nfo not being picked up in the movie folder of - bluray or dvd rips - ---- - xbmc/video/VideoInfoScanner.cpp | 13 +++---------- - 1 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp -index 4534aa1..5cf75a9 100644 ---- a/xbmc/video/VideoInfoScanner.cpp -+++ b/xbmc/video/VideoInfoScanner.cpp -@@ -1445,17 +1445,10 @@ - } - } - -- if (!nfoFile.IsEmpty() && item->IsOpticalMediaFile()) -+ if (nfoFile.IsEmpty() && item->IsOpticalMediaFile()) - { -- CStdString parent(URIUtils::GetParentPath(item->GetPath())); -- CStdString parentFolder(parent); -- URIUtils::RemoveSlashAtEnd(parentFolder); -- if (parentFolder == "VIDEO_TS" || parentFolder == "BDMV") -- { // check for movie.nfo in the parent folder -- parent = URIUtils::GetParentPath(parent); -- CFileItem parentDirectory(parent, true); -- nfoFile = GetnfoFile(&parentDirectory, true); -- } -+ CFileItem parentDirectory(item->GetLocalMetadataPath(), true); -+ nfoFile = GetnfoFile(&parentDirectory, true); - } - } - // folders (or stacked dvds) can take any nfo file if there's a unique one --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-013-reenable_lcd_config_settings-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-013-reenable_lcd_config_settings-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-013-reenable_lcd_config_settings-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-801-cec-PR570.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-801-cec-PR570.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-801-cec-PR570.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-801-cec-PR570.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-902.01-xvba_support-eb7c9d5b4988582b041b97c88903e1d771bdbc33.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-981-toggleButtonState.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-981-toggleButtonState.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-981-toggleButtonState.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-981-toggleButtonState.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-990-changed-don-t-use-x-parameter-with-df.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-990-changed-don-t-use-x-parameter-with-df.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-990-changed-don-t-use-x-parameter-with-df.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-a62f4d4-990-changed-don-t-use-x-parameter-with-df.patch