[meego-commits] 24916: Changes to MeeGo:1.2:oss/xbmc
rui_long
no_reply at build.meego.com
Mon Jun 18 00:38:17 UTC 2012
Hi,
I have made the following changes to xbmc in project MeeGo:1.2:oss. Please review and accept ASAP.
Thank You,
rui_long
[This message was auto-generated]
---
Request #24916:
submit: devel:tv:1.2/xbmc(r16)(update) -> MeeGo:1.2:oss/xbmc
Message:
None
State: new 2012-06-17T16:33:10 rui_long
Comment: None
changes files:
--------------
new:
----
0010-fix-playback-of-files-not-matching-either-audio-or-v.patch
0011-remove-further-settings-which-are-unusable.patch
spec files:
-----------
--- xbmc.spec
+++ xbmc.spec
@@ -23,6 +23,8 @@
Patch6: 0007-trim-options-bar-in-video-OSD.patch
Patch7: 0008-fix-language-strings-for-UMMS-errors.patch
Patch8: 0009-use-apple-TV-bufferring-settings-to-improve-perf.patch
+Patch9: 0010-fix-playback-of-files-not-matching-either-audio-or-v.patch
+Patch10: 0011-remove-further-settings-which-are-unusable.patch
Requires: avahi
Requires: SDL
Requires: SDL_mixer
@@ -120,6 +122,10 @@
%patch7 -p1
# 0009-use-apple-TV-bufferring-settings-to-improve-perf.patch
%patch8 -p1
+# 0010-fix-playback-of-files-not-matching-either-audio-or-v.patch
+%patch9 -p1
+# 0011-remove-further-settings-which-are-unusable.patch
+%patch10 -p1
# >> setup
# << setup
other changes:
--------------
++++++ 0010-fix-playback-of-files-not-matching-either-audio-or-v.patch (new)
--- 0010-fix-playback-of-files-not-matching-either-audio-or-v.patch
+++ 0010-fix-playback-of-files-not-matching-either-audio-or-v.patch
+From c8919e5e41b4f983423441283e01b18a291b7cf3 Mon Sep 17 00:00:00 2001
+From: Brendan Le Foll <brendan at fridu.org>
+Date: Wed, 13 Jun 2012 17:30:05 +0100
+Subject: [PATCH 10/10] fix playback of files not matching either audio or
+ video profile according to xbmc and let umms
+ play/error appropriately
+
+---
+ xbmc/cores/meegoplayer/MeegoPlayer.cpp | 23 ++++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/xbmc/cores/meegoplayer/MeegoPlayer.cpp b/xbmc/cores/meegoplayer/MeegoPlayer.cpp
+index 7d28c66..3330adc 100644
+--- a/xbmc/cores/meegoplayer/MeegoPlayer.cpp
++++ b/xbmc/cores/meegoplayer/MeegoPlayer.cpp
+@@ -47,8 +47,8 @@
+
+ // Default time after which the item's playcount is incremented
+ #define DEFAULT_PLAYCOUNT_MIN_TIME 10
+-// DBUS reply timeout
+-#define DBUS_REPLY_TIMEOUT -1
++// DBUS reply timeout is now half a second
++#define DBUS_REPLY_TIMEOUT 500
+ // UMMS Dbus Stuff
+ #define UMMS_SERVICE_NAME "com.UMMS"
+ #define UMMS_OBJECT_MANAGER_OBJECT_PATH "/com/UMMS/ObjectManager"
+@@ -388,13 +388,18 @@ void CMeegoPlayer::SetVolume(long volume)
+ */
+ bool CMeegoPlayer::Initialize(TiXmlElement* pConfig)
+ {
+- /* Config specific to meegoplayer - pinkvideo is the default */
+- XMLUtils::GetBoolean(pConfig, "pinkmusic", m_pinkmusic);
+- XMLUtils::GetBoolean(pConfig, "pinkvideo", m_pinkvideo);
+-
+- CLog::Log(LOGNOTICE, "MeeGo dbus player : pinkmusic (%s), pinkvideo (%s)",
+- m_pinkmusic ? "true" : "false",
+- m_pinkvideo ? "true" : "false");
++ // it is possible to play files not considered audio or video by XBMC
++ // and then pConfig will be NULL. We will wait for UMMS to attempt playback
++ // and leave the default settings for 'pink' stuff
++ if (pConfig) {
++ /* Config specific to meegoplayer - pinkvideo is the default */
++ XMLUtils::GetBoolean(pConfig, "pinkmusic", m_pinkmusic);
++ XMLUtils::GetBoolean(pConfig, "pinkvideo", m_pinkvideo);
++
++ CLog::Log(LOGNOTICE, "MeeGo dbus player : pinkmusic (%s), pinkvideo (%s)",
++ m_pinkmusic ? "true" : "false",
++ m_pinkvideo ? "true" : "false");
++ }
+
+ return true;
+ }
+--
+1.7.10.3
+
++++++ 0011-remove-further-settings-which-are-unusable.patch (new)
--- 0011-remove-further-settings-which-are-unusable.patch
+++ 0011-remove-further-settings-which-are-unusable.patch
+From 932275b0f938bd32c459010658bbf88e889f935c Mon Sep 17 00:00:00 2001
+From: Brendan Le Foll <brendan at fridu.org>
+Date: Thu, 14 Jun 2012 11:40:52 +0100
+Subject: [PATCH 11/11] remove further settings which are unusable
+
+---
+ xbmc/settings/GUISettings.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
+index d45034a..6e9f211 100644
+--- a/xbmc/settings/GUISettings.cpp
++++ b/xbmc/settings/GUISettings.cpp
+@@ -318,10 +318,10 @@ void CGUISettings::Initialize()
+ AddString(scr, "scrobbler.librefmusername", 15218, "", EDIT_CONTROL_INPUT, false, 15218);
+ AddString(scr, "scrobbler.librefmpass", 15219, "", EDIT_CONTROL_MD5_INPUT, false, 15219);
+
++#if 0
+ CSettingsCategory* acd = AddCategory(3, "audiocds", 620);
+ AddBool(acd, "audiocds.autorun", 14085, false);
+ AddBool(acd, "audiocds.usecddb", 227, true);
+-#if 0
+ AddSeparator(acd, "audiocds.sep1");
+ AddPath(acd,"audiocds.recordingpath",20000,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657);
+ AddString(acd, "audiocds.trackpathformat", 13307, "%A - %B/[%N. ][%A - ]%T", EDIT_CONTROL_INPUT, false, 16016);
+@@ -362,6 +362,7 @@ void CGUISettings::Initialize()
+
+ // System settings
+ AddGroup(4, 13000);
++#if 0
+ CSettingsCategory* vs = AddCategory(4, "videoscreen", 21373);
+
+ #if (defined(__APPLE__) && defined(__arm__))
+@@ -427,6 +428,7 @@ void CGUISettings::Initialize()
+ #if defined(HAS_LCD)
+ AddBool(vs, "videoscreen.haslcd", 4501, false);
+ #endif
++#endif
+
+ #if 0
+ CSettingsCategory* ao = AddCategory(4, "audiooutput", 772);
+@@ -470,6 +472,7 @@ void CGUISettings::Initialize()
+ #endif
+ #endif
+
++#if 0
+ CSettingsCategory* in = AddCategory(4, "input", 14094);
+ AddString(in, "input.peripherals", 35000, "", BUTTON_CONTROL_STANDARD);
+ #if defined(__APPLE__)
+@@ -493,6 +496,7 @@ void CGUISettings::Initialize()
+ #else
+ AddBool(in, "input.enablemouse", 21369, false);
+ #endif
++#endif
+
+ CSettingsCategory* pwm = AddCategory(4, "powermanagement", 14095);
+ // Note: Application.cpp might hide powersaving settings if not supported.
+--
+1.7.10.3
+
++++++ xbmc.yaml
--- xbmc.yaml
+++ xbmc.yaml
@@ -17,6 +17,8 @@
- 0007-trim-options-bar-in-video-OSD.patch
- 0008-fix-language-strings-for-UMMS-errors.patch
- 0009-use-apple-TV-bufferring-settings-to-improve-perf.patch
+ - 0010-fix-playback-of-files-not-matching-either-audio-or-v.patch
+ - 0011-remove-further-settings-which-are-unusable.patch
Description: |
XBMC media center is a free cross-platform media-player jukebox and
entertainment hub. XBMC can play a spectrum of of multimedia formats,
More information about the MeeGo-commits
mailing list