diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 2fdb11d529..f55c6d58d0 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-15bb590" +PKG_VERSION="13.alpha-7f6c5e4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index f606d1d2d2..a921a73c0a 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13.alpha-15bb590" +PKG_VERSION="13.alpha-7f6c5e4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-9e4195a.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-7f6c5e4.patch similarity index 89% rename from packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-9e4195a.patch rename to packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-7f6c5e4.patch index 5bcc7fcefc..e61a783ba7 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-9e4195a.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-7f6c5e4.patch @@ -1,7 +1,7 @@ -From 925d09812a8c3303e38c0fdefd15363cba8b2be7 Mon Sep 17 00:00:00 2001 +From 68a58d680018fd34f1604223625e7b7c025a1e39 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 01/93] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 01/89] videoplayer: adapt lateness detection and dropping to buffering --- @@ -582,10 +582,10 @@ index f8ad541..186e271 100644 1.8.5.1 -From 05ee985eedc249c93ce799d6a9f1974d59fa6e9b Mon Sep 17 00:00:00 2001 +From 157bf97937800048435081e0d3547ddebea67ff6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 02/93] video player: present correct pts to user for a/v sync +Subject: [PATCH 02/89] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -653,10 +653,10 @@ index 186e271..59c7f09 100644 1.8.5.1 -From b71bbbc5e86d78097c0e78529bf6c4bba8d002bb Mon Sep 17 00:00:00 2001 +From 99f04ef8397779991b446a8b15de65ec94f1c7d8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 03/93] videoplayer: some rework and documentation +Subject: [PATCH 03/89] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -767,10 +767,10 @@ index 587ea4b..27a61bd 100644 1.8.5.1 -From 06bdde14f53ad5266bf3d5c82c06ab3b43dcaa54 Mon Sep 17 00:00:00 2001 +From 5e14dbe9c79d87f17bcd3614109ae8b56ef9d1cf Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 04/93] renderer: bump buffers to 5 +Subject: [PATCH 04/89] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -793,10 +793,10 @@ index 5a21fec..c131dd1 100644 1.8.5.1 -From b89f4540b4730d36b948354ee97c0888bbf0372e Mon Sep 17 00:00:00 2001 +From bf55c75f03c7d5141a551591abd0d3539bdff9d3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 05/93] videoplayer: update frametime, it might change due to +Subject: [PATCH 05/89] videoplayer: update frametime, it might change due to fps detection --- @@ -820,10 +820,10 @@ index 27a61bd..8e772e3 100644 1.8.5.1 -From 376bd22742ddecf97304da022167cb2d95f2e12b Mon Sep 17 00:00:00 2001 +From 816ad7ebdf60e7c5fd1bf5f6a760d125a3c8e8fb Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 06/93] videoplayer: give streams with invalid fps a chance for +Subject: [PATCH 06/89] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -847,10 +847,10 @@ index 8e772e3..150a796 100644 1.8.5.1 -From c98179fad9c107b9df5a33e28693dd88b13c13ff Mon Sep 17 00:00:00 2001 +From 16aa6e9f9c3bce8890f082ac1a6a69df8ec62d4a Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 07/93] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 07/89] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -858,7 +858,7 @@ Subject: [PATCH 07/93] 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 f9375c6..915c2d7 100644 +index a698b8f..a845c7e 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1663,7 +1663,7 @@ void CDVDPlayer::HandlePlaySpeed() @@ -887,10 +887,10 @@ index f9375c6..915c2d7 100644 1.8.5.1 -From bfebc1e1806ca97848aa82984d6f1abab8bb6c7c Mon Sep 17 00:00:00 2001 +From 124e6ae963d6ef951af6e6da3b6a56380e87c9d2 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 08/93] X11: ditch SDL for video and window events +Subject: [PATCH 08/89] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -2427,10 +2427,10 @@ index b1464d0..34b912f 100644 1.8.5.1 -From 83ee4307f7e363a413c7820434f1f28a3b3c734e Mon Sep 17 00:00:00 2001 +From f143e69def4d1a698d883d3151eb1fa9cbb71144 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 09/93] X11: Add xbmc icon +Subject: [PATCH 09/89] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -2620,10 +2620,10 @@ index 34b912f..352e90e 100644 1.8.5.1 -From 5d0b6ffeee3b9746ddb1a5aa0c79a525a9334d37 Mon Sep 17 00:00:00 2001 +From 1b5499e0a3cb60fe06ca9a1b5db4f243b5c1b5a4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 10/93] X11: add SDL joystick until we have a better solution +Subject: [PATCH 10/89] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -2677,10 +2677,10 @@ index ad58aad..6f57a87 100644 1.8.5.1 -From 32424259449e821f259bfe974c722168dc05e68d Mon Sep 17 00:00:00 2001 +From b931f6609e657a059f70253e2280c4b4cc5ef0d3 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 11/93] X11: factor out code handling device reset notification +Subject: [PATCH 11/89] X11: factor out code handling device reset notification --- xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- @@ -2743,10 +2743,10 @@ index 352e90e..3f91b9b 100644 1.8.5.1 -From eac701b19b2c21cfe2903a8b32dc11b6b03ad03e Mon Sep 17 00:00:00 2001 +From 420b3b67ee19bb851d6493e8893bcdd89c796fbe Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 12/93] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 12/89] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -2890,10 +2890,10 @@ index 304dac8..16b13aa 100644 1.8.5.1 -From 15f9fc37725a53a2bcc156b748504febfd04bf92 Mon Sep 17 00:00:00 2001 +From 589b29f043dda738dfa310fb943695a43bc2dec0 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 13/93] xrandr: remove method RestoreState +Subject: [PATCH 13/89] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -2972,10 +2972,10 @@ index 0aec487..00b49dc 100644 1.8.5.1 -From 751f51877e00d05cfdd13107e79c6ee11cc7d577 Mon Sep 17 00:00:00 2001 +From 8ce00de3ce235c5800f0f4269202fe74bd6e6094 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 14/93] xrandr: observe orientation +Subject: [PATCH 14/89] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -3190,10 +3190,10 @@ index 00b49dc..508604d 100644 1.8.5.1 -From 295a8899bb0e02db0da0528fe6e63347d94e5fdf Mon Sep 17 00:00:00 2001 +From 79a20841caf6de2a7e84b819d390d69c9ea42dc0 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 15/93] xrandr: allow getting info for multiple screen's +Subject: [PATCH 15/89] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -3368,10 +3368,10 @@ index 508604d..d37838a 100644 1.8.5.1 -From 9303c15f14342f6900b096d03829f9e97b95ac75 Mon Sep 17 00:00:00 2001 +From 08c5968950cde689f1280f693e804d1310c567cb Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 16/93] X11: fix multi-head setups +Subject: [PATCH 16/89] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -3386,7 +3386,7 @@ Subject: [PATCH 16/93] 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 bab2c12..253f9d1 100755 +index 640a7b5..891845a 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1019,7 +1019,9 @@ msgctxt "#245" @@ -3401,10 +3401,10 @@ index bab2c12..253f9d1 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 1a3aca4..e826418 100644 +index ab1d267..3ee685c 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2037,6 +2037,15 @@ +@@ -2049,6 +2049,15 @@
@@ -3420,7 +3420,7 @@ index 1a3aca4..e826418 100644 0 0 -@@ -2058,6 +2067,7 @@ +@@ -2070,6 +2079,7 @@ -1 @@ -3428,7 +3428,7 @@ index 1a3aca4..e826418 100644 -@@ -2075,6 +2085,7 @@ +@@ -2087,6 +2097,7 @@ -1 @@ -4130,10 +4130,10 @@ index 4175aab..94584ab 100644 1.8.5.1 -From e2ad2b915ed3f72c3ab76f608d0ae1e8e53bdae1 Mon Sep 17 00:00:00 2001 +From 5518d1bb32e139d2abb9fb7e106851ee3b7f09b4 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 17/93] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 17/89] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -4201,10 +4201,10 @@ index 6383754..21e7dc5 100644 1.8.5.1 -From 83a9a4ecb67ad3dfa1c1c5c4da9b729315abcf0b Mon Sep 17 00:00:00 2001 +From 7eec07fdc52e059cc21146f5a991d5fc8604c4cf Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 18/93] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 18/89] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -4276,10 +4276,10 @@ index 0b3950a..ca43b5a 100644 1.8.5.1 -From 8717775f9981cdaca1be7b5012bab55bdc05090e Mon Sep 17 00:00:00 2001 +From b122077f861bef67c21dfccb71c9cd6a78aebe92 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 19/93] X11: recreate gl context after output has changed +Subject: [PATCH 19/89] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -4430,10 +4430,10 @@ index 21e7dc5..8e68d5d 100644 1.8.5.1 -From 4c245692b50baf7afe3d436e748cfd42f32eb5b0 Mon Sep 17 00:00:00 2001 +From 7af7c4bf720d280df1369f72364400b0c06aa22b Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 20/93] X11: hook video reference clock in windowing +Subject: [PATCH 20/89] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -4638,10 +4638,10 @@ index dd65a1b..afd71fc 100644 1.8.5.1 -From 1f2ab47decb9d1b3d2552a1d71b28d7c6421520d Mon Sep 17 00:00:00 2001 +From af5e5d2f81fc71d1ab967dd3ff9b298010e7db83 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 21/93] X11: fix video calibrations +Subject: [PATCH 21/89] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -4733,10 +4733,10 @@ index 9666cc3..5b52d6c 100644 1.8.5.1 -From dd1b917d6e7ca76d09e8b0b8eb635a68c0563848 Mon Sep 17 00:00:00 2001 +From 2b4b57f4dd451fc3cdadc00e4deb7193606d3bdc Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 22/93] X11: deactivate screen saver on startup +Subject: [PATCH 22/89] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -4806,10 +4806,10 @@ index 5b52d6c..b2bd5a0 100644 1.8.5.1 -From 6598e86c089efb321d2801d9f55a41edde913b31 Mon Sep 17 00:00:00 2001 +From b2cc7d031ad73f33ba9d185758281e4db122066e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 23/93] X11: change method of going full-screen +Subject: [PATCH 23/89] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -4853,10 +4853,10 @@ index b76b229..869baa8 100644 1.8.5.1 -From 6d639b9b09f502a015b4cf67980614bd20d17864 Mon Sep 17 00:00:00 2001 +From 98205d3a261736910f5f6928029fc6d7418ba106 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 24/93] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 24/89] X11: reset key repeat and key modifier on focus lost and gain --- @@ -4888,10 +4888,10 @@ index d98f12f..743aca9 100644 1.8.5.1 -From a5f254229a83c528e85ff411652d452eecf13629 Mon Sep 17 00:00:00 2001 +From 986fee98c9a8063b1f9ba6086db706289d8a2ef6 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 25/93] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 25/89] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -5108,10 +5108,10 @@ index a412f32..9a8a912 100644 1.8.5.1 -From d09866aecc5150d8bbb574e437d052dfdcbaabc5 Mon Sep 17 00:00:00 2001 +From 522ce80cf3a454ad741c4a1d4799d2f9a6ba7490 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 26/93] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 26/89] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -5175,10 +5175,10 @@ index 9a8a912..c69169c 100644 1.8.5.1 -From e17099956b1da4c7025ab63efd0ff6e9d41bb7af Mon Sep 17 00:00:00 2001 +From 3c57caccb63faa27e78fccaacf4dd494b9a280f5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 27/93] add missing keys to xbmc keytable +Subject: [PATCH 27/89] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -5201,10 +5201,10 @@ index d57f4d3..b807897 100644 1.8.5.1 -From cf78167de3d99a89f516272ea1b1d4cf5344302c Mon Sep 17 00:00:00 2001 +From 51ef003f390e8cdc6bad59a89e9e7353c24f8fe3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 28/93] videorefclock: temp deactivate of nv settings +Subject: [PATCH 28/89] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -5227,10 +5227,10 @@ index 0ddf102..3ae7107 100644 1.8.5.1 -From 1e2e53bfa94acb36f5460c1ed5f357112889d260 Mon Sep 17 00:00:00 2001 +From 4cd2d1c1a99fac4f5314c2d3f273a01abbf41864 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 29/93] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 29/89] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -5261,10 +5261,10 @@ index 3ae7107..27bebde 100644 1.8.5.1 -From f30f6587fb6f2ce5a3d32892107d4839d9af3f36 Mon Sep 17 00:00:00 2001 +From 991025f6b94a9d385ac7fcd57ae626d53be92ff0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 30/93] X11: fix icon texture after +Subject: [PATCH 30/89] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -5372,10 +5372,10 @@ index 869baa8..bfe3797 100644 1.8.5.1 -From 2eb1f5a42c5cebc6987cac25de795fe4b9417c3d Mon Sep 17 00:00:00 2001 +From 85403f47ec1837cdc35d3ee0e78545920ddaac1b Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 31/93] X11: check for window manager +Subject: [PATCH 31/89] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -5496,10 +5496,10 @@ index b2bd5a0..3e62cd8 100644 1.8.5.1 -From 054421424abd7dc17bc993c291810f035e9a8298 Mon Sep 17 00:00:00 2001 +From cada9778db199ae81c699846dcc33a9a21124e8e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 32/93] X11: dont set window on xrandr if no mode available +Subject: [PATCH 32/89] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -5536,10 +5536,10 @@ index af82061..4f33c68 100644 1.8.5.1 -From 8e4b70349443aa7c14cf9b0786ca913c1c70a972 Mon Sep 17 00:00:00 2001 +From 42303801b5d1ca410dcbd7e789e42b46d7a81a3b Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 33/93] X11: fix crash after a resolution change on startup +Subject: [PATCH 33/89] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -5563,10 +5563,10 @@ index 4f33c68..bc4e963 100644 1.8.5.1 -From 13de82289bfb2b5cf24065a51702f5c4a3d993fa Mon Sep 17 00:00:00 2001 +From febf6a9132d6a42409eb893a5f44d0433f00cb60 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 34/93] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 34/89] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -5589,10 +5589,10 @@ index bc4e963..57a8d20 100644 1.8.5.1 -From 8e06b84f8bb6769742482d9bc6e884ba9ed326c4 Mon Sep 17 00:00:00 2001 +From 8335c1f7253d7f8d33b6766b2f4d1c06f1ceb24e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 35/93] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 35/89] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ @@ -5638,10 +5638,10 @@ index 0016c0b..3514856 100644 1.8.5.1 -From f01dbcfe4cfa06a4abadb90cfd4935de5125f007 Mon Sep 17 00:00:00 2001 +From 44a73339f093af8aeec3ebae4d069785e8f19a28 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 36/93] dvdplayer: observe pts counter overflow +Subject: [PATCH 36/89] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -5928,10 +5928,10 @@ index aef5ab1..35abbdf 100644 1.8.5.1 -From 45104d16c7d54bb029891618f96d944c2fe6f559 Mon Sep 17 00:00:00 2001 +From 63af30ee87733db1aeedf58153a03284da1e8472 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 37/93] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 37/89] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -5964,10 +5964,10 @@ index 150a796..beffbe9 100644 1.8.5.1 -From 71f3cc7c934313c9864c3c87bdf12c756a848d64 Mon Sep 17 00:00:00 2001 +From 0c0cf15e7e99114adbd55f3b17ba01bc5b11071f Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 38/93] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 38/89] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -5976,10 +5976,10 @@ Subject: [PATCH 38/93] vdpau: advanced settings for auto deinterlacing 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 97dea48..57bb704 100644 +index 277802f..3292461 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -1959,10 +1959,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) +@@ -1954,10 +1954,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) if (method == VS_INTERLACEMETHOD_AUTO) { int deint = -1; @@ -6033,10 +6033,10 @@ index 7d16957..bb70f3e 100644 1.8.5.1 -From 3e1dcac9988fbb9208d3c40412a068fade58950c Mon Sep 17 00:00:00 2001 +From 14b0980a2cc12d34b96978958eb5f4c5ef5a4f32 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 39/93] player: fix rewind +Subject: [PATCH 39/89] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -6084,7 +6084,7 @@ index 2ea8b8f..e8274f9 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 915c2d7..70ec003 100644 +index a845c7e..ad851e9 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1664,11 +1664,13 @@ void CDVDPlayer::HandlePlaySpeed() @@ -6189,7 +6189,7 @@ index 915c2d7..70ec003 100644 UpdatePlayState(0); diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h -index 5ae5f9f..0ba2c0d 100644 +index dfe679f..96f7fe5 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.h +++ b/xbmc/cores/dvdplayer/DVDPlayer.h @@ -315,7 +315,7 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer @@ -6251,10 +6251,10 @@ index 59c7f09..65dea76 100644 1.8.5.1 -From 0c86847b82a9c824d8e0bdf3cb8a81c376dd5ec3 Mon Sep 17 00:00:00 2001 +From e2d811124ccaf92a8c4bdd8cbb5dd0077494a692 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 40/93] xrandr: fix query for multiple screens +Subject: [PATCH 40/89] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -6295,10 +6295,10 @@ index 4685413..e610150 100644 1.8.5.1 -From 2862a2ba2f2412e0d107de824780294af5e37ed9 Mon Sep 17 00:00:00 2001 +From 14e028a3e62bb2b3dc32559af4d70a3af11e87e9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 41/93] X11: add debug log to print out refresh after xrr event +Subject: [PATCH 41/89] X11: add debug log to print out refresh after xrr event --- xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ @@ -6325,10 +6325,10 @@ index 57a8d20..a237dc0 100644 1.8.5.1 -From 6b2fdea3dfb8b579df6ce73b2bd99cebf9f01f13 Mon Sep 17 00:00:00 2001 +From 84849987ae3cb3f0a67f7d5ef2193b6d2a909460 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 42/93] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 42/89] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -6353,10 +6353,10 @@ index a237dc0..ab660b1 100644 1.8.5.1 -From 03eb6918eeb07186e959c7404787422341d51dc1 Mon Sep 17 00:00:00 2001 +From a3c96f49e233c93713fc3da66a5020daef272fa9 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/93] x11: support for multiple x screens +Subject: [PATCH 43/89] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6379,10 +6379,10 @@ index e610150..5c53574 100644 1.8.5.1 -From 8c5b62ed948d3fe53040c1362105a8e4fc68f724 Mon Sep 17 00:00:00 2001 +From d63b99422269911b7ec4266ae77352341c8de1ab Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 44/93] pvr: increase changes counter of stream on stream +Subject: [PATCH 44/89] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -6416,10 +6416,10 @@ index b96d520..df89f6f 100644 1.8.5.1 -From ffc638b540bc7b33c63cbfb87c4adc1069ad5c68 Mon Sep 17 00:00:00 2001 +From d680997148bd9f44f0b1b2b6e18b59fc0d368702 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 45/93] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 45/89] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -6441,10 +6441,10 @@ index a62521f..263cb5a 100644 1.8.5.1 -From c5326ada9f69019530b419ed486a79bf0b8c4f6e Mon Sep 17 00:00:00 2001 +From 8b7cec534ca0f284cdf98d1d7a48b47f7a5415b9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 46/93] X11: remove toggle full screen after resume +Subject: [PATCH 46/89] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -6470,10 +6470,10 @@ index 590a887..35b5a21 100644 1.8.5.1 -From 40382651bea4c521c06b13c7b98426c4d96c4c07 Mon Sep 17 00:00:00 2001 +From dc9d8318045387084e0d366b103678b9f005dc3d Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 47/93] xrandr: set screen on mode change command +Subject: [PATCH 47/89] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6496,10 +6496,10 @@ index 5c53574..4355ef7 100644 1.8.5.1 -From 026a7f4cb2b4248cd2a2b6fc68c040d38f987c7c Mon Sep 17 00:00:00 2001 +From f8c7cb3744e2682e122ef2b50d8abf7568b1144b Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 48/93] X11: recreate glx context when output changes +Subject: [PATCH 48/89] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -6550,10 +6550,10 @@ index 3e62cd8..2a1fb41 100644 1.8.5.1 -From e2d8fa4daa56813ff05cc42d428c0670de570e68 Mon Sep 17 00:00:00 2001 +From d5babf0e520d9bca57b0fecbe30889c0fb6979ce Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 49/93] pvr: do not show selection dialog for a single menu +Subject: [PATCH 49/89] pvr: do not show selection dialog for a single menu hook --- @@ -6591,10 +6591,10 @@ index 6560dfa..80106be 100644 1.8.5.1 -From e20a8cdb28744afb12f225be6c6839fe777f6152 Mon Sep 17 00:00:00 2001 +From ffd8adaff169c5929980b8eb60f456d10ab44628 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 50/93] X11: use default screen parameters if no output +Subject: [PATCH 50/89] X11: use default screen parameters if no output connected --- @@ -6698,10 +6698,10 @@ index 4329a22..2adf8a0 100644 1.8.5.1 -From 7f9cffd8ebd6b58529660f227d67c459e6bde728 Mon Sep 17 00:00:00 2001 +From 4b561afaaaef181c84515c6aa68355edf902bd6b Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 51/93] X11: create parent window +Subject: [PATCH 51/89] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -6967,10 +6967,10 @@ index 2a1fb41..e8993f1 100644 1.8.5.1 -From d083e76fc41c05963c9e5319531f4c0774666b86 Mon Sep 17 00:00:00 2001 +From 1bb2ea4dd7c9d1dcb857c1d83559ba161019d4e2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 52/93] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 52/89] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -7172,10 +7172,10 @@ index c69169c..6429291 100644 1.8.5.1 -From c756681af847373917a5fc581a4718b49c4b6ff8 Mon Sep 17 00:00:00 2001 +From a1f1fd1e364651468cde9430316945ffe26f7138 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 53/93] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 53/89] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -7213,17 +7213,17 @@ index c06b8c5..4390d2e 100644 1.8.5.1 -From 37261a8c7b4e9258629cb60fa7c0478aa8f0d7df Mon Sep 17 00:00:00 2001 +From d997aed22731bd086b0f0a57f17f371c68ac647d Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 54/93] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 54/89] 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 5e77059..7d13609 100644 +index 9cccaac..4168195 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp @@ -2577,7 +2577,8 @@ void COMXPlayer::HandleMessages() @@ -7240,10 +7240,10 @@ index 5e77059..7d13609 100644 1.8.5.1 -From 2f53d8cd8d5e0a0519cae147a2c178c5a5b176c5 Mon Sep 17 00:00:00 2001 +From b917a688dff3ace1fe9a5d0ef4b7d2574c2293af Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 55/93] fix incorrect display of fps when dr kicks in +Subject: [PATCH 55/89] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- @@ -7270,10 +7270,10 @@ index ffb90dc..1cea2da 100644 1.8.5.1 -From 5def7a37480d13577c13247fb4b9c995c43481ee Mon Sep 17 00:00:00 2001 +From 3d5a34ae46fd2926eb533175570b85ddedc5594b Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 56/93] X11: fix mouse coverage +Subject: [PATCH 56/89] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -7339,10 +7339,10 @@ index e8993f1..5cccfb7 100644 1.8.5.1 -From 0365e07d34dc57c884dead7cc5d6084203d4c46a Mon Sep 17 00:00:00 2001 +From 0f8dbfd4fc7d27c1fa7539c3c88abe2f9de100a8 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 57/93] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 57/89] X11: fix incorrectly used screen num in desktop resolution --- @@ -7377,10 +7377,10 @@ index 2acb36d..101ba98 100644 1.8.5.1 -From 3a6092a59f18b082bb4d5350d37112c20e6f1a40 Mon Sep 17 00:00:00 2001 +From 74d73a2486e8e464f49ba389ab10eaed08a03e82 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 58/93] X11: do not overwrite user selected monitor with +Subject: [PATCH 58/89] X11: do not overwrite user selected monitor with fallback --- @@ -7505,10 +7505,10 @@ index 5cccfb7..1b658e2 100644 1.8.5.1 -From 841aa26f106c905fb114e416268db6e27ce00ead Mon Sep 17 00:00:00 2001 +From 240beb1b793a570825ff5d85ce5cf395aedcc8d9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 59/93] xrandr: add turn on/off to wrapper +Subject: [PATCH 59/89] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -7674,10 +7674,10 @@ index d37838a..059062f 100644 1.8.5.1 -From ea5eb0aa3d15adc213ea18eb88a69f2fe56afa66 Mon Sep 17 00:00:00 2001 +From d8f95be6e1cea15dc70a98fec39681129a8d0637 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 60/93] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 60/89] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -7734,10 +7734,10 @@ index 059062f..ab7cc63 100644 1.8.5.1 -From 32a5aeda8528669fd0a4aafb6b358fb5991243b3 Mon Sep 17 00:00:00 2001 +From 3a101d60a16f4442750b5da19ab034b336f10d43 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 61/93] X11: multi-head improvement - poll for desired output +Subject: [PATCH 61/89] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -7752,7 +7752,7 @@ Subject: [PATCH 61/93] 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 253f9d1..f9d427d 100755 +index 891845a..b83a8d2 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6464,7 +6464,7 @@ msgctxt "#14071" @@ -7779,10 +7779,10 @@ index 253f9d1..f9d427d 100755 #: xbmc/video/VideoDatabase.cpp msgctxt "#15012" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index e826418..8eb7dbb 100644 +index 3ee685c..2ceee30 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2046,6 +2046,11 @@ +@@ -2058,6 +2058,11 @@ @@ -7794,7 +7794,7 @@ index e826418..8eb7dbb 100644 0 0 -@@ -2098,6 +2103,7 @@ +@@ -2110,6 +2115,7 @@ @@ -8018,10 +8018,10 @@ index 62003f5..8525ede 100644 1.8.5.1 -From b05344a5d380fb7c3c736a3ad4baafd414ce2ea6 Mon Sep 17 00:00:00 2001 +From dda5cfe8b536f9321d2c3bd2465d3376474775d6 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 62/93] X11: ignore mouse move event form other windows +Subject: [PATCH 62/89] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -8053,10 +8053,10 @@ index 908c8b6..938ad26 100644 1.8.5.1 -From 678136b35b085bd0626b293c4f5924842f7804e3 Mon Sep 17 00:00:00 2001 +From de394da778f766e2d9289dc6e20dd123da07a4a1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 63/93] renderer: allow some lateness within vblank interval +Subject: [PATCH 63/89] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -8116,10 +8116,10 @@ index 949c652b..d84ff6c 100644 1.8.5.1 -From c0e45440a7c06ce5c73f22f4e04f85fde0e2af91 Mon Sep 17 00:00:00 2001 +From dd9d62113d9e69752511d83149a92d13cb4eca4b Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 64/93] X11: another fix for mouse coverage +Subject: [PATCH 64/89] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -8152,10 +8152,10 @@ index 938ad26..e4ca56d 100644 1.8.5.1 -From e5d665f7aec884f2bb846881193a49b3d4c137ce Mon Sep 17 00:00:00 2001 +From 44d310093823adf9818e0c56f30cd208a702a6c7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 65/93] X11: set windows class name +Subject: [PATCH 65/89] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -8197,17 +8197,17 @@ index b3fe5102..df5fe9b 100644 1.8.5.1 -From b0ad523fb64e0dbf34071450051de592a2653bab Mon Sep 17 00:00:00 2001 +From e9ea4959e0ebc8f6959e99c27575bf04b087de8d Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 -Subject: [PATCH 66/93] fixed: typo +Subject: [PATCH 66/89] 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 f9d427d..dc60c27 100755 +index b83a8d2..a864a97 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6598,7 +6598,7 @@ msgstr "" @@ -8223,17 +8223,17 @@ index f9d427d..dc60c27 100755 1.8.5.1 -From 5a5649f4bcbe1d5b7ede8ddba40b616e131d40a7 Mon Sep 17 00:00:00 2001 +From 5e5232700048e1311fbdfac2d8d5a55a95039a71 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 -Subject: [PATCH 67/93] ActiveAE: slightly reduce buffer size +Subject: [PATCH 67/89] 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 c977c37..3928dac 100644 +index abf1509..f25ab49 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ @@ -8251,10 +8251,10 @@ index c977c37..3928dac 100644 1.8.5.1 -From 5b54e6fb133b2a7b0b2bed479e46163a0a367cce Mon Sep 17 00:00:00 2001 +From 2ad8b89ce9648ba531f0bb2bf2bb7fcc404ceaa2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 -Subject: [PATCH 68/93] Revert "vdpau: comment some features that will be added +Subject: [PATCH 68/89] Revert "vdpau: comment some features that will be added later" This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. @@ -8263,7 +8263,7 @@ This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 57bb704..55f17e5 100644 +index 3292461..c04f161 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -1084,8 +1084,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame) @@ -8276,7 +8276,7 @@ index 57bb704..55f17e5 100644 } int retval = 0; -@@ -2283,8 +2282,7 @@ void CMixer::InitCycle() +@@ -2278,8 +2277,7 @@ void CMixer::InitCycle() int flags; uint64_t latency; m_config.stats->GetParams(latency, flags); @@ -8286,9 +8286,9 @@ index 57bb704..55f17e5 100644 SetPostProcFeatures(false); else SetPostProcFeatures(true); -@@ -2295,8 +2293,7 @@ void CMixer::InitCycle() - EINTERLACEMETHOD method = GetDeinterlacingMethod(); +@@ -2291,8 +2289,7 @@ void CMixer::InitCycle() bool interlaced = m_mixerInput[1].DVDPic.iFlags & DVP_FLAG_INTERLACED; + m_SeenInterlaceFlag |= interlaced; - // TODO - if (//!(flags & DVP_FLAG_NO_POSTPROC) && @@ -8296,7 +8296,7 @@ index 57bb704..55f17e5 100644 (mode == VS_DEINTERLACEMODE_FORCE || (mode == VS_DEINTERLACEMODE_AUTO && interlaced))) { -@@ -2318,8 +2315,7 @@ void CMixer::InitCycle() +@@ -2314,8 +2311,7 @@ void CMixer::InitCycle() m_config.stats->SetCanSkipDeint(true); } @@ -8310,10 +8310,10 @@ index 57bb704..55f17e5 100644 1.8.5.1 -From 3b7b0dc5075e93c85ca37d3e4e9a789e907ad7c5 Mon Sep 17 00:00:00 2001 +From 5882daad3e2f87bcb3d0e1ea0490cb80b3c99153 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 -Subject: [PATCH 69/93] X11: fix keysyms +Subject: [PATCH 69/89] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8336,10 +8336,10 @@ index e4ca56d..b20130c 100644 1.8.5.1 -From eb23abb39807e6cb3a46ec1e901030296c6727de Mon Sep 17 00:00:00 2001 +From a80c14946d4cc5188b9b7178a43af01eaed93135 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 -Subject: [PATCH 70/93] X11: fix keysym for non-IM +Subject: [PATCH 70/89] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8362,10 +8362,10 @@ index b20130c..a38890c 100644 1.8.5.1 -From 758058f370b319e78a2a75a7d2f294bf1080c3c5 Mon Sep 17 00:00:00 2001 +From b477141fe4ffb62146da2d2d0ad60caa48a63463 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 -Subject: [PATCH 71/93] add some missing multi media keys +Subject: [PATCH 71/89] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -8420,10 +8420,10 @@ index ee6bb69..364b45a 100644 1.8.5.1 -From e70fa76c0a10aa58b820a7f9befb9fbee525413e Mon Sep 17 00:00:00 2001 +From 8662a0f91ea837bfdcd8378eb2ac52167527fefe Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 -Subject: [PATCH 72/93] X11: squash multi +Subject: [PATCH 72/89] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8446,10 +8446,10 @@ index df5fe9b..d8e04d6 100644 1.8.5.1 -From ab48d6046e1f19a3a63982e0cb305ab636934492 Mon Sep 17 00:00:00 2001 +From 4528f971394c03d8b039e34f41aaa29a7a3e1471 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 -Subject: [PATCH 73/93] X11: do not poll default monitor +Subject: [PATCH 73/89] X11: do not poll default monitor --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8472,10 +8472,10 @@ index d8e04d6..01f5272 100644 1.8.5.1 -From 45c2269a1401260a06bb80e979f25d5287f45bda Mon Sep 17 00:00:00 2001 +From d9146a163aed863187716ed216e40d86e5c8fc5e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:28 +0100 -Subject: [PATCH 74/93] X11: fix broken monitor switching +Subject: [PATCH 74/89] X11: fix broken monitor switching --- system/settings/settings.xml | 1 - @@ -8483,10 +8483,10 @@ Subject: [PATCH 74/93] 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 8eb7dbb..421ffaf 100644 +index 2ceee30..9a2c3d6 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2090,7 +2090,6 @@ +@@ -2102,7 +2102,6 @@ -1 @@ -8578,10 +8578,10 @@ index 40bc3b3..1663836 100644 1.8.5.1 -From 49ae2e2a01c38fd1848dfac82ab6c3a32c288fd7 Mon Sep 17 00:00:00 2001 +From 956e57dbf2eddb37d57a9a995895b33aefd1ad49 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:59 +0100 -Subject: [PATCH 75/93] X11: remove polling for connected outputs, use xrr +Subject: [PATCH 75/89] X11: remove polling for connected outputs, use xrr events --- @@ -8882,10 +8882,10 @@ index 7ec5be4..14622cb 100644 1.8.5.1 -From 2bc5cf4bc401dd3b4950f98cfbfe6976050363c3 Mon Sep 17 00:00:00 2001 +From 04d899ac67d05b44862e29654ed9b22c2b0624bb Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 09:37:13 +0100 -Subject: [PATCH 76/93] X11: remove grabbing of keyboard and mouse +Subject: [PATCH 76/89] X11: remove grabbing of keyboard and mouse --- xbmc/windowing/WinEventsX11.cpp | 4 ---- @@ -9003,10 +9003,10 @@ index 14622cb..d1c8729 100644 1.8.5.1 -From a5d07207c4a24f8a735b0a6c2090ddbd4a013419 Mon Sep 17 00:00:00 2001 +From 9d0bb8ef1be8d8c2ec7cf04b0ec7c54b1b4bc30e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 10:46:40 +0100 -Subject: [PATCH 77/93] X11: set ExposureMask on gl window, fixes not updated +Subject: [PATCH 77/89] X11: set ExposureMask on gl window, fixes not updated areas --- @@ -9032,10 +9032,10 @@ index 695b352..e55583c 100644 1.8.5.1 -From 5e6029041ca941d58ab5f520a244941953eb3c99 Mon Sep 17 00:00:00 2001 +From 940c850d57c04d27b3525bcb5da285c1464d7842 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 11:25:19 +0100 -Subject: [PATCH 78/93] X11: drop shortcuts, have WM do this +Subject: [PATCH 78/89] X11: drop shortcuts, have WM do this --- xbmc/windowing/WinEventsX11.cpp | 21 --------------------- @@ -9097,20 +9097,20 @@ index 6429291..4334d21 100644 1.8.5.1 -From d2e99670e8cb7ff6507bcf99d9b562fa46c226a1 Mon Sep 17 00:00:00 2001 +From 98a8ec1aa65aebdc143e8d9e5e088943ac783f65 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 7 Nov 2013 15:02:00 +0100 -Subject: [PATCH 79/93] X11: adapt to new settings +Subject: [PATCH 79/89] 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 421ffaf..5411582 100644 +index 9a2c3d6..cf29088 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2050,6 +2050,7 @@ +@@ -2062,6 +2062,7 @@ HAS_GLX 0 false @@ -9122,207 +9122,10 @@ index 421ffaf..5411582 100644 1.8.5.1 -From d6c685cc3effc5d9255482ff8b924b81bd490fc3 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sat, 9 Nov 2013 12:20:05 +0100 -Subject: [PATCH 80/93] vdpau: move cropping of top and bottom lines to - renderer - ---- - xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 33 +++++++++-------- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 49 ++++++++------------------ - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 2 +- - 3 files changed, 34 insertions(+), 50 deletions(-) - -diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -index aa52f72..801ecb2 100644 ---- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -@@ -1536,7 +1536,6 @@ void CLinuxRendererGL::RenderVDPAU(int index, int field) - - // make sure we know the correct texture size - GetPlaneTextureSize(plane); -- CalculateTextureSourceRects(index, 1); - - // Try some clamping or wrapping - glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); -@@ -1583,10 +1582,10 @@ void CLinuxRendererGL::RenderVDPAU(int index, int field) - } - else - { -- glTexCoord2f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[0].y); glVertex4f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[0].y, 0.0f, 0.0f); -- glTexCoord2f(m_rotatedDestCoords[1].x, m_rotatedDestCoords[1].y); glVertex4f(m_rotatedDestCoords[1].x, m_rotatedDestCoords[1].y, 1.0f, 0.0f); -- glTexCoord2f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[2].y); glVertex4f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[2].y, 1.0f, 1.0f); -- glTexCoord2f(m_rotatedDestCoords[3].x, m_rotatedDestCoords[3].y); glVertex4f(m_rotatedDestCoords[3].x, m_rotatedDestCoords[3].y, 0.0f, 1.0f); -+ glTexCoord2f(plane.rect.x1, plane.rect.y1); glVertex4f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[0].y, 0.0f, 0.0f); -+ glTexCoord2f(plane.rect.x2, plane.rect.y1); glVertex4f(m_rotatedDestCoords[1].x, m_rotatedDestCoords[1].y, 1.0f, 0.0f); -+ glTexCoord2f(plane.rect.x2, plane.rect.y2); glVertex4f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[2].y, 1.0f, 1.0f); -+ glTexCoord2f(plane.rect.x1, plane.rect.y2); glVertex4f(m_rotatedDestCoords[3].x, m_rotatedDestCoords[3].y, 0.0f, 1.0f); - } - glEnd(); - VerifyGLState(); -@@ -2407,23 +2406,27 @@ bool CLinuxRendererGL::UploadVDPAUTexture(int index) - - plane.id = vdpau->texture[0]; - -+ // in stereoscopic mode sourceRect may only -+ // be a part of the source video surface - plane.rect = m_sourceRect; -- plane.width = im.width; -- plane.height = im.height; - -- plane.height /= plane.pixpertex_y; -- plane.rect.y1 /= plane.pixpertex_y; -- plane.rect.y2 /= plane.pixpertex_y; -- plane.width /= plane.pixpertex_x; -- plane.rect.x1 /= plane.pixpertex_x; -- plane.rect.x2 /= plane.pixpertex_x; -+ // clip rect -+ if (vdpau->crop.x1 > plane.rect.x1) -+ plane.rect.x1 = vdpau->crop.x1; -+ if (vdpau->crop.x2 < plane.rect.x2) -+ plane.rect.x2 = vdpau->crop.x2; -+ if (vdpau->crop.y1 > plane.rect.y1) -+ plane.rect.y1 = vdpau->crop.y1; -+ if (vdpau->crop.y2 < plane.rect.y2) -+ plane.rect.y2 = vdpau->crop.y2; -+ -+ plane.texheight = vdpau->texHeight; -+ plane.texwidth = vdpau->texWidth; - - if (m_textureTarget == GL_TEXTURE_2D) - { -- plane.height /= plane.texheight; - plane.rect.y1 /= plane.texheight; - plane.rect.y2 /= plane.texheight; -- plane.width /= plane.texwidth; - plane.rect.x1 /= plane.texwidth; - plane.rect.x2 /= plane.texwidth; - } -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 55f17e5..b8dfa2c 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -1681,11 +1681,6 @@ void CMixer::CreateVdpauMixer() - &m_videoMixer); - CheckStatus(vdp_st, __LINE__); - -- // create 3 pitches of black lines needed for clipping top -- // and bottom lines when de-interlacing -- m_BlackBar = new uint32_t[3*m_config.outWidth]; -- memset(m_BlackBar, 0, 3*m_config.outWidth*sizeof(uint32_t)); -- - } - - void CMixer::InitCSCMatrix(int Width) -@@ -2222,6 +2217,8 @@ void CMixer::Init() - m_Sharpness = 0.0; - m_DeintMode = 0; - m_Deint = 0; -+ m_Upscale = 0; -+ m_SeenInterlaceFlag = false; - m_ColorMatrix = 0; - m_PostProc = false; - m_vdpError = false; -@@ -2240,8 +2237,6 @@ void CMixer::Uninit() - m_outputSurfaces.pop(); - } - m_config.context->GetProcs().vdp_video_mixer_destroy(m_videoMixer); -- -- delete [] m_BlackBar; - } - - void CMixer::Flush() -@@ -2292,6 +2287,7 @@ void CMixer::InitCycle() - EDEINTERLACEMODE mode = CMediaSettings::Get().GetCurrentVideoSettings().m_DeinterlaceMode; - EINTERLACEMETHOD method = GetDeinterlacingMethod(); - bool interlaced = m_mixerInput[1].DVDPic.iFlags & DVP_FLAG_INTERLACED; -+ m_SeenInterlaceFlag |= interlaced; - - if (!(flags & DVP_FLAG_NO_POSTPROC) && - (mode == VS_DEINTERLACEMODE_FORCE || -@@ -2373,6 +2369,12 @@ void CMixer::InitCycle() - m_processPicture.outputSurface = m_outputSurfaces.front(); - m_mixerInput[1].DVDPic.iWidth = m_config.outWidth; - m_mixerInput[1].DVDPic.iHeight = m_config.outHeight; -+ if (m_SeenInterlaceFlag) -+ { -+ double ratio = (double)m_mixerInput[1].DVDPic.iDisplayHeight / m_mixerInput[1].DVDPic.iHeight; -+ m_mixerInput[1].DVDPic.iHeight -= 6; -+ m_mixerInput[1].DVDPic.iDisplayHeight = lrint(ratio*m_mixerInput[1].DVDPic.iHeight) & ~1; -+ } - } - else - { -@@ -2507,32 +2509,6 @@ void CMixer::ProcessPicture() - 0, - NULL); - CheckStatus(vdp_st, __LINE__); -- -- if (m_mixerfield != VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME) -- { -- // in order to clip top and bottom lines when de-interlacing -- // we black those lines as a work around for not working -- // background colour using the mixer -- // pixel perfect is preferred over overscanning or zooming -- -- VdpRect clipRect = destRect; -- clipRect.y1 = clipRect.y0 + 2; -- uint32_t *data[] = {m_BlackBar}; -- uint32_t pitches[] = {destRect.x1}; -- vdp_st = m_config.context->GetProcs().vdp_output_surface_put_bits_native(m_processPicture.outputSurface, -- (void**)data, -- pitches, -- &clipRect); -- CheckStatus(vdp_st, __LINE__); -- -- clipRect = destRect; -- clipRect.y0 = clipRect.y1 - 2; -- vdp_st = m_config.context->GetProcs().vdp_output_surface_put_bits_native(m_processPicture.outputSurface, -- (void**)data, -- pitches, -- &clipRect); -- CheckStatus(vdp_st, __LINE__); -- } - } - - -@@ -3063,7 +3039,12 @@ CVdpauRenderPicture* COutput::ProcessMixerPicture() - GLMapSurfaces(); - retPic->sourceIdx = procPic.outputSurface; - retPic->texture[0] = m_bufferPool.glOutputSurfaceMap[procPic.outputSurface].texture[0]; -- retPic->crop = CRect(0,0,0,0); -+ retPic->texWidth = m_config.outWidth; -+ retPic->texHeight = m_config.outHeight; -+ retPic->crop.x1 = 0; -+ retPic->crop.y1 = (m_config.outHeight - retPic->DVDPic.iHeight) / 2; -+ retPic->crop.x2 = m_config.outWidth; -+ retPic->crop.y2 = m_config.outHeight - retPic->crop.y1; - } - else - { -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -index abe8da2..2dd3c28 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -@@ -330,8 +330,8 @@ class CMixer : private CThread - int m_DeintMode; - int m_Deint; - int m_Upscale; -+ bool m_SeenInterlaceFlag; - unsigned int m_ColorMatrix : 4; -- uint32_t *m_BlackBar; - VdpVideoMixerPictureStructure m_mixerfield; - int m_mixerstep; - int m_mixersteps; --- -1.8.5.1 - - -From f4c990f0d4773c8c78ade7f02376e5554328bfe5 Mon Sep 17 00:00:00 2001 +From 405528ada3f72a86d4750cdde7368c226def9280 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 09:28:24 +0100 -Subject: [PATCH 81/93] X11: adapt to changes in cstdstring +Subject: [PATCH 80/89] X11: adapt to changes in cstdstring --- xbmc/windowing/X11/WinSystemX11.cpp | 4 ++-- @@ -9370,10 +9173,10 @@ index 8525ede..c94f2e3 100644 1.8.5.1 -From e210a8565d7c8853bd3f8f0955cfd3816513fb49 Mon Sep 17 00:00:00 2001 +From f722c3ae5f935d5b10d7bc0f3b879df030a34943 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 18:50:57 +0100 -Subject: [PATCH 82/93] dvdplayer: fix failed to get stream message, lookup +Subject: [PATCH 81/89] dvdplayer: fix failed to get stream message, lookup streams the same way as getting the index --- @@ -9381,7 +9184,7 @@ Subject: [PATCH 82/93] 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 70ec003..8cb0aa7 100644 +index ad851e9..60475a3 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -110,7 +110,7 @@ void CSelectionStreams::Clear(StreamType type, StreamSource source) @@ -9397,17 +9200,17 @@ index 70ec003..8cb0aa7 100644 1.8.5.1 -From 5c081553d25d03ae59a0434bb628abd2438f1f01 Mon Sep 17 00:00:00 2001 +From 50b688685bae14dd692206233b6dfe7840044c92 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 19:22:01 +0100 -Subject: [PATCH 83/93] omxplayer: fix failed to get stream message +Subject: [PATCH 82/89] 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 7d13609..9e3bea5 100644 +index 4168195..f48a30f 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 @@ -9423,10 +9226,10 @@ index 7d13609..9e3bea5 100644 1.8.5.1 -From 3a7db678e0decf1ef6c8fb2b9afa64445c478c12 Mon Sep 17 00:00:00 2001 +From 176989d4c0d42bde8e403cc52372206ecdc277a1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 18 Nov 2013 17:44:31 +0100 -Subject: [PATCH 84/93] ActiveAE: correct time of buffered samples by resample +Subject: [PATCH 83/89] ActiveAE: correct time of buffered samples by resample ratio --- @@ -9435,7 +9238,7 @@ Subject: [PATCH 84/93] 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 3928dac..ffc2f16 100644 +index f25ab49..9699858 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) @@ -9463,42 +9266,10 @@ index d5b01ea..9914e9e 100644 1.8.5.1 -From 32a3f63509ba72797dc89dfc3c29d031c88df4d5 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Wed, 4 Dec 2013 12:55:32 +0100 -Subject: [PATCH 85/93] ActiveAE: suspend sink during change of refresh rate - ---- - 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 ffc2f16..73d6597 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -2240,12 +2240,12 @@ void CActiveAE::SetSoundMode(const int mode) - - void CActiveAE::OnLostDevice() - { --// m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYLOST); -+ m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYLOST); - } - - void CActiveAE::OnResetDevice() - { --// m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYRESET); -+ m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYRESET); - } - - //----------------------------------------------------------------------------- --- -1.8.5.1 - - -From bb87afb6dfc78efc2c3797d4229d208d1e690804 Mon Sep 17 00:00:00 2001 +From b29203fd798ab3ebf2c602b6aaa6326adfb52989 Mon Sep 17 00:00:00 2001 From: Marcel Groothuis Date: Thu, 5 Dec 2013 22:02:50 +0100 -Subject: [PATCH 86/93] ffmpeg demuxer: faster channel change for PVR addons +Subject: [PATCH 84/89] ffmpeg demuxer: faster channel change for PVR addons without internal demuxing (such as MediaPortal, ArgusTV, MythTV, NextPVR) Credits: FernetMenta, Davilla, Popcornmix, Whaupt @@ -9859,10 +9630,10 @@ index ca689d0..f383563 100644 1.8.5.1 -From 3068eb8359c93ae7e9b2f9ccd733760100ff93b4 Mon Sep 17 00:00:00 2001 +From d54806452a6ba9fc5618c248ce3e0b673e9b0ae3 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 20:35:04 +0100 -Subject: [PATCH 87/93] ffmpeg demuxer: make sure we start mpegts video with an +Subject: [PATCH 85/89] ffmpeg demuxer: make sure we start mpegts video with an i-frame --- @@ -9946,10 +9717,10 @@ index acde9a8..9ec0877 100644 1.8.5.1 -From ff7af5a2c9b2b2cbcb2551fe1bf869499d52ba7d Mon Sep 17 00:00:00 2001 +From c9925e87c4fd45f4c58608ccbd662781960adb06 Mon Sep 17 00:00:00 2001 From: Wolfgang Haupt Date: Thu, 5 Dec 2013 22:11:57 +0100 -Subject: [PATCH 88/93] DVDFactoryDemuxer: skip streaminfo for udp tcp and +Subject: [PATCH 86/89] DVDFactoryDemuxer: skip streaminfo for udp tcp and pvr-channels --- @@ -10073,384 +9844,20 @@ index 146bf5c..e030b9d 100644 1.8.5.1 -From 50ee7c408f3cc85152ee5033b5477fa593c8c2bc Mon Sep 17 00:00:00 2001 -From: Sam Stenvall -Date: Thu, 5 Dec 2013 18:26:45 +0200 -Subject: [PATCH 89/93] fix EPG update job (broke in - 5aa9f75ac619a56445a03e1b1a3b68d384c03010) - ---- - xbmc/pvr/PVRManager.cpp | 6 +++--- - xbmc/pvr/PVRManager.h | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp -index 81d81c2..a20432f 100644 ---- a/xbmc/pvr/PVRManager.cpp -+++ b/xbmc/pvr/PVRManager.cpp -@@ -1389,10 +1389,10 @@ bool CPVRManager::IsJobPending(const char *strJobName) const - return bReturn; - } - --void CPVRManager::QueueJob(const char *strJobName, CJob *job, bool bIgnorePending /* = false */) -+void CPVRManager::QueueJob(const char *strJobName, CJob *job, bool bEnsureStarted /*= true*/) - { - CSingleLock lock(m_critSectionTriggers); -- if (!IsStarted() || (!bIgnorePending && IsJobPending(strJobName))) -+ if ((bEnsureStarted && !IsStarted()) || IsJobPending(strJobName)) - return; - - m_pendingUpdates.push_back(job); -@@ -1403,7 +1403,7 @@ void CPVRManager::QueueJob(const char *strJobName, CJob *job, bool bIgnorePendin - - void CPVRManager::TriggerEpgsCreate(void) - { -- QueueJob("pvr-create-epgs", new CPVREpgsCreateJob()); -+ QueueJob("pvr-create-epgs", new CPVREpgsCreateJob(), false); - } - - void CPVRManager::TriggerRecordingsUpdate(void) -diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h -index 7038410..7220f72 100644 ---- a/xbmc/pvr/PVRManager.h -+++ b/xbmc/pvr/PVRManager.h -@@ -632,14 +632,14 @@ - bool IsJobPending(const char *strJobName) const; - - /*! -- * @brief Adds the job to the list of pending jobs. If bIgnorePending is set -- * to true the job will be added even if there's an identical job already -- * queued -+ * @brief Adds the job to the list of pending jobs (unless an equal job is -+ * already pending) - * @param strJobName the name of the job -- * @param bIgnorePending whether to ignore previously queued identical jobs -+ * @param bEnsureStarted when set to false the job will be executed regardless -+ * of whether the PVR manager has started - * @param job the job - */ -- void QueueJob(const char *strJobName, CJob *job, bool bIgnorePending = false); -+ void QueueJob(const char *strJobName, CJob *job, bool bEnsureStarted = true); - - ManagerState GetState(void) const; - --- -1.8.5.1 - - -From 10aa52c8d75f928c980cc764bbc7a7b9127848bd Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Thu, 5 Dec 2013 13:38:56 +0100 -Subject: [PATCH 90/93] IPlayer: let player know on close if it will be - reopened - ---- - xbmc/ApplicationPlayer.cpp | 6 +++--- - xbmc/ApplicationPlayer.h | 2 +- - xbmc/cores/ExternalPlayer/ExternalPlayer.cpp | 2 +- - xbmc/cores/ExternalPlayer/ExternalPlayer.h | 2 +- - xbmc/cores/IPlayer.h | 2 +- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 +- - xbmc/cores/dvdplayer/DVDPlayer.h | 2 +- - xbmc/cores/omxplayer/OMXPlayer.cpp | 2 +- - xbmc/cores/omxplayer/OMXPlayer.h | 2 +- - xbmc/cores/paplayer/PAPlayer.cpp | 2 +- - xbmc/cores/paplayer/PAPlayer.h | 2 +- - xbmc/network/upnp/UPnPPlayer.cpp | 2 +- - xbmc/network/upnp/UPnPPlayer.h | 2 +- - 13 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/xbmc/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp -index 1dd8df6..83aa875 100644 ---- a/xbmc/ApplicationPlayer.cpp -+++ b/xbmc/ApplicationPlayer.cpp -@@ -49,13 +49,13 @@ void CApplicationPlayer::ClosePlayer() - } - } - --void CApplicationPlayer::CloseFile() -+void CApplicationPlayer::CloseFile(bool reopen) - { - boost::shared_ptr player = GetInternal(); - if (player) - { - ++m_iPlayerOPSeq; -- player->CloseFile(); -+ player->CloseFile(reopen); - } - } - -@@ -81,7 +81,7 @@ void CApplicationPlayer::ClosePlayerGapless(PLAYERCOREID newCore) - // but if we do not stop it, we can not distingush callbacks from previous - // item and current item, it will confused us then we can not make correct delay - // callback after the starting state. -- CloseFile(); -+ CloseFile(true); - } - } - -diff --git a/xbmc/ApplicationPlayer.h b/xbmc/ApplicationPlayer.h -index 212389f..21a0b7a 100644 ---- a/xbmc/ApplicationPlayer.h -+++ b/xbmc/ApplicationPlayer.h -@@ -60,7 +60,7 @@ class CApplicationPlayer - int m_iPlaySpeed; - - // player management -- void CloseFile(); -+ void CloseFile(bool reopen = false); - void ClosePlayer(); - void ClosePlayerGapless(PLAYERCOREID newCore); - void CreatePlayer(PLAYERCOREID newCore, IPlayerCallback& callback); -diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp -index 7b72a19..92a222e 100644 ---- a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp -+++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp -@@ -120,7 +120,7 @@ bool CExternalPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &opti - } - } - --bool CExternalPlayer::CloseFile() -+bool CExternalPlayer::CloseFile(bool reopen) - { - m_bAbortRequest = true; - -diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.h b/xbmc/cores/ExternalPlayer/ExternalPlayer.h -index 11a32a5..f30352b 100644 ---- a/xbmc/cores/ExternalPlayer/ExternalPlayer.h -+++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.h -@@ -36,7 +36,7 @@ class CExternalPlayer : public IPlayer, public CThread - virtual void RegisterAudioCallback(IAudioCallback* pCallback) {} - virtual void UnRegisterAudioCallback() {} - virtual bool OpenFile(const CFileItem& file, const CPlayerOptions &options); -- virtual bool CloseFile(); -+ virtual bool CloseFile(bool reopen = false); - virtual bool IsPlaying() const; - virtual void Pause(); - virtual bool IsPaused() const; -diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h -index 21345ae..62cd1be 100644 ---- a/xbmc/cores/IPlayer.h -+++ b/xbmc/cores/IPlayer.h -@@ -133,7 +133,7 @@ class IPlayer - virtual bool OpenFile(const CFileItem& file, const CPlayerOptions& options){ return false;} - virtual bool QueueNextFile(const CFileItem &file) { return false; } - virtual void OnNothingToQueueNotify() {} -- virtual bool CloseFile(){ return true;} -+ virtual bool CloseFile(bool reopen = false) = 0; - virtual bool IsPlaying() const { return false;} - virtual bool CanPause() { return true; }; - virtual void Pause() = 0; -diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 8cb0aa7..60475a3 100644 ---- a/xbmc/cores/dvdplayer/DVDPlayer.cpp -+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -590,7 +590,7 @@ bool CDVDPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options) - } - } - --bool CDVDPlayer::CloseFile() -+bool CDVDPlayer::CloseFile(bool reopen) - { - CLog::Log(LOGNOTICE, "CDVDPlayer::CloseFile()"); - -diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h -index 0ba2c0d..96f7fe5 100644 ---- a/xbmc/cores/dvdplayer/DVDPlayer.h -+++ b/xbmc/cores/dvdplayer/DVDPlayer.h -@@ -181,7 +181,7 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer - CDVDPlayer(IPlayerCallback& callback); - virtual ~CDVDPlayer(); - virtual bool OpenFile(const CFileItem& file, const CPlayerOptions &options); -- virtual bool CloseFile(); -+ virtual bool CloseFile(bool reopen = false); - virtual bool IsPlaying() const; - virtual void Pause(); - virtual bool IsPaused() const; -diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index 9e3bea5..f48a30f 100644 ---- a/xbmc/cores/omxplayer/OMXPlayer.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -636,7 +636,7 @@ bool COMXPlayer::OpenFile(const CFileItem &file, const CPlayerOptions &options) - } - } - --bool COMXPlayer::CloseFile() -+bool COMXPlayer::CloseFile(bool reopen) - { - CLog::Log(LOGDEBUG, "COMXPlayer::CloseFile"); - -diff --git a/xbmc/cores/omxplayer/OMXPlayer.h b/xbmc/cores/omxplayer/OMXPlayer.h -index 96eed11..f34764d 100644 ---- a/xbmc/cores/omxplayer/OMXPlayer.h -+++ b/xbmc/cores/omxplayer/OMXPlayer.h -@@ -177,7 +177,7 @@ class COMXPlayer : public IPlayer, public CThread, public IDVDPlayer - virtual ~COMXPlayer(); - - virtual bool OpenFile(const CFileItem &file, const CPlayerOptions &options); -- virtual bool CloseFile(); -+ virtual bool CloseFile(bool reopen = false); - virtual bool IsPlaying() const; - virtual void Pause(); - virtual bool IsPaused() const; -diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp -index 1785b73..13339f4 100644 ---- a/xbmc/cores/paplayer/PAPlayer.cpp -+++ b/xbmc/cores/paplayer/PAPlayer.cpp -@@ -509,7 +509,7 @@ inline bool PAPlayer::PrepareStream(StreamInfo *si) - return true; - } - --bool PAPlayer::CloseFile() -+bool PAPlayer::CloseFile(bool reopen) - { - if (!m_isPaused) - SoftStop(true, true); -diff --git a/xbmc/cores/paplayer/PAPlayer.h b/xbmc/cores/paplayer/PAPlayer.h -index 8321ce2..6ae110a 100644 ---- a/xbmc/cores/paplayer/PAPlayer.h -+++ b/xbmc/cores/paplayer/PAPlayer.h -@@ -46,7 +46,7 @@ class PAPlayer : public IPlayer, public CThread, public IJobCallback - virtual bool OpenFile(const CFileItem& file, const CPlayerOptions &options); - virtual bool QueueNextFile(const CFileItem &file); - virtual void OnNothingToQueueNotify(); -- virtual bool CloseFile(); -+ virtual bool CloseFile(bool reopen = false); - virtual bool IsPlaying() const; - virtual void Pause(); - virtual bool IsPaused() const; -diff --git a/xbmc/network/upnp/UPnPPlayer.cpp b/xbmc/network/upnp/UPnPPlayer.cpp -index b78f97b..a5712c4 100644 ---- a/xbmc/network/upnp/UPnPPlayer.cpp -+++ b/xbmc/network/upnp/UPnPPlayer.cpp -@@ -357,7 +357,7 @@ bool CUPnPPlayer::QueueNextFile(const CFileItem& file) - return false; - } - --bool CUPnPPlayer::CloseFile() -+bool CUPnPPlayer::CloseFile(bool reopen) - { - NPT_CHECK_POINTER_LABEL_SEVERE(m_delegate, failed); - NPT_CHECK_LABEL(m_control->Stop(m_delegate->m_device -diff --git a/xbmc/network/upnp/UPnPPlayer.h b/xbmc/network/upnp/UPnPPlayer.h -index 61e31ee..b8c721c 100644 ---- a/xbmc/network/upnp/UPnPPlayer.h -+++ b/xbmc/network/upnp/UPnPPlayer.h -@@ -37,7 +37,7 @@ class CUPnPPlayer - - virtual bool OpenFile(const CFileItem& file, const CPlayerOptions& options); - virtual bool QueueNextFile(const CFileItem &file); -- virtual bool CloseFile(); -+ virtual bool CloseFile(bool reopen = false); - virtual bool IsPlaying() const; - virtual void Pause(); - virtual bool IsPaused() const; --- -1.8.5.1 - - -From ee43944e1cd6231de3e02ba9111c77b8bebd30c8 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Thu, 5 Dec 2013 14:18:32 +0100 -Subject: [PATCH 91/93] paplayer: instruct AE to keep configuration when - skipping tracks - ---- - xbmc/cores/paplayer/PAPlayer.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp -index 13339f4..3c53a6d 100644 ---- a/xbmc/cores/paplayer/PAPlayer.cpp -+++ b/xbmc/cores/paplayer/PAPlayer.cpp -@@ -511,6 +511,9 @@ inline bool PAPlayer::PrepareStream(StreamInfo *si) - - bool PAPlayer::CloseFile(bool reopen) - { -+ if (reopen) -+ CAEFactory::KeepConfiguration(3000); -+ - if (!m_isPaused) - SoftStop(true, true); - CloseAllStreams(false); --- -1.8.5.1 - - -From e7b170c28b8febccd6e8a142105f565dd6bf50b0 Mon Sep 17 00:00:00 2001 +From 5b748ab133f7757081fa9b1dfcbd646f83f252ec Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 5 Dec 2013 14:19:10 +0100 -Subject: [PATCH 92/93] AE: add interface method KeepConfiguration +Subject: [PATCH 87/89] AE: add interface method KeepConfiguration --- - xbmc/cores/AudioEngine/AEFactory.cpp | 6 ++++++ - xbmc/cores/AudioEngine/AEFactory.h | 1 + - .../cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 21 +++++++++++++++++++-- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h | 3 +++ - xbmc/cores/AudioEngine/Interfaces/AE.h | 6 ++++++ - 5 files changed, 35 insertions(+), 2 deletions(-) + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/xbmc/cores/AudioEngine/AEFactory.cpp b/xbmc/cores/AudioEngine/AEFactory.cpp -index c03b439..e798e0f 100644 ---- a/xbmc/cores/AudioEngine/AEFactory.cpp -+++ b/xbmc/cores/AudioEngine/AEFactory.cpp -@@ -439,3 +439,9 @@ bool CAEFactory::IsSettingVisible(const std::string &condition, const std::strin - - return AE->IsSettingVisible(value); - } -+ -+void CAEFactory::KeepConfiguration(unsigned int millis) -+{ -+ if (AE) -+ AE->KeepConfiguration(millis); -+} -diff --git a/xbmc/cores/AudioEngine/AEFactory.h b/xbmc/cores/AudioEngine/AEFactory.h -index 745ddc1..cb5317e 100644 ---- a/xbmc/cores/AudioEngine/AEFactory.h -+++ b/xbmc/cores/AudioEngine/AEFactory.h -@@ -76,6 +76,7 @@ class CAEFactory - static void SettingOptionsAudioQualityLevelsFiller(const CSetting *setting, std::vector< std::pair > &list, int ¤t); - static void SettingOptionsAudioStreamsilenceFiller(const CSetting *setting, std::vector< std::pair > &list, int ¤t); - static bool IsSettingVisible(const std::string &condition, const std::string &value, const std::string &settingId); -+ static void KeepConfiguration(unsigned int millis); - - static void RegisterAudioCallback(IAudioCallback* pCallback); - static void UnregisterAudioCallback(); diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 73d6597..f77409d 100644 +index 9699858..706243c 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -231,6 +231,9 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg) - case CActiveAEControlProtocol::MUTE: - m_muted = *(bool*)msg->data; - return; -+ case CActiveAEControlProtocol::KEEPCONFIG: -+ m_extKeepConfig = *(unsigned int*)msg->data; -+ return; - default: - break; - } -@@ -540,7 +543,10 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg) - DiscardStream(stream); - if (m_streams.empty()) - { -- m_extDrainTimer.Set(m_stats.GetDelay() * 1000); -+ if (m_extKeepConfig) -+ m_extDrainTimer.Set(m_extKeepConfig); -+ else -+ m_extDrainTimer.Set(m_stats.GetDelay() * 1000); - m_extDrain = true; - } - m_extTimeout = 0; -@@ -719,6 +725,7 @@ void CActiveAE::Process() - m_bStateMachineSelfTrigger = false; - m_extDrain = false; - m_extDeferData = false; -+ m_extKeepConfig = 0; - - // start sink - m_sink.Start(); -@@ -851,9 +858,11 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt) +@@ -858,7 +858,7 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt) AEAudioFormat oldInternalFormat = m_internalFormat; inputFormat = GetInputFormat(desiredFmt); @@ -10458,175 +9865,67 @@ index 73d6597..f77409d 100644 + m_sinkRequestFormat = inputFormat; ApplySettingsToFormat(m_sinkRequestFormat, m_settings, (int*)&m_mode); -+ m_extKeepConfig = 0; -+ - std::string device = AE_IS_RAW(m_sinkRequestFormat.m_dataFormat) ? m_settings.passthoughdevice : m_settings.device; - std::string driver; - CAESinkFactory::ParseDevice(device, driver); -@@ -1269,6 +1278,7 @@ void CActiveAE::ChangeResamplers() + m_extKeepConfig = 0; +-- +1.8.5.1 + + +From 51b88de039ba9decbc47d2878763e22cea39b370 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Tue, 10 Dec 2013 13:48:55 +0100 +Subject: [PATCH 89/89] ActiveAE: suspend hdmi audio during change of refresh + rate + +--- + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +index 706243c..d325517 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +@@ -234,6 +234,8 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg) + case CActiveAEControlProtocol::KEEPCONFIG: + m_extKeepConfig = *(unsigned int*)msg->data; + return; ++ case CActiveAEControlProtocol::DISPLAYRESET: ++ return; + default: + break; + } +@@ -635,6 +637,17 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg) + break; + } + } ++ else if (port == NULL) // timeout ++ { ++ switch (signal) ++ { ++ case CActiveAEControlProtocol::TIMEOUT: ++ m_extTimeout = 1000; ++ return; ++ default: ++ break; ++ } ++ } + break; - void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &settings, int *mode) - { -+ int oldMode = m_mode; - if (mode) - *mode = MODE_PCM; - -@@ -1329,6 +1339,8 @@ void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &sett - - if (m_settings.config == AE_CONFIG_FIXED || (settings.stereoupmix && format.m_channelLayout.Count() <= 2)) - format.m_channelLayout = stdLayout; -+ else if (m_extKeepConfig && (settings.config == AE_CONFIG_AUTO) && (oldMode != MODE_RAW)) -+ format.m_channelLayout = m_internalFormat.m_channelLayout; - else - format.m_channelLayout.ResolveChannels(stdLayout); - } -@@ -2237,6 +2249,11 @@ void CActiveAE::SetSoundMode(const int mode) - m_controlPort.SendOutMessage(CActiveAEControlProtocol::SOUNDMODE, &soundmode, sizeof(int)); - } - -+void CActiveAE::KeepConfiguration(unsigned int millis) -+{ -+ unsigned int timeMs = millis; -+ m_controlPort.SendOutMessage(CActiveAEControlProtocol::KEEPCONFIG, &timeMs, sizeof(unsigned int)); -+} + case AE_TOP_CONFIGURED_IDLE: +@@ -2257,12 +2270,12 @@ void CActiveAE::KeepConfiguration(unsigned int millis) void CActiveAE::OnLostDevice() { -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -index 2955bb8..0e22a2e 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -@@ -86,6 +86,7 @@ class CActiveAEControlProtocol : public Protocol - GETSTATE, - DISPLAYLOST, - DISPLAYRESET, -+ KEEPCONFIG, - TIMEOUT, - }; - enum InSignal -@@ -219,6 +220,7 @@ class CActiveAE : public IAE, private CThread - virtual bool SupportsSilenceTimeout(); - virtual bool SupportsQualityLevel(enum AEQuality level); - virtual bool IsSettingVisible(const std::string &settingId); -+ virtual void KeepConfiguration(unsigned int millis); +-// m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYLOST); ++ m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYLOST); + } - virtual void RegisterAudioCallback(IAudioCallback* pCallback); - virtual void UnregisterAudioCallback(); -@@ -286,6 +288,7 @@ class CActiveAE : public IAE, private CThread - bool m_extError; - bool m_extDrain; - XbmcThreads::EndTime m_extDrainTimer; -+ unsigned int m_extKeepConfig; - bool m_extDeferData; - - enum -diff --git a/xbmc/cores/AudioEngine/Interfaces/AE.h b/xbmc/cores/AudioEngine/Interfaces/AE.h -index d2f895c..f91dc4c 100644 ---- a/xbmc/cores/AudioEngine/Interfaces/AE.h -+++ b/xbmc/cores/AudioEngine/Interfaces/AE.h -@@ -226,5 +226,11 @@ class IAE - * @return true if AudioEngine wants to display this setting - */ - virtual bool IsSettingVisible(const std::string &settingId) {return false; } -+ -+ /** -+ * Instruct AE to keep configuration for a specified time -+ * @param millis time for which old configuration should be kept -+ */ -+ virtual void KeepConfiguration(unsigned int millis) {return; } - }; + void CActiveAE::OnResetDevice() + { +-// m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYRESET); ++ m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYRESET); + } --- -1.8.5.1 - - -From a428468febfb169f5c0e54ce27b93d5b9ff2f884 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Mon, 9 Dec 2013 13:01:38 +0100 -Subject: [PATCH 93/93] LinuxRendererGL: make sure we have a shader defined - ---- - xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 +++++++++ - .../VideoShaders/VideoFilterShader.cpp | 22 ++++++++++++++++++++++ - .../VideoShaders/VideoFilterShader.h | 7 +++++++ - 3 files changed, 38 insertions(+) - -diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -index 801ecb2..0c1d6e2 100644 ---- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -@@ -830,6 +830,15 @@ void CLinuxRendererGL::UpdateVideoFilter() - break; - } - } -+ else -+ { -+ m_pVideoFilterShader = new DefaultFilterShader(); -+ if (!m_pVideoFilterShader->CompileAndLink()) -+ { -+ CLog::Log(LOGERROR, "GL: Error compiling and linking video filter shader"); -+ break; -+ } -+ } - return; - - case VS_SCALINGMETHOD_LANCZOS2: -diff --git a/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp b/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp -index 7dc5014..8c2c3e0 100644 ---- a/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp -+++ b/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp -@@ -65,6 +65,16 @@ - "gl_FrontColor = gl_Color;" - "}"; - VertexShader()->SetSource(shaderv); -+ -+ string shaderp = -+ "uniform sampler2D img;" -+ "varying vec2 cord;" -+ "void main()" -+ "{" -+ "gl_FragColor.rgb = texture2D(img, cord).rgb;" -+ "gl_FragColor.a = gl_Color.a;" -+ "}"; -+ PixelShader()->SetSource(shaderp); - } - - ConvolutionFilterShader::ConvolutionFilterShader(ESCALINGMETHOD method, bool stretch) -@@ -230,4 +240,16 @@ bool StretchFilterShader::OnEnabled() - return true; - } - -+void DefaultFilterShader::OnCompiledAndLinked() -+{ -+ m_hSourceTex = glGetUniformLocation(ProgramHandle(), "img"); -+} -+ -+bool DefaultFilterShader::OnEnabled() -+{ -+ glUniform1i(m_hSourceTex, m_sourceTexUnit); -+ VerifyGLState(); -+ return true; -+} -+ - #endif -diff --git a/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h b/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h -index 2473da7..a489865 100644 ---- a/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h -+++ b/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h -@@ -87,6 +87,13 @@ - bool OnEnabled(); - }; - -+ class DefaultFilterShader : public BaseVideoFilterShader -+ { -+ public: -+ void OnCompiledAndLinked(); -+ bool OnEnabled(); -+ }; -+ - } // end namespace - - #endif + //----------------------------------------------------------------------------- -- 1.8.5.1 diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.03-PR3794.patch b/packages/mediacenter/xbmc/patches/xbmc-999.03-PR3794.patch index ae45733fe0..20e6403177 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-999.03-PR3794.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-999.03-PR3794.patch @@ -1,25 +1,31 @@ -From 8553aa315efff535e51c4f91024a7e2f8a6ecb4a Mon Sep 17 00:00:00 2001 +From 29e44bb9f93767fd1235c33afa4877544f0f95b3 Mon Sep 17 00:00:00 2001 From: xhaggi Date: Mon, 9 Dec 2013 15:25:11 +0100 Subject: [PATCH] [pvr] observe PVRManager state to trigger epg create --- - xbmc/pvr/PVRManager.cpp | 3 +++ + xbmc/pvr/PVRManager.cpp | 9 +++++++-- xbmc/pvr/PVRManager.h | 3 ++- - xbmc/pvr/channels/PVRChannelGroupInternal.cpp | 16 +++++++++++++++- + xbmc/pvr/channels/PVRChannelGroupInternal.cpp | 12 +++++++++++- xbmc/pvr/channels/PVRChannelGroupInternal.h | 5 ++++- xbmc/utils/Observer.h | 1 + - 5 files changed, 25 insertions(+), 3 deletions(-) + 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp -index 81d81c2..6080507 100644 +index 81d81c2..d35df1c 100644 --- a/xbmc/pvr/PVRManager.cpp +++ b/xbmc/pvr/PVRManager.cpp -@@ -395,6 +395,9 @@ void CPVRManager::SetState(ManagerState state) +@@ -393,8 +393,13 @@ ManagerState CPVRManager::GetState(void) const + + void CPVRManager::SetState(ManagerState state) { - CSingleLock lock(m_managerStateMutex); - m_managerState = state; -+ SetChanged(); +- CSingleLock lock(m_managerStateMutex); +- m_managerState = state; ++ { ++ CSingleLock lock(m_managerStateMutex); ++ m_managerState = state; ++ SetChanged(); ++ } + + NotifyObservers(ObservableMessageManagerStateChanged); } @@ -47,31 +53,28 @@ index 7038410..5359c05 100644 friend class CPVRClients; diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp -index 0bb07d2..1d292c9 100644 +index 0bb07d2..ff06d48 100644 --- a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp +++ b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp -@@ -53,6 +53,8 @@ +@@ -53,6 +53,7 @@ CPVRChannelGroupInternal::~CPVRChannelGroupInternal(void) { Unload(); -+ if (Observer::IsObserving(g_PVRManager)) -+ g_PVRManager.UnregisterObserver(this); ++ g_PVRManager.UnregisterObserver(this); } bool CPVRChannelGroupInternal::Load(void) -@@ -60,7 +62,10 @@ bool CPVRChannelGroupInternal::Load(void) +@@ -60,7 +61,8 @@ bool CPVRChannelGroupInternal::Load(void) if (CPVRChannelGroup::Load()) { UpdateChannelPaths(); - g_PVRManager.TriggerEpgsCreate(); -+ -+ if (!Observer::IsObserving(g_PVRManager)) -+ g_PVRManager.RegisterObserver(this); -+ ++ g_PVRManager.RegisterObserver(this); ++ return true; } -@@ -385,3 +390,12 @@ bool CPVRChannelGroupInternal::CreateChannelEpgs(bool bForce /* = false */) +@@ -385,3 +387,11 @@ bool CPVRChannelGroupInternal::CreateChannelEpgs(bool bForce /* = false */) return true; } @@ -80,8 +83,7 @@ index 0bb07d2..1d292c9 100644 +{ + if (msg == ObservableMessageManagerStateChanged) + { -+ if(g_PVRManager.IsStarted()) -+ g_PVRManager.TriggerEpgsCreate(); ++ g_PVRManager.TriggerEpgsCreate(); + } +} diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.h b/xbmc/pvr/channels/PVRChannelGroupInternal.h