From 5fbd78173855b173a6e6bcb6d8330e8cd1660ad3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 26 Oct 2010 00:33:48 +0200 Subject: [PATCH] xbmc: add some patches, thanks to held Signed-off-by: Stephan Raue --- ...1-advancedsettings-alwaysextractflags.diff | 23 ++++++++++++++++++ ...ettings-videolibrary.flattenmoviesets.diff | 24 +++++++++++++++++++ .../xbmc/patches/advancedsettings_patches.txt | 4 ++++ 3 files changed, 51 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/901-advancedsettings-alwaysextractflags.diff create mode 100644 packages/mediacenter/xbmc/patches/902-advancedsettings-videolibrary.flattenmoviesets.diff create mode 100644 packages/mediacenter/xbmc/patches/advancedsettings_patches.txt diff --git a/packages/mediacenter/xbmc/patches/901-advancedsettings-alwaysextractflags.diff b/packages/mediacenter/xbmc/patches/901-advancedsettings-alwaysextractflags.diff new file mode 100644 index 0000000000..de16d8ec29 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/901-advancedsettings-alwaysextractflags.diff @@ -0,0 +1,23 @@ +diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp +--- xbmc-dharma-35003/xbmc/GUISettings.cpp 2010-10-25 15:36:18.000000000 +0200 ++++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp 2010-10-25 23:34:14.131974258 +0200 +@@ -618,6 +618,7 @@ + AddInt(vid, "myvideos.selectaction", 22079, SELECT_ACTION_PLAY_OR_RESUME, SELECT_ACTION_CHOOSE, 1, SELECT_ACTION_INFO, SPIN_CONTROL_TEXT); + AddBool(NULL, "myvideos.treatstackasfile", 20051, true); + AddBool(vid, "myvideos.extractflags",20433, true); ++ AddBool(vid, "myvideos.alwaysextractflags",20433, false); + AddBool(vid, "myvideos.cleanstrings", 20418, false); + AddBool(NULL, "myvideos.extractthumb",20433, true); + +diff -Naur xbmc-dharma-35003/xbmc/ThumbLoader.cpp xbmc-dharma-35003.patch/xbmc/ThumbLoader.cpp +--- xbmc-dharma-35003/xbmc/ThumbLoader.cpp 2010-10-25 15:37:06.000000000 +0200 ++++ xbmc-dharma-35003.patch/xbmc/ThumbLoader.cpp 2010-10-25 23:34:04.223857821 +0200 +@@ -148,7 +148,7 @@ + m_item.SetThumbnailImage(m_target); + } + } +- else if (m_item.HasVideoInfoTag() && !m_item.GetVideoInfoTag()->HasStreamDetails()) ++ else if (m_item.HasVideoInfoTag() && (!m_item.GetVideoInfoTag()->HasStreamDetails() || g_guiSettings.GetBool("myvideos.alwaysextractflags"))) + { + CLog::Log(LOGDEBUG,"%s - trying to extract filestream details from video file %s", __FUNCTION__, m_path.c_str()); + result = CDVDFileInfo::GetFileStreamDetails(&m_item); diff --git a/packages/mediacenter/xbmc/patches/902-advancedsettings-videolibrary.flattenmoviesets.diff b/packages/mediacenter/xbmc/patches/902-advancedsettings-videolibrary.flattenmoviesets.diff new file mode 100644 index 0000000000..a22d3acb65 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/902-advancedsettings-videolibrary.flattenmoviesets.diff @@ -0,0 +1,24 @@ +diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp +--- xbmc-dharma-35003/xbmc/GUISettings.cpp 2010-10-25 23:37:10.165043528 +0200 ++++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp 2010-10-25 23:37:27.888251923 +0200 +@@ -528,6 +528,7 @@ + AddBool(NULL, "videolibrary.seasonthumbs", 20382, true); + AddBool(vdl, "videolibrary.actorthumbs", 20402, true); + AddInt(vdl, "videolibrary.flattentvshows", 20412, 1, 0, 1, 2, SPIN_CONTROL_TEXT); ++ AddBool(NULL, "videolibrary.flattenmoviesets", 22002, false); + AddBool(vdl, "videolibrary.updateonstartup", 22000, false); + AddBool(vdl, "videolibrary.backgroundupdate", 22001, false); + AddSeparator(vdl, "videolibrary.sep3"); +diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp +--- xbmc-dharma-35003/xbmc/VideoDatabase.cpp 2010-10-25 15:36:19.000000000 +0200 ++++ xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp 2010-10-25 23:37:27.887251911 +0200 +@@ -4394,7 +4394,7 @@ + if (NULL == m_pDS.get()) return false; + + CStdString strSQL = "select * from movieview "; +- if (fetchSets) ++ if (fetchSets && !g_guiSettings.GetBool("videolibrary.flattenmoviesets")) + { + // not getting a set, so grab all sets that match this where clause first + CStdString setsWhere; +diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp.orig xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp.orig diff --git a/packages/mediacenter/xbmc/patches/advancedsettings_patches.txt b/packages/mediacenter/xbmc/patches/advancedsettings_patches.txt new file mode 100644 index 0000000000..b1a3c55293 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/advancedsettings_patches.txt @@ -0,0 +1,4 @@ + bei openelec fehlt mir eigentlich nur noch die bluetooth ps3 remote und mein metadata patch :) + wo find ich den patch nochmal? + http://trac.xbmc.org/ticket/10292 und http://trac.xbmc.org/ticket/10298 + http://trac.xbmc.org/attachment/ticket/10292/advancedsettings-alwaysextractflags.diff und http://trac.xbmc.org/attachment/ticket/10298/advancedsettings-videolibrary.flattenmoviesets.diff