diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 337c2a7d8e..b7dfdbe9a5 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="13.alpha-f1e1102" +PKG_VERSION="13.alpha-d68300f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 0086ab9f0a..14554c11dd 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13.alpha-f1e1102" +PKG_VERSION="13.alpha-d68300f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-97fecf6.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-d1d476c.patch similarity index 96% rename from packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-97fecf6.patch rename to packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-d1d476c.patch index 3190cacaca..63e06fd9b9 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-97fecf6.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-d1d476c.patch @@ -1,7 +1,7 @@ -From 5ff426ea570a0afd057fbb3f31a5d89c82ed217e Mon Sep 17 00:00:00 2001 +From 02ee7945225a0f5730301c07f7df2bcdb92ecb6f Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 01/92] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 01/90] videoplayer: adapt lateness detection and dropping to buffering --- @@ -579,13 +579,13 @@ index f8ad541..186e271 100644 }; -- -1.8.4 +1.8.5-rc3 -From 4a58ee99c0ffc012df8fd4545e45743e56438852 Mon Sep 17 00:00:00 2001 +From 9ff1c13c5615091643445383aa4a7974426dc73e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 02/92] video player: present correct pts to user for a/v sync +Subject: [PATCH 02/90] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -650,13 +650,13 @@ index 186e271..59c7f09 100644 double GetOutputDelay(); /* returns the expected delay, from that a packet is put in queue */ -- -1.8.4 +1.8.5-rc3 -From 30d65751db8ca7579b1ba0e66e0708bd23fac489 Mon Sep 17 00:00:00 2001 +From 1632723c006f975fdb8e77fffaa48b532a23511e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 03/92] videoplayer: some rework and documentation +Subject: [PATCH 03/90] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -764,13 +764,13 @@ index 587ea4b..27a61bd 100644 if (iDecoderPts == DVD_NOPTS_VALUE) iDecoderPts = pts; -- -1.8.4 +1.8.5-rc3 -From 19294091af8c83bb3aeff3ffd1d542449ca04c0c Mon Sep 17 00:00:00 2001 +From b3d062e38abfcd2ec006e600f41bcb459b55d292 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 04/92] renderer: bump buffers to 5 +Subject: [PATCH 04/90] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -790,13 +790,13 @@ index a61d3cf..df5fe0e 100644 class CSetting; -- -1.8.4 +1.8.5-rc3 -From e08fe026a8f4929b8be1c9e537eccc214736a61c Mon Sep 17 00:00:00 2001 +From 23aed0761ce62cf5915eeac91d1721f8d02cf6e7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 05/92] videoplayer: update frametime, it might change due to +Subject: [PATCH 05/90] videoplayer: update frametime, it might change due to fps detection --- @@ -817,13 +817,13 @@ index 27a61bd..8e772e3 100644 { m_codecname = m_pVideoCodec->GetName(); -- -1.8.4 +1.8.5-rc3 -From add7ae4a09e28a38a9680f64d3c253be1ce5606e Mon Sep 17 00:00:00 2001 +From 398b699209de762868d42cff36c10946c1e56d4d Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 06/92] videoplayer: give streams with invalid fps a chance for +Subject: [PATCH 06/90] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -844,13 +844,13 @@ index 8e772e3..150a796 100644 //reset the stored framerates if no good framerate was detected m_fStableFrameRate = 0.0; -- -1.8.4 +1.8.5-rc3 -From 061f199d713158352253c29cb663127f7809b17d Mon Sep 17 00:00:00 2001 +From c1aceb43f084a6abcdc0eeb5654a803a11f2a17f Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 07/92] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 07/90] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -858,10 +858,10 @@ Subject: [PATCH 07/92] dvdplayer: allow rewinding at end of stream, do a seek 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index e73fcd8..269b517 100644 +index f9375c6..915c2d7 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -1659,7 +1659,7 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1663,7 +1663,7 @@ void CDVDPlayer::HandlePlaySpeed() } else if (m_CurrentVideo.id >= 0 @@ -870,7 +870,7 @@ index e73fcd8..269b517 100644 && m_SpeedState.lastpts != m_dvdPlayerVideo.GetCurrentPts() && m_SpeedState.lasttime != GetTime()) { -@@ -2324,6 +2324,12 @@ void CDVDPlayer::HandleMessages() +@@ -2328,6 +2328,12 @@ void CDVDPlayer::HandleMessages() pvrinputstream->Pause( speed == 0 ); } @@ -884,13 +884,13 @@ index e73fcd8..269b517 100644 // audioplayer, stops outputing audio to audiorendere, but still tries to // sleep an correct amount for each packet -- -1.8.4 +1.8.5-rc3 -From 37fd7f332f74a5778dc00111c5127c0d878c9dd8 Mon Sep 17 00:00:00 2001 +From 1af884a726a2b18b9fcc85b7f8d045ef8db6663b Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 08/92] X11: ditch SDL for video and window events +Subject: [PATCH 08/90] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -906,7 +906,7 @@ Subject: [PATCH 08/92] X11: ditch SDL for video and window events create mode 100644 xbmc/windowing/WinEventsX11.h diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 240bbec..f701be0 100644 +index 8e7f7a3..3e94344 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -857,7 +857,7 @@ bool CApplication::CreateGUI() @@ -2424,13 +2424,13 @@ index b1464d0..34b912f 100644 CCriticalSection m_resourceSection; std::vector m_resources; -- -1.8.4 +1.8.5-rc3 -From e02aac41d670ee5732def8e7dbcb920692d37c42 Mon Sep 17 00:00:00 2001 +From 5dc636d3fadbf5c9c79e4028b63f24119436e42e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 09/92] X11: Add xbmc icon +Subject: [PATCH 09/90] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -2617,13 +2617,13 @@ index 34b912f..352e90e 100644 CStopWatch m_screensaverReset; }; -- -1.8.4 +1.8.5-rc3 -From dbf791b807c839d593e5e576ff81676a71091a56 Mon Sep 17 00:00:00 2001 +From 34742eb90be31f538d3cf27ec6a25cc443210c25 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 10/92] X11: add SDL joystick until we have a better solution +Subject: [PATCH 10/90] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -2674,13 +2674,13 @@ index ad58aad..6f57a87 100644 } -- -1.8.4 +1.8.5-rc3 -From 2221530b83c6c02ec2d52005756997530a46abfe Mon Sep 17 00:00:00 2001 +From 80d3cd59352981fa61d0bef732730416edf6e4d1 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 11/92] X11: factor out code handling device reset notification +Subject: [PATCH 11/90] X11: factor out code handling device reset notification --- xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- @@ -2740,13 +2740,13 @@ index 352e90e..3f91b9b 100644 protected: bool RefreshGlxContext(); -- -1.8.4 +1.8.5-rc3 -From b7ac287cd50a1e25777b396e7e98e9bcb331b655 Mon Sep 17 00:00:00 2001 +From db6552395dbe35b1f36886850dad6339ac8b618f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 12/92] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 12/90] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -2887,13 +2887,13 @@ index 304dac8..16b13aa 100644 void CWinSystemX11::Register(IDispResource *resource) -- -1.8.4 +1.8.5-rc3 -From 7785126438ea2c9a390b7ac4829d7b19a7bc13a2 Mon Sep 17 00:00:00 2001 +From 02a661833701f9e8d010411eb5e70ca2954efeb6 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 13/92] xrandr: remove method RestoreState +Subject: [PATCH 13/90] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -2969,13 +2969,13 @@ index 0aec487..00b49dc 100644 //bool Has1080p(); //bool Has720p(); -- -1.8.4 +1.8.5-rc3 -From 73fecc6e2060cb8ef366278af56ec4f0698993b6 Mon Sep 17 00:00:00 2001 +From 411863464fb196eaec7eda4d3cecd724208c9b33 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 14/92] xrandr: observe orientation +Subject: [PATCH 14/90] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -3187,13 +3187,13 @@ index 00b49dc..508604d 100644 class CXRandR -- -1.8.4 +1.8.5-rc3 -From 69aaeac0dfab4b66121d534c94bb111545858fe2 Mon Sep 17 00:00:00 2001 +From 880a9a8caf7b0356ca546c7c2b50624bca090190 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 15/92] xrandr: allow getting info for multiple screen's +Subject: [PATCH 15/90] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -3365,13 +3365,13 @@ index 508604d..d37838a 100644 extern CXRandR g_xrandr; -- -1.8.4 +1.8.5-rc3 -From d92af36e43ee6bfcba717e66ba5a0f899e307f36 Mon Sep 17 00:00:00 2001 +From 03a0d9603ef91758d83c3a785db87a049f64b67e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 16/92] X11: fix multi-head setups +Subject: [PATCH 16/90] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -3386,7 +3386,7 @@ Subject: [PATCH 16/92] X11: fix multi-head setups 9 files changed, 227 insertions(+), 113 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 93d0c3c..38b4ee0 100755 +index 0cb5e05..c15c99a 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1019,7 +1019,9 @@ msgctxt "#245" @@ -3401,10 +3401,10 @@ index 93d0c3c..38b4ee0 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index aa1cdd7..13bd54e 100644 +index 4b69b38..1b0cd6f 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2021,6 +2021,15 @@ +@@ -2037,6 +2037,15 @@
@@ -3420,7 +3420,7 @@ index aa1cdd7..13bd54e 100644 0 0 -@@ -2042,6 +2051,7 @@ +@@ -2058,6 +2067,7 @@ -1 @@ -3428,7 +3428,7 @@ index aa1cdd7..13bd54e 100644 -@@ -2059,6 +2069,7 @@ +@@ -2075,6 +2085,7 @@ -1 @@ -3555,7 +3555,7 @@ index 8ee1be2..bead24b 100644 protected: CDisplaySettings(); diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 13fd236..b6f5b16 100644 +index 9c1c1db..bc41b95 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -406,6 +406,7 @@ void CSettings::Uninitialize() @@ -3584,7 +3584,7 @@ index 13fd236..b6f5b16 100644 #ifdef HAS_GLES m_settingsManager->AddCondition("has_gles"); #endif -@@ -1018,6 +1023,7 @@ void CSettings::InitializeISettingCallbacks() +@@ -1017,6 +1022,7 @@ void CSettings::InitializeISettingCallbacks() settingSet.insert("videoscreen.screen"); settingSet.insert("videoscreen.resolution"); settingSet.insert("videoscreen.screenmode"); @@ -4127,13 +4127,13 @@ index 4175aab..94584ab 100644 private: bool IsSuitableVisual(XVisualInfo *vInfo); -- -1.8.4 +1.8.5-rc3 -From 19a000a30eec03f0dcd52b9ede831867bdb7d52f Mon Sep 17 00:00:00 2001 +From 4dd92eda0a8f7bab0fa59a9ba1898a586f9bf514 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 17/92] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 17/90] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -4198,13 +4198,13 @@ index 6383754..21e7dc5 100644 CLog::Log(LOGDEBUG, "GLX_EXTENSIONS:%s", m_glxext.c_str()); -- -1.8.4 +1.8.5-rc3 -From d0a0965588bca352e1887c7c3975843ea2438108 Mon Sep 17 00:00:00 2001 +From a28d04910aae35201682e32ee30ce6af3af9128d Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 18/92] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 18/90] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -4273,13 +4273,13 @@ index 0b3950a..ca43b5a 100644 XRRFreeScreenConfigInfo(CurrInfo); -- -1.8.4 +1.8.5-rc3 -From c6e13110f01a47fc553b673a3e91b0b7da559f54 Mon Sep 17 00:00:00 2001 +From 312ae052309392c8c1088aa3701489bb4a5e2fa2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 19/92] X11: recreate gl context after output has changed +Subject: [PATCH 19/90] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -4427,13 +4427,13 @@ index 21e7dc5..8e68d5d 100644 } -- -1.8.4 +1.8.5-rc3 -From 1274177c6062bb26d6ea135e43da436d93d444c9 Mon Sep 17 00:00:00 2001 +From 032fd56a253ca87e74e935bd427802f2efebbefa Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 20/92] X11: hook video reference clock in windowing +Subject: [PATCH 20/90] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -4635,13 +4635,13 @@ index dd65a1b..afd71fc 100644 bool m_UseNvSettings; bool m_bIsATI; -- -1.8.4 +1.8.5-rc3 -From 5620d7869f2091454468236189ae7b415485abe5 Mon Sep 17 00:00:00 2001 +From 8338153a5662ebeeafeb9816ca957bd8ee34eaf4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 21/92] X11: fix video calibrations +Subject: [PATCH 21/90] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -4730,13 +4730,13 @@ index 9666cc3..5b52d6c 100644 // Local to WinSystemX11 only Display* GetDisplay() { return m_dpy; } -- -1.8.4 +1.8.5-rc3 -From a8e1f3c8a61a423c843229e1ba4c04eb4c972325 Mon Sep 17 00:00:00 2001 +From 5e62a94661dde5e1c08a50ef2448e0358912fcce Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 22/92] X11: deactivate screen saver on startup +Subject: [PATCH 22/90] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -4803,13 +4803,13 @@ index 5b52d6c..b2bd5a0 100644 virtual void NotifyAppActiveChange(bool bActivated); virtual void NotifyAppFocusChange(bool bGaining); -- -1.8.4 +1.8.5-rc3 -From edaf85ba8ae73c8e32660a2ae6d1b09d20891114 Mon Sep 17 00:00:00 2001 +From 03e1884a687087c18520f74a4c8cf525cf1f028b Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 23/92] X11: change method of going full-screen +Subject: [PATCH 23/90] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -4850,13 +4850,13 @@ index b76b229..869baa8 100644 Pixmap bitmapNoData; XColor black; -- -1.8.4 +1.8.5-rc3 -From 3bc0c3a79ca91ae4b2f8e101ee84ae42c91799c1 Mon Sep 17 00:00:00 2001 +From e40e1c0d43a2adb052463cf19ef21bd44b4a100f Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 24/92] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 24/90] X11: reset key repeat and key modifier on focus lost and gain --- @@ -4885,13 +4885,13 @@ index d98f12f..743aca9 100644 serial = xevent.xfocus.serial; break; -- -1.8.4 +1.8.5-rc3 -From f2521d532bfa52baa23c4e661f850ff441bb8f4e Mon Sep 17 00:00:00 2001 +From b2e82e18bc33d8165ece21d4301eda0086f480a7 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 25/92] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 25/90] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -5105,13 +5105,13 @@ index a412f32..9a8a912 100644 XIC m_xic; XBMC_Event m_lastKey; -- -1.8.4 +1.8.5-rc3 -From d8f9047e378d2c8fa0cab20c9a618cce72cb75d6 Mon Sep 17 00:00:00 2001 +From 014f4f370f8ac781b6d1c389095cb89cedb87717 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 26/92] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 26/90] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -5172,13 +5172,13 @@ index 9a8a912..c69169c 100644 XIC m_xic; XBMC_Event m_lastKey; -- -1.8.4 +1.8.5-rc3 -From 565ee9b037cce936ecb84800b212a3648de95c99 Mon Sep 17 00:00:00 2001 +From e7a5305214988f6a2c9547cb6f01ed608ed96a94 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 27/92] add missing keys to xbmc keytable +Subject: [PATCH 27/90] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -5198,13 +5198,13 @@ index d57f4d3..b807897 100644 // Function keys , { XBMCK_F1, 0, 0, XBMCVK_F1, "f1"} -- -1.8.4 +1.8.5-rc3 -From a014bf53b349e6fe4cb75b34beb1f3d66f1ac2d2 Mon Sep 17 00:00:00 2001 +From 1c3df872518fca6780f550447fe9819204cf690d Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 28/92] videorefclock: temp deactivate of nv settings +Subject: [PATCH 28/90] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -5224,13 +5224,13 @@ index 0ddf102..3ae7107 100644 #endif } -- -1.8.4 +1.8.5-rc3 -From 73748933f9603f3765a73660ddbb2d0c1ed7f51b Mon Sep 17 00:00:00 2001 +From fd1995bedb6bf8fc62f7d366e43d7c4adb7e64c9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 29/92] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 29/90] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -5258,13 +5258,13 @@ index 3ae7107..27bebde 100644 CLog::Log(LOGDEBUG, "CVideoReferenceClock: Detected refreshrate: %i hertz", (int)m_RefreshRate); -- -1.8.4 +1.8.5-rc3 -From a9f9309cd5dca73bfb8f1c1da826d048246dd761 Mon Sep 17 00:00:00 2001 +From 7f732eae6353dee625bffdcfa0afd84f725895ce Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 30/92] X11: fix icon texture after +Subject: [PATCH 30/90] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -5369,13 +5369,13 @@ index 869baa8..bfe3797 100644 } -- -1.8.4 +1.8.5-rc3 -From e1bf2f57c15ffe0114749a8424934204fa0f8234 Mon Sep 17 00:00:00 2001 +From 38043decd386c1dd6ecda624b0fc13b705881b6c Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 31/92] X11: check for window manager +Subject: [PATCH 31/90] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -5493,13 +5493,13 @@ index b2bd5a0..3e62cd8 100644 CStopWatch m_screensaverReset; }; -- -1.8.4 +1.8.5-rc3 -From 44e153b4505eabc7ff1f0a7592429362ca6f3280 Mon Sep 17 00:00:00 2001 +From 771fddfaea61727fcd219602a2c5c1ad09e9ad3c Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 32/92] X11: dont set window on xrandr if no mode available +Subject: [PATCH 32/90] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -5533,13 +5533,13 @@ index af82061..4f33c68 100644 CStdString currentOutput = CSettings::Get().GetString("videoscreen.monitor"); -- -1.8.4 +1.8.5-rc3 -From 5749e7766f18bcb02b631a05290f7daa2a291684 Mon Sep 17 00:00:00 2001 +From 80de5e314dafd55f65101647ce67183eb1a2730a Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 33/92] X11: fix crash after a resolution change on startup +Subject: [PATCH 33/90] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -5560,13 +5560,13 @@ index 4f33c68..bc4e963 100644 #endif -- -1.8.4 +1.8.5-rc3 -From 8833e554a6e2b344452c188971f94da89a52c931 Mon Sep 17 00:00:00 2001 +From 91735154efd22fbdefc202fc601dc5e76d7e7e68 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 34/92] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 34/90] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -5586,13 +5586,13 @@ index bc4e963..57a8d20 100644 { CLog::Log(LOGERROR, "WinSystemX11::RefreshWindow - failed to query xrandr"); -- -1.8.4 +1.8.5-rc3 -From d15b5c8da759c765c0647e7a745610d4f6004f91 Mon Sep 17 00:00:00 2001 +From 60e18fc3ff93f07f656864861917c96edf2436a5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 35/92] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 35/90] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ @@ -5635,13 +5635,13 @@ index 0016c0b..3514856 100644 /* dependencies of libavformat */ -- -1.8.4 +1.8.5-rc3 -From 370f89ef0f1c91d39bdb8a6695712c3cfe0636b6 Mon Sep 17 00:00:00 2001 +From 57291b4c51c06486bff55d26f665b0e8e68a9826 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 36/92] dvdplayer: observe pts counter overflow +Subject: [PATCH 36/90] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -5925,13 +5925,13 @@ index aef5ab1..35abbdf 100644 }; -- -1.8.4 +1.8.5-rc3 -From 20c24811be5170b80adfcc13502c81ea7a6c02c3 Mon Sep 17 00:00:00 2001 +From 3fd70c41f2f5c8bc31b8429c469f64d45e8e6b87 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 37/92] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 37/90] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -5961,13 +5961,13 @@ index 150a796..beffbe9 100644 m_output.extended_format = pPicture->extended_format; m_output.color_matrix = pPicture->color_matrix; -- -1.8.4 +1.8.5-rc3 -From df8f064ea4054721fbe4fd54d3aeb27df527c7a3 Mon Sep 17 00:00:00 2001 +From 7131874010724b166f8a4fbd2cc23c69caf195f8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 38/92] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 38/90] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -5995,7 +5995,7 @@ index 97dea48..57bb704 100644 if (deint != -1) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 614e869..b0e241d 100644 +index 79ce315..0274fd1 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -165,6 +165,8 @@ void CAdvancedSettings::Initialize() @@ -6030,13 +6030,13 @@ index 7d16957..bb70f3e 100644 bool m_videoVDPAUdeintSkipChromaHD; bool m_musicUseTimeSeeking; -- -1.8.4 +1.8.5-rc3 -From 3c85356ed0b5209585b26f3f7296207105641973 Mon Sep 17 00:00:00 2001 +From 57abb806fc84a277b78ad27f28d615f971e3cd85 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 39/92] player: fix rewind +Subject: [PATCH 39/90] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -6084,10 +6084,10 @@ index 2ea8b8f..e8274f9 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 269b517..a780228 100644 +index 915c2d7..70ec003 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -1660,11 +1660,13 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1664,11 +1664,13 @@ void CDVDPlayer::HandlePlaySpeed() } else if (m_CurrentVideo.id >= 0 && (m_CurrentVideo.inited == true || GetPlaySpeed() < 0) // allow rewind at end of file @@ -6102,7 +6102,7 @@ index 269b517..a780228 100644 // check how much off clock video is when ff/rw:ing // a problem here is that seeking isn't very accurate // and since the clock will be resynced after seek -@@ -1683,7 +1685,7 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1687,7 +1689,7 @@ void CDVDPlayer::HandlePlaySpeed() { CLog::Log(LOGDEBUG, "CDVDPlayer::Process - Seeking to catch up"); int64_t iTime = (int64_t)DVD_TIME_TO_MSEC(m_clock.GetClock() + m_State.time_offset + 500000.0 * m_playSpeed / DVD_PLAYSPEED_NORMAL); @@ -6111,7 +6111,7 @@ index 269b517..a780228 100644 } } } -@@ -2169,7 +2171,7 @@ void CDVDPlayer::HandleMessages() +@@ -2173,7 +2175,7 @@ void CDVDPlayer::HandleMessages() else m_StateInput.dts = start; @@ -6120,7 +6120,7 @@ index 269b517..a780228 100644 } else CLog::Log(LOGWARNING, "error while seeking"); -@@ -2309,9 +2311,10 @@ void CDVDPlayer::HandleMessages() +@@ -2313,9 +2315,10 @@ void CDVDPlayer::HandleMessages() double offset; offset = CDVDClock::GetAbsoluteClock() - m_State.timestamp; offset *= m_playSpeed / DVD_PLAYSPEED_NORMAL; @@ -6132,7 +6132,7 @@ index 269b517..a780228 100644 m_State.timestamp = CDVDClock::GetAbsoluteClock(); } -@@ -2327,7 +2330,8 @@ void CDVDPlayer::HandleMessages() +@@ -2331,7 +2334,8 @@ void CDVDPlayer::HandleMessages() // do a seek after rewind, clock is not in sync with current pts if (m_playSpeed < 0 && speed >= 0) { @@ -6189,10 +6189,10 @@ index 269b517..a780228 100644 UpdatePlayState(0); diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h -index 97a6d85..d7843a1 100644 +index 5ae5f9f..0ba2c0d 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.h +++ b/xbmc/cores/dvdplayer/DVDPlayer.h -@@ -317,7 +317,7 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer +@@ -315,7 +315,7 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer bool GetCachingTimes(double& play_left, double& cache_left, double& file_offset); @@ -6201,7 +6201,7 @@ index 97a6d85..d7843a1 100644 void HandleMessages(); void HandlePlaySpeed(); -@@ -366,8 +366,9 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer +@@ -364,8 +364,9 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer int m_playSpeed; struct SSpeedState { @@ -6248,13 +6248,13 @@ index 59c7f09..65dea76 100644 unsigned int m_dropRequests; }; -- -1.8.4 +1.8.5-rc3 -From eff1fa5b5cde95efa29a1c73e064182d99a6bbdb Mon Sep 17 00:00:00 2001 +From ad46b010053d2e76d6454aadc5e499867f1ba41a Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 40/92] xrandr: fix query for multiple screens +Subject: [PATCH 40/90] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -6292,13 +6292,13 @@ index 4685413..e610150 100644 FILE* file = popen(cmd.c_str(),"r"); if (!file) -- -1.8.4 +1.8.5-rc3 -From e46aef20823b8eddbe6c5f0a910350f6e1c50782 Mon Sep 17 00:00:00 2001 +From 3eb00a00bbe84fbf4b46f0aa915c068cfd012ed7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 41/92] X11: add debug log to print out refresh after xrr event +Subject: [PATCH 41/90] X11: add debug log to print out refresh after xrr event --- xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ @@ -6322,13 +6322,13 @@ index 57a8d20..a237dc0 100644 unsigned int i; bool found(false); -- -1.8.4 +1.8.5-rc3 -From 6b1204d09589c5ae18a0bc51fc99a0c2d22c8ebe Mon Sep 17 00:00:00 2001 +From 761efd305aad2e6e47acf500f7d50602e5051d29 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 42/92] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 42/90] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -6350,13 +6350,13 @@ index a237dc0..ab660b1 100644 // m_SDLSurface is free()'d by SDL_Quit(). -- -1.8.4 +1.8.5-rc3 -From b758c0d0663879bb2c9e966fe02174693efa3ef4 Mon Sep 17 00:00:00 2001 +From 8e5c0e29a5b1a93daa123eade523d41c45e15a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= Date: Wed, 12 Dec 2012 19:49:47 +0100 -Subject: [PATCH 43/92] x11: support for multiple x screens +Subject: [PATCH 43/90] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6376,13 +6376,13 @@ index e610150..5c53574 100644 // TODO ERROR return false; -- -1.8.4 +1.8.5-rc3 -From 24e029479f9cafe7e3a5764e67f4d1ad146ed375 Mon Sep 17 00:00:00 2001 +From 7fc173cdc970a1f568911279e1ea7715e7f4b4ea Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 44/92] pvr: increase changes counter of stream on stream +Subject: [PATCH 44/90] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -6413,13 +6413,13 @@ index b96d520..df89f6f 100644 else if (props.stream[i].iCodecType == XBMC_CODEC_TYPE_VIDEO) { -- -1.8.4 +1.8.5-rc3 -From 496b60b677424c52c50f44e9621f036a55ab421f Mon Sep 17 00:00:00 2001 +From 14d40ab01e496f089b34fb606f77fe0a973f21da Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 45/92] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 45/90] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -6438,13 +6438,13 @@ index a62521f..263cb5a 100644 , {XK_Undo, XBMCK_UNDO} /* Media keys */ -- -1.8.4 +1.8.5-rc3 -From 87ffb8f33a43804f421b3247550e1c82e936a0ad Mon Sep 17 00:00:00 2001 +From 50553a7075a5cbae23120a50d0a99b54eedea062 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 46/92] X11: remove toggle full screen after resume +Subject: [PATCH 46/90] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -6467,13 +6467,13 @@ index 590a887..35b5a21 100644 } g_application.ResetScreenSaver(); -- -1.8.4 +1.8.5-rc3 -From 82078aab73c998c5f26523d7b0006985b01947d2 Mon Sep 17 00:00:00 2001 +From 2c7ae5d9c7f7abd8ad6b2ec97834ec51af4d9c72 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 47/92] xrandr: set screen on mode change command +Subject: [PATCH 47/90] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6493,13 +6493,13 @@ index 5c53574..4355ef7 100644 return false; CLog::Log(LOGINFO, "XRANDR: %s", cmd); -- -1.8.4 +1.8.5-rc3 -From 288ecdff37e2966345a72c371bbd92c3106b978a Mon Sep 17 00:00:00 2001 +From ebb8987c9618827e0213b7171e55285f576fd82b Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 48/92] X11: recreate glx context when output changes +Subject: [PATCH 48/90] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -6547,13 +6547,13 @@ index 3e62cd8..2a1fb41 100644 void OnLostDevice(); bool SetWindow(int width, int height, bool fullscreen, const CStdString &output); -- -1.8.4 +1.8.5-rc3 -From 933decda7c4200e64fe46d181963bfcfae20bae7 Mon Sep 17 00:00:00 2001 +From 12fe11be65493c4760e76f13011bf5b998e237ce Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 49/92] pvr: do not show selection dialog for a single menu +Subject: [PATCH 49/90] pvr: do not show selection dialog for a single menu hook --- @@ -6588,13 +6588,13 @@ index 5b5706e..2eda43d 100644 client->CallMenuHook(hooks->at(hookIDs.at(selection)), item); } -- -1.8.4 +1.8.5-rc3 -From 0377ba88321e2fb8b96c63d18343208b675cfd8c Mon Sep 17 00:00:00 2001 +From ce5f374f647d65330eda73ee6525f9d531c136fd Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 50/92] X11: use default screen parameters if no output +Subject: [PATCH 50/90] X11: use default screen parameters if no output connected --- @@ -6695,13 +6695,13 @@ index 4329a22..2adf8a0 100644 mask, &swa); -- -1.8.4 +1.8.5-rc3 -From f18865ec378b07e62f254327c709171153bbf387 Mon Sep 17 00:00:00 2001 +From 6cf2a802f1a3b605beaf7164094e82ec4a7dc407 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 51/92] X11: create parent window +Subject: [PATCH 51/90] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -6964,13 +6964,13 @@ index 2a1fb41..e8993f1 100644 Display* m_dpy; Cursor m_invisibleCursor; -- -1.8.4 +1.8.5-rc3 -From 122aa334600e67788656b6b25551b0722f1e1b06 Mon Sep 17 00:00:00 2001 +From 10b52b7605b7b5b4f9d27dfa6de900851ea2b406 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 52/92] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 52/90] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -7169,13 +7169,13 @@ index c69169c..6429291 100644 int m_keymodState; bool m_structureChanged; -- -1.8.4 +1.8.5-rc3 -From ba7a69a13707c20dafac74ce74e9ea5c15e96fc3 Mon Sep 17 00:00:00 2001 +From 3974f91f4061196ed1b1c8f5e4cd207127e5711f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 53/92] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 53/90] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -7210,23 +7210,23 @@ index c06b8c5..4390d2e 100644 #endif } -- -1.8.4 +1.8.5-rc3 -From bb78b9e7fef52c6b2143abbc12c4edd299685fe2 Mon Sep 17 00:00:00 2001 +From 584c7467346c578918abc253f06a14dbc8473db8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 54/92] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 54/90] OMXPlayer: some caching fixes for pvr --- xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index 9638188..7928b25 100644 +index 5e77059..7d13609 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -2566,7 +2566,8 @@ void COMXPlayer::HandleMessages() +@@ -2577,7 +2577,8 @@ void COMXPlayer::HandleMessages() m_messenger.Put(new CDVDMsgPlayerSeek(GetTime(), (speed < 0), true, false, false, true)); m_playSpeed = speed; @@ -7237,23 +7237,23 @@ index 9638188..7928b25 100644 m_av_clock.OMXSetSpeed(speed); m_av_clock.OMXPause(); -- -1.8.4 +1.8.5-rc3 -From 0ab1e9dd5bfc9418fa51d8ef126b64a63b63a577 Mon Sep 17 00:00:00 2001 +From d6bdb12de8ce93c241ebc9e52d1be8c0841bd985 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 55/92] fix incorrect display of fps when dr kicks in +Subject: [PATCH 55/90] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index f701be0..886cedd 100644 +index 3e94344..438fab0 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2257,10 +2257,11 @@ void CApplication::Render() +@@ -2254,10 +2254,11 @@ void CApplication::Render() if (frameTime < singleFrameTime) Sleep(singleFrameTime - frameTime); } @@ -7267,13 +7267,13 @@ index f701be0..886cedd 100644 g_renderManager.UpdateResolution(); -- -1.8.4 +1.8.5-rc3 -From 9983db31b2fb0ad3f9b3270a97f16fabfcac8af8 Mon Sep 17 00:00:00 2001 +From aa7f8c0ec80ea5e54e4d81c83d127eda6da0d872 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 56/92] X11: fix mouse coverage +Subject: [PATCH 56/90] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -7336,13 +7336,13 @@ index e8993f1..5cccfb7 100644 CCriticalSection m_resourceSection; std::vector m_resources; -- -1.8.4 +1.8.5-rc3 -From 59cdc2a1c2702e3104fbf205db8a0408fbe2bf23 Mon Sep 17 00:00:00 2001 +From 4090ad19f82a3c64eaf75a60b2efbc0269d33afc Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 57/92] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 57/90] X11: fix incorrectly used screen num in desktop resolution --- @@ -7374,13 +7374,13 @@ index 2acb36d..101ba98 100644 res.iHeight = mode.h; res.iScreenWidth = mode.w; -- -1.8.4 +1.8.5-rc3 -From c598e88ae1a12d6b642b5e345acfc2fadb993617 Mon Sep 17 00:00:00 2001 +From 1751460b8c2c9cbaa97de3d3e6ec469538c90cdb Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 58/92] X11: do not overwrite user selected monitor with +Subject: [PATCH 58/90] X11: do not overwrite user selected monitor with fallback --- @@ -7502,13 +7502,13 @@ index 5cccfb7..1b658e2 100644 bool m_bIsInternalXrr; bool m_newGlContext; -- -1.8.4 +1.8.5-rc3 -From 77199a47bc988db6d444da508241fa23e4be8839 Mon Sep 17 00:00:00 2001 +From 735b995b76d781e57ad9d3a69f5b801ec658fa90 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 59/92] xrandr: add turn on/off to wrapper +Subject: [PATCH 59/90] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -7671,13 +7671,13 @@ index d37838a..059062f 100644 //bool Has1080p(); //bool Has720p(); -- -1.8.4 +1.8.5-rc3 -From bbedf29d35f966f8ee679326262ec3a792f685b4 Mon Sep 17 00:00:00 2001 +From 793b13d0f6635efb6d19c0eb1b9a86d27299e61b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 60/92] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 60/90] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -7731,13 +7731,13 @@ index 059062f..ab7cc63 100644 bool SetMode(XOutput output, XMode mode); void LoadCustomModeLinesToAllOutputs(void); -- -1.8.4 +1.8.5-rc3 -From f76add7695c42bf131dff1d5e7064536fc210c4b Mon Sep 17 00:00:00 2001 +From e792c590d7f33ab6583319c83bd4ea42d32fe443 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 61/92] X11: multi-head improvement - poll for desired output +Subject: [PATCH 61/90] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -7752,7 +7752,7 @@ Subject: [PATCH 61/92] X11: multi-head improvement - poll for desired output 8 files changed, 105 insertions(+), 12 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 38b4ee0..cacd3f1 100755 +index c15c99a..92c7520 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6464,7 +6464,7 @@ msgctxt "#14071" @@ -7768,21 +7768,21 @@ index 38b4ee0..cacd3f1 100755 msgid "Stop ripping CD" msgstr "" --#empty strings from id 14101 to 15014 +-#empty strings from id 14101 to 15011 +#: xbmc/settings/settings.xml +msgctxt "#14101" +msgid "Swtich off other Monitor" +msgstr "" + -+#empty strings from id 14102 to 15014 ++#empty strings from id 14102 to 15011 - #: xbmc/dialogs/GUIDialogFavourites.cpp - msgctxt "#15015" + #: xbmc/video/VideoDatabase.cpp + msgctxt "#15012" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 13bd54e..3d7ef20 100644 +index 1b0cd6f..93eaa5c 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2030,6 +2030,11 @@ +@@ -2046,6 +2046,11 @@ @@ -7794,7 +7794,7 @@ index 13bd54e..3d7ef20 100644 0 0 -@@ -2082,6 +2087,7 @@ +@@ -2098,6 +2103,7 @@ @@ -8015,13 +8015,13 @@ index 62003f5..8525ede 100644 int status = system(cmd.c_str()); if (status == -1) -- -1.8.4 +1.8.5-rc3 -From f7abdf8af4a0d8553dbb1620bb77112c2b76b1de Mon Sep 17 00:00:00 2001 +From 505a86ce601fd50c9dee79b125c398a10929987a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 62/92] X11: ignore mouse move event form other windows +Subject: [PATCH 62/90] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -8050,13 +8050,13 @@ index 908c8b6..938ad26 100644 memset(&newEvent, 0, sizeof(newEvent)); newEvent.type = XBMC_MOUSEMOTION; -- -1.8.4 +1.8.5-rc3 -From cbde025ef332c6819528f0926b4ef0d413aab5b1 Mon Sep 17 00:00:00 2001 +From fb8c21ab620aacdfe355343395046a24ae3278b9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 63/92] renderer: allow some lateness within vblank interval +Subject: [PATCH 63/90] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -8113,13 +8113,13 @@ index 949c652b..d84ff6c 100644 OVERLAY::CRenderer m_overlays; -- -1.8.4 +1.8.5-rc3 -From 0f704d8a0ccd5f3213768c346008588a12519831 Mon Sep 17 00:00:00 2001 +From 6034e09c098f5e392a3cab616ca541a36c9bf21f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 64/92] X11: another fix for mouse coverage +Subject: [PATCH 64/90] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -8149,13 +8149,13 @@ index 938ad26..e4ca56d 100644 break; } -- -1.8.4 +1.8.5-rc3 -From f374b744a343953edff935fc3d2845e5db05491b Mon Sep 17 00:00:00 2001 +From ae331cf317c4ebc66098ae928126d56f46a462a0 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 65/92] X11: set windows class name +Subject: [PATCH 65/90] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -8194,20 +8194,20 @@ index b3fe5102..df5fe9b 100644 // register interest in the delete window message -- -1.8.4 +1.8.5-rc3 -From 3f31ad40a5e1cb2192fb502bbc97f973c2641cb9 Mon Sep 17 00:00:00 2001 +From caebbf4bd4d2f605be2015f9118523bcee3588b7 Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 -Subject: [PATCH 66/92] fixed: typo +Subject: [PATCH 66/90] fixed: typo --- language/English/strings.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/English/strings.po b/language/English/strings.po -index cacd3f1..f2d726c 100755 +index 92c7520..f8ffbb7 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6598,7 +6598,7 @@ msgstr "" @@ -8218,22 +8218,22 @@ index cacd3f1..f2d726c 100755 +msgid "Switch off other Monitor" msgstr "" - #empty strings from id 14102 to 15014 + #empty strings from id 14102 to 15011 -- -1.8.4 +1.8.5-rc3 -From 66bb18e06a5a0d460a70aa88317225b4488b3c56 Mon Sep 17 00:00:00 2001 +From 20a8eb1dd41c4c011c7d54bf71bccd884d25f8c2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 -Subject: [PATCH 67/92] ActiveAE: slightly reduce buffer size +Subject: [PATCH 67/90] ActiveAE: slightly reduce buffer size --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 20fd56e..7c07eec 100644 +index a3a6164..6443a2a 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ @@ -8248,13 +8248,13 @@ index 20fd56e..7c07eec 100644 void CEngineStats::Reset(unsigned int sampleRate) { -- -1.8.4 +1.8.5-rc3 -From bde86e96843803fec4c60ee84c846bdd29f423b7 Mon Sep 17 00:00:00 2001 +From ed9130e7d59052805354f0b3b3eedcc2244df56b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 -Subject: [PATCH 68/92] Revert "vdpau: comment some features that will be added +Subject: [PATCH 68/90] Revert "vdpau: comment some features that will be added later" This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. @@ -8307,13 +8307,13 @@ index 57bb704..55f17e5 100644 m_mixersteps = 1; } -- -1.8.4 +1.8.5-rc3 -From bfc58b21773bf89fbcb75f70e664a57bb9ebfe88 Mon Sep 17 00:00:00 2001 +From 8c64fef920ba07765ebe6fcb6b3416bee0f133a4 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 -Subject: [PATCH 69/92] X11: fix keysyms +Subject: [PATCH 69/90] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8333,13 +8333,13 @@ index e4ca56d..b20130c 100644 newEvent.key.keysym.unicode = keys[keys.length() - 1]; newEvent.key.state = xevent.xkey.state; -- -1.8.4 +1.8.5-rc3 -From 3d7eab774e6d5b01a11249560b88d5fc62d2aead Mon Sep 17 00:00:00 2001 +From 088d985dda96da92d05e4b3363143340911ad477 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 -Subject: [PATCH 70/92] X11: fix keysym for non-IM +Subject: [PATCH 70/90] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8359,13 +8359,13 @@ index b20130c..a38890c 100644 newEvent.key.keysym.scancode = xevent.xkey.keycode; newEvent.key.state = xevent.xkey.state; -- -1.8.4 +1.8.5-rc3 -From ecaa4df5a6348f88426f0b6bb0f51df5cad1a8f4 Mon Sep 17 00:00:00 2001 +From 5d301b98971bb80401621745fb04558da692e0f5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 -Subject: [PATCH 71/92] add some missing multi media keys +Subject: [PATCH 71/90] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -8417,13 +8417,13 @@ index ee6bb69..364b45a 100644 XBMCVK_LCONTROL = 0xD0, XBMCVK_RCONTROL = 0xD1, -- -1.8.4 +1.8.5-rc3 -From 96738d7161b1676168155c72dcbca999a8f9fb92 Mon Sep 17 00:00:00 2001 +From 3abd2f1d1301237e318b88d2b485ce936cbbc9aa Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 -Subject: [PATCH 72/92] X11: squash multi +Subject: [PATCH 72/90] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8443,13 +8443,13 @@ index df5fe9b..d8e04d6 100644 bool CWinSystemX11::IsSuitableVisual(XVisualInfo *vInfo) -- -1.8.4 +1.8.5-rc3 -From 776b1b2496e0238550b0ce4ff0e2774f36d61e16 Mon Sep 17 00:00:00 2001 +From a840373da59aa82aaf98c664bc6c514c67515ef4 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 -Subject: [PATCH 73/92] X11: do not poll default monitor +Subject: [PATCH 73/90] X11: do not poll default monitor --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8469,13 +8469,13 @@ index d8e04d6..01f5272 100644 int numScreens = XScreenCount(m_dpy); -- -1.8.4 +1.8.5-rc3 -From 4b8090bc0993595d00ba294cd09b4eacd6e9c246 Mon Sep 17 00:00:00 2001 +From 278c1d3ececa6e1032db52fcddc053b0454d2e5b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:28 +0100 -Subject: [PATCH 74/92] X11: fix broken monitor switching +Subject: [PATCH 74/90] X11: fix broken monitor switching --- system/settings/settings.xml | 1 - @@ -8483,10 +8483,10 @@ Subject: [PATCH 74/92] X11: fix broken monitor switching 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 3d7ef20..a6428cd 100644 +index 93eaa5c..8e77489 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2074,7 +2074,6 @@ +@@ -2090,7 +2090,6 @@ -1 @@ -8575,13 +8575,13 @@ index 40bc3b3..1663836 100644 current = monitors[i]; } -- -1.8.4 +1.8.5-rc3 -From 8b16af7549f335fef8f26600ae6d379ef8735baf Mon Sep 17 00:00:00 2001 +From 01f349f7b3e82deec46b8c1fe153712e4973cf01 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:59 +0100 -Subject: [PATCH 75/92] X11: remove polling for connected outputs, use xrr +Subject: [PATCH 75/90] X11: remove polling for connected outputs, use xrr events --- @@ -8879,13 +8879,13 @@ index 7ec5be4..14622cb 100644 bool m_bIsInternalXrr; bool m_newGlContext; -- -1.8.4 +1.8.5-rc3 -From fec8bc28dd5fa1de7e44ba6af7eb9ed70ca32995 Mon Sep 17 00:00:00 2001 +From 6828a6eed9d58fd7bd201a2c113de92658826eff Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 09:37:13 +0100 -Subject: [PATCH 76/92] X11: remove grabbing of keyboard and mouse +Subject: [PATCH 76/90] X11: remove grabbing of keyboard and mouse --- xbmc/windowing/WinEventsX11.cpp | 4 ---- @@ -9000,13 +9000,13 @@ index 14622cb..d1c8729 100644 CCriticalSection m_resourceSection; std::vector m_resources; -- -1.8.4 +1.8.5-rc3 -From 17bbd954bb88c1dfc843e428d0c0b986aa633192 Mon Sep 17 00:00:00 2001 +From 400b554f3371d7b426a1031fdf0bbddcade39434 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 10:46:40 +0100 -Subject: [PATCH 77/92] X11: set ExposureMask on gl window, fixes not updated +Subject: [PATCH 77/90] X11: set ExposureMask on gl window, fixes not updated areas --- @@ -9029,13 +9029,13 @@ index 695b352..e55583c 100644 m_glWindow = XCreateWindow(m_dpy, m_mainWindow, 0, 0, width, height, 0, vi->depth, -- -1.8.4 +1.8.5-rc3 -From 81c235b59a3430703f86d97bf7b80335845f0bd4 Mon Sep 17 00:00:00 2001 +From b8230a5002631d595a70754f92c63e26c8b63a8c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 11:25:19 +0100 -Subject: [PATCH 78/92] X11: drop shortcuts, have WM do this +Subject: [PATCH 78/90] X11: drop shortcuts, have WM do this --- xbmc/windowing/WinEventsX11.cpp | 21 --------------------- @@ -9094,23 +9094,23 @@ index 6429291..4334d21 100644 Display *m_display; Window m_window; -- -1.8.4 +1.8.5-rc3 -From 81bf11a8f222435b0142284fb97f939dcb7e140f Mon Sep 17 00:00:00 2001 +From 901f3893fd34d02b74abc981c3f50e4498791b4d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 7 Nov 2013 15:02:00 +0100 -Subject: [PATCH 79/92] X11: adapt to new settings +Subject: [PATCH 79/90] X11: adapt to new settings --- system/settings/settings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index a6428cd..5e6a312 100644 +index 8e77489..c21c581 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2034,6 +2034,7 @@ +@@ -2050,6 +2050,7 @@ HAS_GLX 0 false @@ -9119,13 +9119,13 @@ index a6428cd..5e6a312 100644 0 -- -1.8.4 +1.8.5-rc3 -From b6daba9a44866e1fe419a3bad213063df9775194 Mon Sep 17 00:00:00 2001 +From 3c1f1002e9de2e344b7332ffe4db75c842b9d039 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 9 Nov 2013 12:20:05 +0100 -Subject: [PATCH 80/92] vdpau: move cropping of top and bottom lines to +Subject: [PATCH 80/90] vdpau: move cropping of top and bottom lines to renderer --- @@ -9316,13 +9316,13 @@ index abe8da2..2dd3c28 100644 int m_mixerstep; int m_mixersteps; -- -1.8.4 +1.8.5-rc3 -From e7d3ded4f51268a7c4991e6d52f1c619380f593a Mon Sep 17 00:00:00 2001 +From 320e42a901d5215c15491809c114d9daad41e742 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 09:28:24 +0100 -Subject: [PATCH 81/92] X11: adapt to changes in cstdstring +Subject: [PATCH 81/90] X11: adapt to changes in cstdstring --- xbmc/windowing/X11/WinSystemX11.cpp | 4 ++-- @@ -9367,13 +9367,13 @@ index 8525ede..c94f2e3 100644 int status = system(cmd.c_str()); if (status == -1) -- -1.8.4 +1.8.5-rc3 -From 070df53f2088e98e147fc9f0c4c62f70921ea40e Mon Sep 17 00:00:00 2001 +From a55531e7c98ae16d4a79b2f0881f4553f184f1e8 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 18:50:57 +0100 -Subject: [PATCH 82/92] dvdplayer: fix failed to get stream message, lookup +Subject: [PATCH 82/90] dvdplayer: fix failed to get stream message, lookup streams the same way as getting the index --- @@ -9381,7 +9381,7 @@ Subject: [PATCH 82/92] dvdplayer: fix failed to get stream message, lookup 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index a780228..f400689 100644 +index 70ec003..8cb0aa7 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -110,7 +110,7 @@ void CSelectionStreams::Clear(StreamType type, StreamSource source) @@ -9394,20 +9394,20 @@ index a780228..f400689 100644 count++; if(count == index) -- -1.8.4 +1.8.5-rc3 -From 7617cf2992bc38725cf9246e8942592be1244883 Mon Sep 17 00:00:00 2001 +From 40fd61774b2a28df647a7b3d5aa98fb9981c9b0c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 19:22:01 +0100 -Subject: [PATCH 83/92] omxplayer: fix failed to get stream message +Subject: [PATCH 83/90] omxplayer: fix failed to get stream message --- xbmc/cores/omxplayer/OMXPlayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index 7928b25..1023956 100644 +index 7d13609..9e3bea5 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp @@ -341,7 +341,7 @@ bool COMXSelectionStreams::Get(StreamType type, CDemuxStream::EFlags flag, OMXSe @@ -9420,13 +9420,13 @@ index 7928b25..1023956 100644 if((m_Streams[i].flags & flag) != flag) continue; -- -1.8.4 +1.8.5-rc3 -From 79183df293ac95e5ea6210bd45e56df4e63d70d2 Mon Sep 17 00:00:00 2001 +From 0f367748d09f9347f792f165b026398935d1d258 Mon Sep 17 00:00:00 2001 From: Marcel Groothuis Date: Fri, 8 Nov 2013 21:49:13 +0100 -Subject: [PATCH 84/92] ffmpeg demuxer: faster channel change for PVR addons +Subject: [PATCH 84/90] ffmpeg demuxer: faster channel change for PVR addons without internal demuxing (such as MediaPortal, ArgusTV, MythTV, NextPVR) Credits: FernetMenta, Davilla, Popcornmix @@ -9691,13 +9691,13 @@ index ca689d0..081219b 100644 else return NULL; -- -1.8.4 +1.8.5-rc3 -From 5d6a2e35ee1aa4650fe31b27b39dfeccb37f021f Mon Sep 17 00:00:00 2001 +From 9995384627c298f86f115e33d24c4f76ac3bc4e9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 10 Nov 2013 10:13:06 +0100 -Subject: [PATCH 85/92] ffmpeg demuxer: refactoring for fast channel change +Subject: [PATCH 85/90] ffmpeg demuxer: refactoring for fast channel change --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 156 +++++++++++---------- @@ -9891,13 +9891,13 @@ index 309f554..e89022a 100644 AVDictionary *GetFFMpegOptionsFromURL(const CURL &url); double ConvertTimestamp(int64_t pts, int den, int num); -- -1.8.4 +1.8.5-rc3 -From 213e5f2343c61c8002fc809df4af9c0df10f271f Mon Sep 17 00:00:00 2001 +From de43ffd7fede6dae7b75ffc384944ed048507ed5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 13 Nov 2013 08:53:04 +0100 -Subject: [PATCH 86/92] ffmpeg demuxer: reduce time for finding stream info +Subject: [PATCH 86/90] ffmpeg demuxer: reduce time for finding stream info --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 141 ++++++++++++--------- @@ -10114,13 +10114,13 @@ index e89022a..acde9a8 100644 AVDictionary *GetFFMpegOptionsFromURL(const CURL &url); double ConvertTimestamp(int64_t pts, int den, int num); -- -1.8.4 +1.8.5-rc3 -From 61c1dd17934be76d8a0340d358b485ac69bb8d15 Mon Sep 17 00:00:00 2001 +From e2d5e3a0f84e66bce4c4646642669d571ea8f92d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 20:35:04 +0100 -Subject: [PATCH 87/92] ffmoeg demuxer: make sure we start video with an +Subject: [PATCH 87/90] ffmoeg demuxer: make sure we start video with an i-frame --- @@ -10184,13 +10184,13 @@ index acde9a8..9ec0877 100644 AVDictionary *GetFFMpegOptionsFromURL(const CURL &url); double ConvertTimestamp(int64_t pts, int den, int num); -- -1.8.4 +1.8.5-rc3 -From e60a5315d428a36de56e6e3f0cbf3225b8e8afa6 Mon Sep 17 00:00:00 2001 +From 7173380b805dd7a3ecfc9c1453d34fe413d13ff7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 16 Nov 2013 16:30:20 +0100 -Subject: [PATCH 88/92] ffmpeg demuxer: short anylyze time for mpegts, squash +Subject: [PATCH 88/90] ffmpeg demuxer: short anylyze time for mpegts, squash me --- @@ -10230,13 +10230,13 @@ index aba9b6c..456c1c0 100644 else m_program = 0; -- -1.8.4 +1.8.5-rc3 -From dd7972d58f33fd987484a1c3c88345f2bd9f7b80 Mon Sep 17 00:00:00 2001 +From ce004c503e0120cfe6dadbb2f72cce06334ebac2 Mon Sep 17 00:00:00 2001 From: Marcel Groothuis Date: Sun, 17 Nov 2013 17:40:40 +0100 -Subject: [PATCH 89/92] Fixed: compilation against external ffmpeg +Subject: [PATCH 89/90] Fixed: compilation against external ffmpeg --- lib/DllAvCodec.h | 4 ++-- @@ -10262,13 +10262,13 @@ index 3500670..cfffe2d 100644 virtual AVCodec *avcodec_find_decoder(enum AVCodecID id) { return ::avcodec_find_decoder(id); } virtual AVCodec *avcodec_find_encoder(enum AVCodecID id) { return ::avcodec_find_encoder(id); } -- -1.8.4 +1.8.5-rc3 -From 0d932918fb343ae4ab9188fe10c6c84e1bed9e69 Mon Sep 17 00:00:00 2001 +From d1d476c8dc8a84ef69e35aaa71c1e7319373a906 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 18 Nov 2013 17:44:31 +0100 -Subject: [PATCH 91/92] ActiveAE: correct time of buffered samples by resample +Subject: [PATCH 90/90] ActiveAE: correct time of buffered samples by resample ratio --- @@ -10277,7 +10277,7 @@ Subject: [PATCH 91/92] ActiveAE: correct time of buffered samples by resample 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 0a353f9..64506ce 100644 +index 6443a2a..2bcfd68 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -99,7 +99,7 @@ float CEngineStats::GetDelay(CActiveAEStream *stream) @@ -10302,5 +10302,5 @@ index d5b01ea..9914e9e 100644 CActiveAEStream::~CActiveAEStream() -- -1.8.4 +1.8.5-rc3