From 35b70e919ab19abbf122fea4fda038659ab03ddd Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Mar 2014 17:12:06 +0200 Subject: [PATCH] xbmc: update to xbmc-13-745067f --- .../xbmc-theme-Confluence/package.mk | 2 +- packages/mediacenter/xbmc/package.mk | 2 +- ...bmc-995.01-fernetmenta-fixes-b3b79dd.patch | 512 ++++++++++-------- .../xbmc/patches/xbmc-999.80.009-PR4296.patch | 100 ---- .../xbmc/patches/xbmc-999.80.010-PR4414.patch | 393 -------------- 5 files changed, 277 insertions(+), 732 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-999.80.009-PR4296.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-999.80.010-PR4414.patch diff --git a/packages/mediacenter/xbmc-theme-Confluence/package.mk b/packages/mediacenter/xbmc-theme-Confluence/package.mk index 81b8621db1..656ef0bbc5 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/package.mk +++ b/packages/mediacenter/xbmc-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="13-a1cab7a" +PKG_VERSION="13-745067f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index e914a86922..468d40f7f3 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13-a1cab7a" +PKG_VERSION="13-745067f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch index 66ebc8afce..903d71fd05 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch @@ -1,4 +1,4 @@ -From 320046ba60eca428368d9fe229670a61ea31ff80 Mon Sep 17 00:00:00 2001 +From 7723fcd5772f3a3c09f919e7d1de2c714faf3093 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 @@ -581,10 +581,10 @@ index f8ad541..186e271 100644 }; -- -1.9.0 +1.9.1 -From cbecaef2fb4c319c179c2283e82cead122f3bab5 Mon Sep 17 00:00:00 2001 +From fa61194e6ba18a6119d029a3213fb8e15fc143fe 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 @@ -652,10 +652,10 @@ index 186e271..59c7f09 100644 double GetOutputDelay(); /* returns the expected delay, from that a packet is put in queue */ -- -1.9.0 +1.9.1 -From 893b7955a20aeaf74b06b7de1c28e08ef05625dd Mon Sep 17 00:00:00 2001 +From 5b56599e539c54b4415bb716dd5d78dbf4742ed2 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 @@ -765,10 +765,10 @@ index 1d29b6f..ee07f30 100644 if (iDecoderPts == DVD_NOPTS_VALUE) iDecoderPts = pts; -- -1.9.0 +1.9.1 -From af8d9a25047777c7dd11797b07168a7e7f6fe1ce Mon Sep 17 00:00:00 2001 +From 7820511dd52809608b7d7750f4b11947099553ca 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 @@ -791,10 +791,10 @@ index dc2712a..9edfbd4 100644 class CSetting; -- -1.9.0 +1.9.1 -From 2c520fc1ace027ecbecd06eb60aebe607e04c538 Mon Sep 17 00:00:00 2001 +From 02f77bab4cf75a0c5dc66bc878f71906a05a878e 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 @@ -818,10 +818,10 @@ index ee07f30..b3175cd 100644 { m_codecname = m_pVideoCodec->GetName(); -- -1.9.0 +1.9.1 -From e4e8f007146ed6d84a10f56a8ec1c8f70643b050 Mon Sep 17 00:00:00 2001 +From 7aee5d0af676418fe87b9d095b9e456ec4fb9555 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 @@ -845,10 +845,10 @@ index b3175cd..9c36bdb 100644 //reset the stored framerates if no good framerate was detected m_fStableFrameRate = 0.0; -- -1.9.0 +1.9.1 -From f565af531ea544c02207993205a2c1f79e003a77 Mon Sep 17 00:00:00 2001 +From 3f83a7d093faee5c47cce4833a403cf1b436db1c 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 @@ -859,7 +859,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 b056c8b..0d2b4ae 100644 +index 3a37dee..15e490c 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1633,7 +1633,7 @@ void CDVDPlayer::HandlePlaySpeed() @@ -885,10 +885,10 @@ index b056c8b..0d2b4ae 100644 // audioplayer, stops outputing audio to audiorendere, but still tries to // sleep an correct amount for each packet -- -1.9.0 +1.9.1 -From c686480a53d7cdcf63a3000bf408ef4153e359a1 Mon Sep 17 00:00:00 2001 +From c6e23c635e80965a1fa21bf5d7c27c81a6747916 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 @@ -907,10 +907,10 @@ Subject: [PATCH 08/93] 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 265881f..43c4517 100644 +index 2f832b8..9f8eb4c 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -907,7 +907,7 @@ bool CApplication::CreateGUI() +@@ -917,7 +917,7 @@ bool CApplication::CreateGUI() uint32_t sdlFlags = 0; @@ -2425,10 +2425,10 @@ index b1464d0..34b912f 100644 CCriticalSection m_resourceSection; std::vector m_resources; -- -1.9.0 +1.9.1 -From 78d8cdb9dd83a7dfdbe77fa1bb137944200bed06 Mon Sep 17 00:00:00 2001 +From 9d4b61390e795f5efba8dd846096b1fb443e38bf 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 @@ -2618,10 +2618,10 @@ index 34b912f..352e90e 100644 CStopWatch m_screensaverReset; }; -- -1.9.0 +1.9.1 -From a5da9aa02e7fa7ee91d0c98ef20c57b3737670e0 Mon Sep 17 00:00:00 2001 +From f889afc409ec113d3d2860d833bc54fa360fe7e1 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 @@ -2675,10 +2675,10 @@ index ad58aad..6f57a87 100644 } -- -1.9.0 +1.9.1 -From 97fa84c30a5c726690f886ac596bfd80870d8d77 Mon Sep 17 00:00:00 2001 +From 671f822ef7e16663be644f002f35bca9414301dd 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 @@ -2741,10 +2741,10 @@ index 352e90e..3f91b9b 100644 protected: bool RefreshGlxContext(); -- -1.9.0 +1.9.1 -From 1d0601d1ec7d1ffcd14fd233d4f4769e862680bc Mon Sep 17 00:00:00 2001 +From 24b4308d16d3d091535820ec279d6a10f7af9a5c 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 @@ -2888,10 +2888,10 @@ index 304dac8..16b13aa 100644 void CWinSystemX11::Register(IDispResource *resource) -- -1.9.0 +1.9.1 -From 3181b919ca96f6837dde69a178ebb43112dff734 Mon Sep 17 00:00:00 2001 +From 972c3eebc1eb961e5a9dd0b4c56a3e2414fb7970 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 @@ -2970,10 +2970,10 @@ index 0aec487..00b49dc 100644 //bool Has1080p(); //bool Has720p(); -- -1.9.0 +1.9.1 -From 65e877e82067a917e683c5930b2dc3840693f3ea Mon Sep 17 00:00:00 2001 +From 364b4116a1172fa642a1856918d7bc0534919c3d 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 @@ -3188,10 +3188,10 @@ index 00b49dc..508604d 100644 class CXRandR -- -1.9.0 +1.9.1 -From 6c652b01707baa034c3dacd7e2a6c1a38385f514 Mon Sep 17 00:00:00 2001 +From d4cb76c3c9182cf9db7803ab4502fbfe3293feb4 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 @@ -3366,10 +3366,10 @@ index 508604d..d37838a 100644 extern CXRandR g_xrandr; -- -1.9.0 +1.9.1 -From fec4134865c2071f80276d020f900307f45d8057 Mon Sep 17 00:00:00 2001 +From 434ef3291a3e251b65647669bb77a8b44cbfc58b 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 @@ -3387,7 +3387,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 6b1070d..d9b34e1 100755 +index 616a321..685847c 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1021,7 +1021,9 @@ msgctxt "#245" @@ -3402,7 +3402,7 @@ index 6b1070d..d9b34e1 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index c6b03b9..4882978 100644 +index 5c88d33..e0c2aa3 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2250,6 +2250,15 @@ @@ -3556,7 +3556,7 @@ index 8ee1be2..bead24b 100644 protected: CDisplaySettings(); diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 892a139..1037ddb 100644 +index 606edf8..c68a305 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -406,6 +406,7 @@ void CSettings::Uninitialize() @@ -4128,10 +4128,10 @@ index 4175aab..94584ab 100644 private: bool IsSuitableVisual(XVisualInfo *vInfo); -- -1.9.0 +1.9.1 -From bf5648cf0df4279b2135f65d39542258de32a307 Mon Sep 17 00:00:00 2001 +From 403ca4aa2bf0000d986a362f1df2745778a4c699 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 @@ -4199,10 +4199,10 @@ index 6383754..21e7dc5 100644 CLog::Log(LOGDEBUG, "GLX_EXTENSIONS:%s", m_glxext.c_str()); -- -1.9.0 +1.9.1 -From 140a3ba6605aaba862ee004e78ff96aa84e0b8d9 Mon Sep 17 00:00:00 2001 +From c086040a17b14c8224e64885275976461ee01c0c 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 @@ -4274,10 +4274,10 @@ index 0b3950a..ca43b5a 100644 XRRFreeScreenConfigInfo(CurrInfo); -- -1.9.0 +1.9.1 -From bccf49bf686d33cf16db5f99e013a71e2c3a2373 Mon Sep 17 00:00:00 2001 +From d5bea7f0138c5721330a1f40c92a840f072df377 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 @@ -4428,10 +4428,10 @@ index 21e7dc5..8e68d5d 100644 } -- -1.9.0 +1.9.1 -From 639f0284a947daac02be7bf2e727226f3f2c1526 Mon Sep 17 00:00:00 2001 +From 72ac24a949ff4ea91b41fc76ea8c6f7eeb9ff243 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 @@ -4636,10 +4636,10 @@ index dd65a1b..afd71fc 100644 bool m_UseNvSettings; bool m_bIsATI; -- -1.9.0 +1.9.1 -From f6ca378b58cabe46334742050fe263a98ac64f94 Mon Sep 17 00:00:00 2001 +From 05516bcfb4271f648d99e3bb95f9e17cb73b3172 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 @@ -4731,10 +4731,10 @@ index 9666cc3..5b52d6c 100644 // Local to WinSystemX11 only Display* GetDisplay() { return m_dpy; } -- -1.9.0 +1.9.1 -From c329e543adfd4989b6e53f936200f552ab90a369 Mon Sep 17 00:00:00 2001 +From 22407a8d4a8c70c84d37634523f8cbaef3b81b21 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 @@ -4804,10 +4804,10 @@ index 5b52d6c..b2bd5a0 100644 virtual void NotifyAppActiveChange(bool bActivated); virtual void NotifyAppFocusChange(bool bGaining); -- -1.9.0 +1.9.1 -From d157d02acb752b074e9691f5b75bd55363dc5528 Mon Sep 17 00:00:00 2001 +From 2252c8ca728527bb194b23ad47dc696bff300a1a 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 @@ -4851,10 +4851,10 @@ index b76b229..869baa8 100644 Pixmap bitmapNoData; XColor black; -- -1.9.0 +1.9.1 -From 237a8d20a027e2fd3dfeb145aca32bff0525903a Mon Sep 17 00:00:00 2001 +From becaaaf4b9d9171e1b04be976af220297916be52 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 @@ -4886,10 +4886,10 @@ index d98f12f..743aca9 100644 serial = xevent.xfocus.serial; break; -- -1.9.0 +1.9.1 -From d86f85ddac13b7d104add8cac02c362f7a4fab28 Mon Sep 17 00:00:00 2001 +From 6627fa5c85224c8a690ca5e271fefeff9dfad690 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 @@ -5106,10 +5106,10 @@ index a412f32..9a8a912 100644 XIC m_xic; XBMC_Event m_lastKey; -- -1.9.0 +1.9.1 -From 196db63b99d44b058a6b1fdd80798afbaab4435f Mon Sep 17 00:00:00 2001 +From 43d0ee453a76d36f70704499a6390fcea944e431 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 @@ -5173,10 +5173,10 @@ index 9a8a912..c69169c 100644 XIC m_xic; XBMC_Event m_lastKey; -- -1.9.0 +1.9.1 -From 3ccc149a56b520df7a8933b889273296ba875090 Mon Sep 17 00:00:00 2001 +From 66eb5fbe084178d3a98c1a487fb12edf51d06864 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 @@ -5199,10 +5199,10 @@ index d57f4d3..b807897 100644 // Function keys , { XBMCK_F1, 0, 0, XBMCVK_F1, "f1"} -- -1.9.0 +1.9.1 -From 2b820efe0e7850414b31495b9569e6dac6e90a28 Mon Sep 17 00:00:00 2001 +From 546c3bdb52ad71042452510e3800fe2f0321a368 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 @@ -5225,10 +5225,10 @@ index 0ddf102..3ae7107 100644 #endif } -- -1.9.0 +1.9.1 -From cd2f165acc58eaa519b48cdb53a6b5a4a8120be0 Mon Sep 17 00:00:00 2001 +From 0b47cc5e7d5d3979cf939fefe7b70e75489f25b9 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 @@ -5259,10 +5259,10 @@ index 3ae7107..27bebde 100644 CLog::Log(LOGDEBUG, "CVideoReferenceClock: Detected refreshrate: %i hertz", (int)m_RefreshRate); -- -1.9.0 +1.9.1 -From 603317efd971a1f90d15ebb5c8bc381912b710e2 Mon Sep 17 00:00:00 2001 +From 3f07454176a8d7647f0b45e9865a1d0f7a98f512 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 @@ -5370,10 +5370,10 @@ index 869baa8..bfe3797 100644 } -- -1.9.0 +1.9.1 -From 14680a3fd13af0a41b43899fdf3a2da65abad5f4 Mon Sep 17 00:00:00 2001 +From 8408b7f8027bc5b418bc489662ab11d8dc295cd9 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 @@ -5494,10 +5494,10 @@ index b2bd5a0..3e62cd8 100644 CStopWatch m_screensaverReset; }; -- -1.9.0 +1.9.1 -From 0665385b9d92a49c75403273444d898589ec4185 Mon Sep 17 00:00:00 2001 +From ad9f8e4d37fbad9158a2b0c8524c8dbc1b68ff8f 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 @@ -5534,10 +5534,10 @@ index af82061..4f33c68 100644 CStdString currentOutput = CSettings::Get().GetString("videoscreen.monitor"); -- -1.9.0 +1.9.1 -From 2d78ed515c437b4dd082d585f2d06778bcb5cb03 Mon Sep 17 00:00:00 2001 +From 73b88f9d499b97dee1f9f100bc88f64e40e5b36c 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 @@ -5561,10 +5561,10 @@ index 4f33c68..bc4e963 100644 #endif -- -1.9.0 +1.9.1 -From 8e45aca353568d3b1119aaae29d63ce10f76ca70 Mon Sep 17 00:00:00 2001 +From e33944677313c3050f55198e65ae23d40c7bc7b9 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 @@ -5587,10 +5587,10 @@ index bc4e963..57a8d20 100644 { CLog::Log(LOGERROR, "WinSystemX11::RefreshWindow - failed to query xrandr"); -- -1.9.0 +1.9.1 -From 7cecb116072ee9dd7893f3eef06a11c2c4811294 Mon Sep 17 00:00:00 2001 +From 93ad9274c24fb8588609f4a9ba684978a99588c9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 Subject: [PATCH 35/93] dvdplayer: observe pts counter overflow @@ -5601,7 +5601,7 @@ Subject: [PATCH 35/93] dvdplayer: observe pts counter overflow 2 files changed, 200 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 1146c6f..16efae0 100644 +index 4ce1b87..afa3024 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -18,7 +18,6 @@ @@ -5668,7 +5668,7 @@ index 1146c6f..16efae0 100644 // copy contents into our own packet pPacket->iSize = m_pkt.pkt.size; -@@ -905,7 +932,16 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) +@@ -906,7 +933,16 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) ret = m_dllAvFormat.av_seek_frame(m_pFormatContext, -1, seek_pts, backwords ? AVSEEK_FLAG_BACKWARD : 0); if(ret >= 0) @@ -5685,7 +5685,7 @@ index 1146c6f..16efae0 100644 } if(m_iCurrentPts == DVD_NOPTS_VALUE) -@@ -924,6 +960,165 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) +@@ -925,6 +961,165 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) return (ret >= 0); } @@ -5873,10 +5873,10 @@ index aef5ab1..35abbdf 100644 }; -- -1.9.0 +1.9.1 -From a2b098917cab5f9db00c69177792c373547f2bb8 Mon Sep 17 00:00:00 2001 +From 6dba5fe4e923014c9202bb26c18aaa8e1a0b2e53 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 Subject: [PATCH 36/93] dvdplayer: avoid short screen flicker caused by @@ -5909,10 +5909,10 @@ index 9c36bdb..322a581 100644 || ( m_output.extended_format != pPicture->extended_format ) || ( m_output.color_matrix != pPicture->color_matrix && pPicture->color_matrix != 0 ) // don't reconfigure on unspecified -- -1.9.0 +1.9.1 -From a67d385916ef70447e5167ca352f9f53de7e2778 Mon Sep 17 00:00:00 2001 +From 4d02ea847afcf49d2e91e465fe91607b732c0448 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 Subject: [PATCH 37/93] vdpau: advanced settings for auto deinterlacing @@ -5978,10 +5978,10 @@ index 3995f35..c43351d 100644 bool m_videoVDPAUdeintSkipChromaHD; bool m_musicUseTimeSeeking; -- -1.9.0 +1.9.1 -From 56a0e9d6cb08dcecbfdea964b99996c59ebd0c91 Mon Sep 17 00:00:00 2001 +From b4276578cc719eb2cbdb548cba463583f806046e Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 Subject: [PATCH 38/93] player: fix rewind @@ -6032,7 +6032,7 @@ index 2ea8b8f..e8274f9 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 0d2b4ae..a4c0422 100644 +index 15e490c..2474b39 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1634,11 +1634,13 @@ void CDVDPlayer::HandlePlaySpeed() @@ -6090,7 +6090,7 @@ index 0d2b4ae..a4c0422 100644 } // if playspeed is different then DVD_PLAYSPEED_NORMAL or DVD_PLAYSPEED_PAUSE -@@ -3293,7 +3297,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) +@@ -3294,7 +3298,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) return true; } @@ -6099,7 +6099,7 @@ index 0d2b4ae..a4c0422 100644 { double startpts; if(accurate) -@@ -3305,19 +3309,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3306,19 +3310,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) if(startpts != DVD_NOPTS_VALUE) startpts -= m_offset_pts; @@ -6127,7 +6127,7 @@ index 0d2b4ae..a4c0422 100644 m_CurrentTeletext.dts = DVD_NOPTS_VALUE; m_CurrentTeletext.startpts = startpts; -@@ -3361,7 +3369,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3362,7 +3370,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) m_CurrentTeletext.started = false; } @@ -6196,10 +6196,10 @@ index 59c7f09..65dea76 100644 unsigned int m_dropRequests; }; -- -1.9.0 +1.9.1 -From b209430c56ad955fb164c88cf4696a5ab1f162db Mon Sep 17 00:00:00 2001 +From 14df405da4e19970b4b10ccb8910bd4648088a1b Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 Subject: [PATCH 39/93] xrandr: fix query for multiple screens @@ -6240,10 +6240,10 @@ index 4685413..e610150 100644 FILE* file = popen(cmd.c_str(),"r"); if (!file) -- -1.9.0 +1.9.1 -From 8d42739f0833403d688d7da9676d098ad3be45c6 Mon Sep 17 00:00:00 2001 +From 57fc43e3ae6f1508a508d603d58ed8b41fac8a79 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 Subject: [PATCH 40/93] X11: add debug log to print out refresh after xrr event @@ -6270,10 +6270,10 @@ index 57a8d20..a237dc0 100644 unsigned int i; bool found(false); -- -1.9.0 +1.9.1 -From ef3118362dcf019e927700e59f0cc4e7a0d506b1 Mon Sep 17 00:00:00 2001 +From a07d6a32bfa469ef7617d8920a28d3acbe78fe5f Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 Subject: [PATCH 41/93] X11: dont call XCloseDisplay on shutdown, it crashes @@ -6298,10 +6298,10 @@ index a237dc0..ab660b1 100644 // m_SDLSurface is free()'d by SDL_Quit(). -- -1.9.0 +1.9.1 -From da4c24ede3be3b5c074c44123e83e9059c25688d Mon Sep 17 00:00:00 2001 +From 06a6a8eb21832554984f1b99ab250a88f5d65527 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 42/93] x11: support for multiple x screens @@ -6324,10 +6324,10 @@ index e610150..5c53574 100644 // TODO ERROR return false; -- -1.9.0 +1.9.1 -From c7215a8c352ad44a928a9d18f89ebf52c8dcf9fc Mon Sep 17 00:00:00 2001 +From 857f12d96909459f4562e65574e501a0cbf5f075 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 Subject: [PATCH 43/93] pvr: increase changes counter of stream on stream @@ -6338,7 +6338,7 @@ Subject: [PATCH 43/93] pvr: increase changes counter of stream on stream 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp -index e5f8234..96c9e89 100644 +index 7d0a732..d066610 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp @@ -339,9 +339,7 @@ void CDVDDemuxPVRClient::RequestStreams() @@ -6361,10 +6361,10 @@ index e5f8234..96c9e89 100644 else if (props.stream[i].iCodecType == XBMC_CODEC_TYPE_VIDEO) { -- -1.9.0 +1.9.1 -From 26da0298234aeea96c4df4d3317589abb822cf1b Mon Sep 17 00:00:00 2001 +From 33bbf3042c14c37e5803a7b5b0f1e3e1df9a3abf Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 Subject: [PATCH 44/93] X11: add keymapping for XF86XK_Sleep @@ -6386,10 +6386,10 @@ index a62521f..263cb5a 100644 , {XK_Undo, XBMCK_UNDO} /* Media keys */ -- -1.9.0 +1.9.1 -From b0d730552ceac8e144436e96e9a88fe28e565ef6 Mon Sep 17 00:00:00 2001 +From 61c3e9bfd568817f23cc76bbde79f18b6d5d720c Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 Subject: [PATCH 45/93] X11: remove toggle full screen after resume @@ -6415,10 +6415,10 @@ index 590a887..35b5a21 100644 } g_application.ResetScreenSaver(); -- -1.9.0 +1.9.1 -From 876139f6eb64b5e72689d5fe6a9bf65f60070b2e Mon Sep 17 00:00:00 2001 +From ad0fc40e1783078f46a46eb013f9d1443fc8430c Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 Subject: [PATCH 46/93] xrandr: set screen on mode change command @@ -6441,10 +6441,10 @@ index 5c53574..4355ef7 100644 return false; CLog::Log(LOGINFO, "XRANDR: %s", cmd); -- -1.9.0 +1.9.1 -From 4262d964615f251d99d6d773d5fa9a96f5230053 Mon Sep 17 00:00:00 2001 +From 0ba2eba0262a49383bc3d9ec4d3a5d6897cb3721 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 Subject: [PATCH 47/93] X11: recreate glx context when output changes @@ -6495,10 +6495,10 @@ index 3e62cd8..2a1fb41 100644 void OnLostDevice(); bool SetWindow(int width, int height, bool fullscreen, const CStdString &output); -- -1.9.0 +1.9.1 -From 76bab5ec893f9534f50f38474b22a56300307631 Mon Sep 17 00:00:00 2001 +From 5a9867048b04af0a6d69079b074f486b815f5802 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 Subject: [PATCH 48/93] pvr: do not show selection dialog for a single menu @@ -6536,10 +6536,10 @@ index 14c9cde..57b18a5 100644 client->CallMenuHook(hooks->at(hookIDs.at(selection)), item); } -- -1.9.0 +1.9.1 -From 2069a5213f76e57a558189b52f098af75d9c21cf Mon Sep 17 00:00:00 2001 +From e5547bd599a7acd0c108ba5d2e9e6d009e53e831 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 Subject: [PATCH 49/93] X11: use default screen parameters if no output @@ -6643,10 +6643,10 @@ index 4329a22..2adf8a0 100644 mask, &swa); -- -1.9.0 +1.9.1 -From aebb14e8a7d079871c69f31df00a0b894e9d5ef9 Mon Sep 17 00:00:00 2001 +From 2d4235e0b7419e5809f9e4a0f04c75b739cf3111 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 Subject: [PATCH 50/93] X11: create parent window @@ -6912,10 +6912,10 @@ index 2a1fb41..e8993f1 100644 Display* m_dpy; Cursor m_invisibleCursor; -- -1.9.0 +1.9.1 -From ecc4546cbeef4193a0cf2bcad35357f3fcf6fcc8 Mon Sep 17 00:00:00 2001 +From 746d782bac264b07bacb54861bb2201108ad6635 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 Subject: [PATCH 51/93] X11: use system key repeat rate instead of hardcoded @@ -7117,10 +7117,10 @@ index c69169c..6429291 100644 int m_keymodState; bool m_structureChanged; -- -1.9.0 +1.9.1 -From 4e3bbd52ba8c190b152d0ef21a8da4d3d512f056 Mon Sep 17 00:00:00 2001 +From 16034c24da378b62111c8d5ff2678e6096ac1d20 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 Subject: [PATCH 52/93] linux: use CLOCK_MONOTONIC_RAW as this is not subject @@ -7158,10 +7158,10 @@ index c06b8c5..4390d2e 100644 #endif } -- -1.9.0 +1.9.1 -From 6f70066f6cc093386d9cc087c3d089012b810f05 Mon Sep 17 00:00:00 2001 +From 975c1ffd8702bfd1f31de7bd45a1ddc53d4bcc93 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 Subject: [PATCH 53/93] OMXPlayer: some caching fixes for pvr @@ -7171,7 +7171,7 @@ Subject: [PATCH 53/93] OMXPlayer: some caching fixes for pvr 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index a3d3928..7b81178 100644 +index 05dadb0..c83465c 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp @@ -2556,7 +2556,8 @@ void COMXPlayer::HandleMessages() @@ -7185,10 +7185,10 @@ index a3d3928..7b81178 100644 m_av_clock.OMXSetSpeed(speed); m_av_clock.OMXPause(); -- -1.9.0 +1.9.1 -From 73977466eae71113f367f88b3a6a39e2d2077089 Mon Sep 17 00:00:00 2001 +From 0eb46022299461a945fa64bfb3e85b5ea4b180fe Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 Subject: [PATCH 54/93] fix incorrect display of fps when dr kicks in @@ -7198,10 +7198,10 @@ Subject: [PATCH 54/93] fix incorrect display of fps when dr kicks in 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 43c4517..4131707 100644 +index 9f8eb4c..3c3919c 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2307,10 +2307,11 @@ void CApplication::Render() +@@ -2317,10 +2317,11 @@ void CApplication::Render() if (frameTime < singleFrameTime) Sleep(singleFrameTime - frameTime); } @@ -7215,10 +7215,10 @@ index 43c4517..4131707 100644 g_renderManager.UpdateResolution(); -- -1.9.0 +1.9.1 -From c0b389a1a384684536183067a0b514bbc9c24477 Mon Sep 17 00:00:00 2001 +From 898d0c5685f5bc7932dc1f1cc8b64189b50da03e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 Subject: [PATCH 55/93] X11: fix mouse coverage @@ -7284,10 +7284,10 @@ index e8993f1..5cccfb7 100644 CCriticalSection m_resourceSection; std::vector m_resources; -- -1.9.0 +1.9.1 -From 884c573f53a288c206bd13348ce3e60dae0cb564 Mon Sep 17 00:00:00 2001 +From e0c0a46d60968c89af9fef3153eb76c33eff85a7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 Subject: [PATCH 56/93] X11: fix incorrectly used screen num in desktop @@ -7322,10 +7322,10 @@ index 2acb36d..101ba98 100644 res.iHeight = mode.h; res.iScreenWidth = mode.w; -- -1.9.0 +1.9.1 -From 836500221bf270ed628d35468a28873c96d41764 Mon Sep 17 00:00:00 2001 +From b9827a5763cb7248c84b010010b6eae636f688ec Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 Subject: [PATCH 57/93] X11: do not overwrite user selected monitor with @@ -7450,10 +7450,10 @@ index 5cccfb7..1b658e2 100644 bool m_bIsInternalXrr; bool m_newGlContext; -- -1.9.0 +1.9.1 -From 01061c02fe55c312e6e7e4b56f9cc29760ce547d Mon Sep 17 00:00:00 2001 +From b9e3a96c51b2e3f783dbef7e01472967d6003915 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 Subject: [PATCH 58/93] xrandr: add turn on/off to wrapper @@ -7619,10 +7619,10 @@ index d37838a..059062f 100644 //bool Has1080p(); //bool Has720p(); -- -1.9.0 +1.9.1 -From fa66d3ddccf1c807feea602bd334b9adbc12ffe8 Mon Sep 17 00:00:00 2001 +From c54051e7f4a1ecccd2e31fd3298646d8f8991e55 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 Subject: [PATCH 59/93] xrandr: add GetPreferredMode to wrapper @@ -7679,10 +7679,10 @@ index 059062f..ab7cc63 100644 bool SetMode(XOutput output, XMode mode); void LoadCustomModeLinesToAllOutputs(void); -- -1.9.0 +1.9.1 -From 7c1b95f1c1354fbc2a32224592ba778b91b538d4 Mon Sep 17 00:00:00 2001 +From b730789c91ba68ccb6fc61b5de64da9d421dcda7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 Subject: [PATCH 60/93] X11: multi-head improvement - poll for desired output @@ -7700,7 +7700,7 @@ Subject: [PATCH 60/93] X11: multi-head improvement - poll for desired output 8 files changed, 106 insertions(+), 13 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index d9b34e1..516c5c1 100755 +index 685847c..9cc2090 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6558,7 +6558,7 @@ msgctxt "#14071" @@ -7727,7 +7727,7 @@ index d9b34e1..516c5c1 100755 #: xbmc/video/VideoDatabase.cpp msgctxt "#15012" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 4882978..fafabf4 100644 +index e0c2aa3..4d885e5 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2251,7 +2251,7 @@ @@ -7972,10 +7972,10 @@ index 62003f5..8525ede 100644 int status = system(cmd.c_str()); if (status == -1) -- -1.9.0 +1.9.1 -From 08ec19f07d729af80bc81487a445ffd6794d82ed Mon Sep 17 00:00:00 2001 +From dab6b60289c788fc2688fb43bc8ba31abb458cff Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 Subject: [PATCH 61/93] X11: ignore mouse move event form other windows @@ -8007,10 +8007,10 @@ index 908c8b6..938ad26 100644 memset(&newEvent, 0, sizeof(newEvent)); newEvent.type = XBMC_MOUSEMOTION; -- -1.9.0 +1.9.1 -From 1f153f70a4adc06e1b23c09bfee4daa6f59ff1db Mon Sep 17 00:00:00 2001 +From eb2a56c5ea62c8633103d43e9565333fbf8fcd0f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 Subject: [PATCH 62/93] renderer: allow some lateness within vblank interval @@ -8070,10 +8070,10 @@ index 949c652..d84ff6c 100644 OVERLAY::CRenderer m_overlays; -- -1.9.0 +1.9.1 -From 0505eab3a4d5a351fb5700e919e190674472675d Mon Sep 17 00:00:00 2001 +From aee154a459214a8a7ebbe75802546f5ded741ba9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 Subject: [PATCH 63/93] X11: another fix for mouse coverage @@ -8106,10 +8106,10 @@ index 938ad26..e4ca56d 100644 break; } -- -1.9.0 +1.9.1 -From 3479849f9941a74852f8057de0352f52775168fc Mon Sep 17 00:00:00 2001 +From 144823d759c0226145f7d20887d87623f0359247 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 Subject: [PATCH 64/93] X11: set windows class name @@ -8151,10 +8151,10 @@ index b3fe510..df5fe9b 100644 // register interest in the delete window message -- -1.9.0 +1.9.1 -From 25a211eaa8d5125fc99353198b2a2caff23bf13c Mon Sep 17 00:00:00 2001 +From 95c63f329827a3d6ede318a66897c807464a60c1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 Subject: [PATCH 65/93] ActiveAE: slightly reduce buffer size @@ -8164,7 +8164,7 @@ Subject: [PATCH 65/93] ActiveAE: slightly reduce buffer size 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 6709993..6ca2cf4 100644 +index dfac0a4..4e6db55 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ using namespace ActiveAE; @@ -8179,10 +8179,10 @@ index 6709993..6ca2cf4 100644 void CEngineStats::Reset(unsigned int sampleRate) -- -1.9.0 +1.9.1 -From 0153f224e0288a2fd3d2ea6066b53fa142435580 Mon Sep 17 00:00:00 2001 +From 3cf47886c1c617b349da15931f1636c90c7f148b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 Subject: [PATCH 66/93] Revert "vdpau: comment some features that will be added @@ -8238,10 +8238,10 @@ index cd72cc6..351586a 100644 m_mixersteps = 1; } -- -1.9.0 +1.9.1 -From 59ce2ef98300a41255d4d860c62d3dde6f9b3272 Mon Sep 17 00:00:00 2001 +From 579cb07f7a2714ebc7f92a148f181fc88df7a072 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 Subject: [PATCH 67/93] X11: fix keysyms @@ -8264,10 +8264,10 @@ index e4ca56d..b20130c 100644 newEvent.key.keysym.unicode = keys[keys.length() - 1]; newEvent.key.state = xevent.xkey.state; -- -1.9.0 +1.9.1 -From 9cec1f9aa579e00c1e22d67ff0fbb7a9466035b2 Mon Sep 17 00:00:00 2001 +From f757587d8271e19833ebd20e4414310887b439f5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 Subject: [PATCH 68/93] X11: fix keysym for non-IM @@ -8290,10 +8290,10 @@ index b20130c..a38890c 100644 newEvent.key.keysym.scancode = xevent.xkey.keycode; newEvent.key.state = xevent.xkey.state; -- -1.9.0 +1.9.1 -From 7c9b3dd5116848f8b4140450cc7e635870c91c35 Mon Sep 17 00:00:00 2001 +From 67d6299ee8d739dd39d09998a5dc038646aaeed1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 Subject: [PATCH 69/93] add some missing multi media keys @@ -8348,10 +8348,10 @@ index ee6bb69..364b45a 100644 XBMCVK_LCONTROL = 0xD0, XBMCVK_RCONTROL = 0xD1, -- -1.9.0 +1.9.1 -From de2b2ba8265aba77dee620d279a61da8d3b87a61 Mon Sep 17 00:00:00 2001 +From f3c86359e1b8485303cf1a28b27406192bf1a608 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 Subject: [PATCH 70/93] X11: squash multi @@ -8374,10 +8374,10 @@ index df5fe9b..d8e04d6 100644 bool CWinSystemX11::IsSuitableVisual(XVisualInfo *vInfo) -- -1.9.0 +1.9.1 -From cf58d7d9830ee42813d1f7e7103fed4106d34d74 Mon Sep 17 00:00:00 2001 +From 270294e1d7f96093ffe9e76f6b57cdd6e54440ee Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 Subject: [PATCH 71/93] X11: do not poll default monitor @@ -8400,10 +8400,10 @@ index d8e04d6..01f5272 100644 int numScreens = XScreenCount(m_dpy); -- -1.9.0 +1.9.1 -From 21110ddf412223af1991542b1c5573da683f99a7 Mon Sep 17 00:00:00 2001 +From 1082493f5b26ff0333835293ac9c8afde041eee6 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:28 +0100 Subject: [PATCH 72/93] X11: fix broken monitor switching @@ -8414,7 +8414,7 @@ Subject: [PATCH 72/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 fafabf4..b13829b 100644 +index 4d885e5..a8b8c0f 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2303,7 +2303,6 @@ @@ -8506,10 +8506,10 @@ index 40bc3b3..1663836 100644 current = monitors[i]; } -- -1.9.0 +1.9.1 -From e95d85f22fecbc71b04569a4ceafe4971a0e5ba0 Mon Sep 17 00:00:00 2001 +From 78665a54123486093be492490de71a9ada971011 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:59 +0100 Subject: [PATCH 73/93] X11: remove polling for connected outputs, use xrr @@ -8810,10 +8810,10 @@ index 7ec5be4..14622cb 100644 bool m_bIsInternalXrr; bool m_newGlContext; -- -1.9.0 +1.9.1 -From 953a0ecd6ee55b1ef2842bb92d35e4e874f6b859 Mon Sep 17 00:00:00 2001 +From a65e945cc6c685d5f41405004a997c7cf742e158 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 09:37:13 +0100 Subject: [PATCH 74/93] X11: remove grabbing of keyboard and mouse @@ -8931,10 +8931,10 @@ index 14622cb..d1c8729 100644 CCriticalSection m_resourceSection; std::vector m_resources; -- -1.9.0 +1.9.1 -From 039e80014380b831d46199301999e27b1d40df96 Mon Sep 17 00:00:00 2001 +From a18e0784dad6ce6441b39df82daaa6418660e91b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 10:46:40 +0100 Subject: [PATCH 75/93] X11: set ExposureMask on gl window, fixes not updated @@ -8960,10 +8960,10 @@ index 695b352..e55583c 100644 m_glWindow = XCreateWindow(m_dpy, m_mainWindow, 0, 0, width, height, 0, vi->depth, -- -1.9.0 +1.9.1 -From 4469a824b82534d92692717e6f510a84c816eb46 Mon Sep 17 00:00:00 2001 +From fb6e76383d3978bed935d06b984c128734883748 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 11:25:19 +0100 Subject: [PATCH 76/93] X11: drop shortcuts, have WM do this @@ -9025,10 +9025,10 @@ index 6429291..4334d21 100644 Display *m_display; Window m_window; -- -1.9.0 +1.9.1 -From 386745d4d1e4ea4b5bde6cfad26b719e45168beb Mon Sep 17 00:00:00 2001 +From 4caa21ceb62eb4f69ab1590f7448efb03cd82e79 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 7 Nov 2013 15:02:00 +0100 Subject: [PATCH 77/93] X11: adapt to new settings @@ -9038,7 +9038,7 @@ Subject: [PATCH 77/93] X11: adapt to new settings 1 file changed, 1 insertion(+) diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index b13829b..b756fca 100644 +index a8b8c0f..abe6f49 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2263,6 +2263,7 @@ @@ -9050,10 +9050,10 @@ index b13829b..b756fca 100644 0 -- -1.9.0 +1.9.1 -From c4292a4b8577828802204b56c4fc448dd9bd76f5 Mon Sep 17 00:00:00 2001 +From 6ccf70dec9e904c416bc1bf8d147714df6bd934f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 09:28:24 +0100 Subject: [PATCH 78/93] X11: adapt to changes in cstdstring @@ -9101,10 +9101,10 @@ index 8525ede..c94f2e3 100644 int status = system(cmd.c_str()); if (status == -1) -- -1.9.0 +1.9.1 -From 029c809c1c28b7163ab02406668f176f49282626 Mon Sep 17 00:00:00 2001 +From 1e0a14287ea54dd3dcc64ed2a71e9ccbe8cf3a4c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 18 Nov 2013 17:44:31 +0100 Subject: [PATCH 79/93] ActiveAE: correct time of buffered samples by resample @@ -9116,7 +9116,7 @@ Subject: [PATCH 79/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 6ca2cf4..e2a4b6f 100644 +index 4e6db55..86c4dd9 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -102,7 +102,7 @@ float CEngineStats::GetDelay(CActiveAEStream *stream) @@ -9141,10 +9141,10 @@ index 99989b3..0287e73 100644 CActiveAEStream::~CActiveAEStream() -- -1.9.0 +1.9.1 -From f599ea4e785a09cae43ac3e80f9cb5eb576b9eff Mon Sep 17 00:00:00 2001 +From 825cc1046fbb61a5ce0680e7e68f368110960ae2 Mon Sep 17 00:00:00 2001 From: Marcel Groothuis Date: Thu, 5 Dec 2013 22:02:50 +0100 Subject: [PATCH 80/93] ffmpeg demuxer: faster channel change for PVR addons @@ -9158,7 +9158,7 @@ Subject: [PATCH 80/93] ffmpeg demuxer: faster channel change for PVR addons 3 files changed, 139 insertions(+), 22 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 16efae0..6ebbb6e 100644 +index afa3024..3409b67 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -51,6 +51,8 @@ @@ -9278,7 +9278,7 @@ index 16efae0..6ebbb6e 100644 if (pPacket) { -@@ -1683,3 +1694,101 @@ bool CDVDDemuxFFmpeg::IsProgramChange() +@@ -1684,3 +1695,101 @@ bool CDVDDemuxFFmpeg::IsProgramChange() } return false; } @@ -9458,10 +9458,10 @@ index ca689d0..f383563 100644 else return NULL; -- -1.9.0 +1.9.1 -From 51bc8b6305c3774d0967737d87abd35e6a4634a9 Mon Sep 17 00:00:00 2001 +From 07f1ce755e87d7112eb2d49dad06ae0d98252df8 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 20:35:04 +0100 Subject: [PATCH 81/93] ffmpeg demuxer: make sure we start mpegts video with an @@ -9473,7 +9473,7 @@ Subject: [PATCH 81/93] ffmpeg demuxer: make sure we start mpegts video with an 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 6ebbb6e..782fb3d 100644 +index 3409b67..d5da14b 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -448,6 +448,13 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo) @@ -9503,7 +9503,7 @@ index 6ebbb6e..782fb3d 100644 } else m_program = 0; -@@ -1730,7 +1743,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPacket *pkt) +@@ -1731,7 +1744,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPacket *pkt) } // for video we need a decoder to get desired information into codec context @@ -9512,7 +9512,7 @@ index 6ebbb6e..782fb3d 100644 (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE)) { // open a decoder, it will be cleared down by ffmpeg on closing the stream -@@ -1792,3 +1805,19 @@ bool CDVDDemuxFFmpeg::IsVideoReady() +@@ -1793,3 +1806,19 @@ bool CDVDDemuxFFmpeg::IsVideoReady() } return true; } @@ -9545,10 +9545,10 @@ index acde9a8..9ec0877 100644 AVDictionary *GetFFMpegOptionsFromURL(const CURL &url); double ConvertTimestamp(int64_t pts, int den, int num); -- -1.9.0 +1.9.1 -From 24a3fa6f5b58a3c2c9bf4b53a778ca503143c6c6 Mon Sep 17 00:00:00 2001 +From 8663e1ba7418d1478d64f45becb8e0ce95e7c2cf Mon Sep 17 00:00:00 2001 From: Wolfgang Haupt Date: Thu, 5 Dec 2013 22:11:57 +0100 Subject: [PATCH 82/93] DVDFactoryDemuxer: skip streaminfo for udp tcp and @@ -9600,7 +9600,7 @@ index f383563..d6580fd 100644 if(demuxer->Open(pInputStream, streaminfo)) return demuxer.release(); diff --git a/xbmc/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp -index 12dadba..bca61a1 100644 +index fd2eb5a..22932b7 100644 --- a/xbmc/utils/URIUtils.cpp +++ b/xbmc/utils/URIUtils.cpp @@ -788,6 +788,36 @@ bool URIUtils::IsFTP(const CStdString& strFile) @@ -9640,7 +9640,7 @@ index 12dadba..bca61a1 100644 bool URIUtils::IsDAV(const CStdString& strFile) { CStdString strFile2(strFile); -@@ -1285,3 +1315,8 @@ bool URIUtils::UpdateUrlEncoding(std::string &strFilename) +@@ -1284,3 +1314,8 @@ bool URIUtils::UpdateUrlEncoding(std::string &strFilename) strFilename = newFilename; return true; } @@ -9672,23 +9672,66 @@ index b94e94c..b45630f 100644 static void AddSlashAtEnd(std::string& strFolder); static bool HasSlashAtEnd(const std::string& strFile, bool checkURL = false); -- -1.9.0 +1.9.1 -From 93d15cd098d70bdc0629d6e550f27877ab0dd63e Mon Sep 17 00:00:00 2001 +From 0eb57e673be7fa1a5c46fb0ebd3431d54efa7c7d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 28 Jan 2014 08:43:29 +0100 Subject: [PATCH 83/93] squash fast switch --- - xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 23 ++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 782fb3d..b57b391 100644 +index d5da14b..f4ba29c 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1815,7 +1815,7 @@ void CDVDDemuxFFmpeg::ResetVideoStreams() +@@ -1783,15 +1783,19 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPacket *pkt) + bool CDVDDemuxFFmpeg::IsVideoReady() + { + AVStream *st; ++ bool hasVideo = false; + if(m_program != UINT_MAX) + { + for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) + { + int idx = m_pFormatContext->programs[m_program]->stream_index[i]; + st = m_pFormatContext->streams[idx]; +- if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && +- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE)) +- return false; ++ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) ++ { ++ if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) ++ return true; ++ hasVideo = true; ++ } + } + } + else +@@ -1799,12 +1803,15 @@ bool CDVDDemuxFFmpeg::IsVideoReady() + for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) + { + st = m_pFormatContext->streams[i]; +- if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && +- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE)) +- return false; ++ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) ++ { ++ if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) ++ return true; ++ hasVideo = true; ++ } + } + } +- return true; ++ return !hasVideo; + } + + void CDVDDemuxFFmpeg::ResetVideoStreams() +@@ -1816,7 +1823,7 @@ void CDVDDemuxFFmpeg::ResetVideoStreams() if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { if (st->codec->extradata) @@ -9698,16 +9741,14 @@ index 782fb3d..b57b391 100644 st->codec->width = 0; } -- -1.9.0 +1.9.1 -From 1228259650fdf7fd118787abf1f6c934c46097d6 Mon Sep 17 00:00:00 2001 +From 25c03cb987d364331f67f30403c5e55e6f2fddc7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker -Date: Sun, 9 Mar 2014 00:15:35 +0200 +Date: Sun, 22 Dec 2013 14:52:29 +0100 Subject: [PATCH 84/93] linux: add shared lib for sse4 operations -Conflicts: - configure.in --- Makefile.in | 8 ++- configure.in | 18 +++++++ @@ -9721,10 +9762,10 @@ Conflicts: create mode 100644 xbmc/linux/sse4/Makefile.in diff --git a/Makefile.in b/Makefile.in -index 8eda3c4..b0b5c24 100644 +index 6f689cf..a79adc7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -317,6 +317,12 @@ CHECK_LIBADD=@WAYLAND_TEST_LIBS@ +@@ -316,6 +316,12 @@ CHECK_LIBADD=@WAYLAND_TEST_LIBS@ endif endif @@ -9737,7 +9778,7 @@ index 8eda3c4..b0b5c24 100644 CHECK_PROGRAMS = xbmc-test CLEAN_FILES += $(CHECK_PROGRAMS) $(CHECK_EXTENSIONS) -@@ -446,7 +452,7 @@ endif +@@ -444,7 +450,7 @@ endif codecs: papcodecs dvdpcodecs dvdpextcodecs @@ -9747,7 +9788,7 @@ index 8eda3c4..b0b5c24 100644 externals: codecs libs visualizations screensavers libaddon pvraddons diff --git a/configure.in b/configure.in -index 1cd6b2e..8756b20 100644 +index d5ff793..cf49292 100644 --- a/configure.in +++ b/configure.in @@ -883,6 +883,19 @@ if test "$use_static_ffmpeg" = "yes"; then @@ -9770,7 +9811,7 @@ index 1cd6b2e..8756b20 100644 # Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_CHOWN -@@ -2591,6 +2604,10 @@ if test "$use_codec_libstagefright" = "yes"; then +@@ -2590,6 +2603,10 @@ if test "$use_codec_libstagefright" = "yes"; then OUTPUT_FILES="$OUTPUT_FILES xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile" fi @@ -9781,7 +9822,7 @@ index 1cd6b2e..8756b20 100644 OUTPUT_FILES="$OUTPUT_FILES \ xbmc/interfaces/python/Makefile \ xbmc/interfaces/python/test/Makefile" -@@ -2669,6 +2686,7 @@ AC_SUBST(USE_DOXYGEN) +@@ -2668,6 +2685,7 @@ AC_SUBST(USE_DOXYGEN) AC_SUBST(USE_PVR_ADDONS) AC_SUBST(GNUTLS_ALL_LIBS) AC_SUBST(VORBISENC_ALL_LIBS) @@ -9790,10 +9831,10 @@ index 1cd6b2e..8756b20 100644 # pushd and popd are not available in other shells besides bash, so implement # our own pushd/popd functions diff --git a/xbmc/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in -index d35ea97..3bf8f96 100644 +index 4953236..e42344c 100644 --- a/xbmc/DllPaths_generated.h.in +++ b/xbmc/DllPaths_generated.h.in -@@ -104,4 +104,7 @@ +@@ -103,4 +103,7 @@ /* xkbcommon */ #define DLL_PATH_XKBCOMMON "@XKBCOMMON_LIBRARY_SONAME@" @@ -9998,17 +10039,14 @@ index 0000000..45aa826 + +include ../../../Makefile.include -- -1.9.0 +1.9.1 -From 05f30fe9aa91c0b69d0e71490d73bdc34e0bf0af Mon Sep 17 00:00:00 2001 +From 88d5fb66b48a244bb554be3c79a4cbf5cca96ec9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker -Date: Sun, 9 Mar 2014 00:16:57 +0200 +Date: Thu, 19 Dec 2013 15:36:11 +0100 Subject: [PATCH 85/93] vaapi: option to enable sw filters -Conflicts: - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h --- language/English/strings.po | 17 ++- system/settings/settings.xml | 15 ++ @@ -10022,7 +10060,7 @@ Conflicts: 9 files changed, 296 insertions(+), 42 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 516c5c1..47ac883 100755 +index 9cc2090..88b945e 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6092,7 +6092,13 @@ msgctxt "#13456" @@ -10057,7 +10095,7 @@ index 516c5c1..47ac883 100755 #: system/settings/settings.xml diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index b756fca..3a9325e 100644 +index abe6f49..56fbe49 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -715,6 +715,21 @@ @@ -10661,10 +10699,10 @@ index 9c5469b..b30e450 100644 int iResult = OutputPicture(&picture, pts); -- -1.9.0 +1.9.1 -From eb235f0541bef993a9db30642ed451b723b7953e Mon Sep 17 00:00:00 2001 +From 20efabb4cce518375d636c4c9a71e31bf967f71d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 3 Jan 2014 20:50:46 +0100 Subject: [PATCH 86/93] X11: check for user output on resize window @@ -10709,10 +10747,10 @@ index 9962f08..c95f4ec 100644 && m_nHeight == newHeight && m_userOutput.compare(m_currentOutput) == 0) -- -1.9.0 +1.9.1 -From cf354441917e2066e406fad51200f20d762f09d2 Mon Sep 17 00:00:00 2001 +From 5aa0e55b7fd1ec3cc835baf6e5a177bfdf1523c1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 24 Jan 2014 18:29:33 +0100 Subject: [PATCH 87/93] dvdplayer: flush ffmpeg after hw decoder returned an @@ -10752,10 +10790,10 @@ index 2df9de9..f4c9929 100644 result = FilterProcess(m_pFrame); else -- -1.9.0 +1.9.1 -From 8184d80ea878672e0ad27ef24bc0daab05bf6397 Mon Sep 17 00:00:00 2001 +From 1a1013697c947fec44dd1f61986f421c912a383e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 28 Jan 2014 10:05:26 +0100 Subject: [PATCH 88/93] xbmc pr 3080 @@ -10797,10 +10835,10 @@ index f4c9929..283af9e 100644 pDvdVideoPicture->pts = DVD_NOPTS_VALUE; -- -1.9.0 +1.9.1 -From dbfcb8af2d7aa02dd5de3227e226493e80e7be4d Mon Sep 17 00:00:00 2001 +From 8ee0aaacf9b64e8febe50ca755f2fd3234074078 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 28 Jan 2014 17:24:58 +0100 Subject: [PATCH 89/93] set preatpicture if pts is equal to last frame @@ -10830,10 +10868,10 @@ index 283af9e..ff18b73 100644 pDvdVideoPicture->pts = DVD_NOPTS_VALUE; -- -1.9.0 +1.9.1 -From 4ae7d07c09a3d2e3fe0dc7042f37a11c89622357 Mon Sep 17 00:00:00 2001 +From 05270ff60d5a6671ff7ac59e4dd54a0807c5a0e4 Mon Sep 17 00:00:00 2001 From: fritsch Date: Mon, 27 Jan 2014 19:49:03 +0100 Subject: [PATCH 90/93] Introduce SWCodec - these are codecs that don't have @@ -10948,10 +10986,10 @@ index c43351d..7075f05 100644 CStdString m_videoDefaultPlayer; -- -1.9.0 +1.9.1 -From 0f809b66ecb03c219083ea821f4dbba543e818f5 Mon Sep 17 00:00:00 2001 +From cce953ed3996911a92a6ffb5616c6074e99f7aba Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Feb 2014 18:15:06 +0100 Subject: [PATCH 91/93] ActiveAE: add some debug logging @@ -10979,10 +11017,10 @@ index 0287e73..6904cb9 100644 return copied; } -- -1.9.0 +1.9.1 -From 513134b092630d3d59ee738a2761b93c08e3312f Mon Sep 17 00:00:00 2001 +From f05eddc364fbc4277bc3b9f97e8748102001f87d Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 24 Feb 2014 20:49:47 +0200 Subject: [PATCH 92/93] vaapi: fix build @@ -11060,10 +11098,10 @@ index 3541c9c..49d3117 100644 namespace VAAPI { -- -1.9.0 +1.9.1 -From f0b8551028faafa5bb3c5880263759a6239e836a Mon Sep 17 00:00:00 2001 +From 597b93ffb5bcfe04f7fa577b9fc0f2362d4caf62 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 24 Feb 2014 20:58:52 +0200 Subject: [PATCH 93/93] no hevc in ffmpeg 1.2 @@ -11099,5 +11137,5 @@ index 354e206..6bc35b1 100644 if (m_dllAvCodec.avcodec_open2(m_pCodecContext, pCodec, NULL) < 0) -- -1.9.0 +1.9.1 diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.80.009-PR4296.patch b/packages/mediacenter/xbmc/patches/xbmc-999.80.009-PR4296.patch deleted file mode 100644 index 9bacb065b0..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-999.80.009-PR4296.patch +++ /dev/null @@ -1,100 +0,0 @@ -From ee4270426da6800d5ac21c50c1c7aaa94eec60c7 Mon Sep 17 00:00:00 2001 -From: Voyager1 -Date: Fri, 28 Feb 2014 21:10:26 +0100 -Subject: [PATCH 1/2] [DVDInputStreamNavigator] allow fallback to root menu - call if title menu call fails (like VLC) - ---- - xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp -index de4f3d3..2b7de16 100644 ---- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp -+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp -@@ -187,8 +187,14 @@ bool CDVDInputStreamNavigator::Open(const char* strFile, const std::string& cont - m_dll.dvdnav_get_next_cache_block(m_dvdnav,&buf_ptr,&event,&len); - m_dll.dvdnav_sector_search(m_dvdnav, 0, SEEK_SET); - -+ // first try title menu - if(m_dll.dvdnav_menu_call(m_dvdnav, DVD_MENU_Title) != DVDNAV_STATUS_OK) -+ { - CLog::Log(LOGERROR,"Error on dvdnav_menu_call(Title): %s\n", m_dll.dvdnav_err_to_string(m_dvdnav)); -+ // next try root menu -+ if(m_dll.dvdnav_menu_call(m_dvdnav, DVD_MENU_Root) != DVDNAV_STATUS_OK ) -+ CLog::Log(LOGERROR,"Error on dvdnav_menu_call(Root): %s\n", m_dll.dvdnav_err_to_string(m_dvdnav)); -+ } - } - - m_bEOF = false; --- -1.8.5.5 - - -From 65d19589e577df91bdf922081bb373dc7b517074 Mon Sep 17 00:00:00 2001 -From: Voyager1 -Date: Fri, 28 Feb 2014 21:11:31 +0100 -Subject: [PATCH 2/2] [DVDInputStreamNavigator] allow to return from "endless" - loop of NOPs - ---- - .../dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp | 12 ++++++++++++ - xbmc/cores/dvdplayer/DVDPlayer.cpp | 1 + - xbmc/cores/omxplayer/OMXPlayer.cpp | 1 + - 3 files changed, 14 insertions(+) - -diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp -index 2b7de16..015a2ae 100644 ---- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp -+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp -@@ -239,11 +239,23 @@ int CDVDInputStreamNavigator::Read(uint8_t* buf, int buf_size) - - int iBytesRead; - -+ int NOPcount = 0; - while(true) { - int navresult = ProcessBlock(buf, &iBytesRead); - if (navresult == NAVRESULT_HOLD) return 0; // return 0 bytes read; - else if (navresult == NAVRESULT_ERROR) return -1; - else if (navresult == NAVRESULT_DATA) return iBytesRead; -+ else if (navresult == NAVRESULT_NOP) -+ { -+ NOPcount++; -+ if (NOPcount == 1000) -+ { -+ m_bEOF = true; -+ CLog::Log(LOGERROR,"CDVDInputStreamNavigator: Stopping playback due to infinite loop, caused by badly authored DVD navigation structure. Try enabling 'Attempt to skip introduction before DVD menu'."); -+ m_pDVDPlayer->OnDVDNavResult(NULL, DVDNAV_STOP); -+ return -1; // fail and stop playback. -+ } -+ } - } - - return iBytesRead; -diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index b056c8b..51dca5b 100644 ---- a/xbmc/cores/dvdplayer/DVDPlayer.cpp -+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -3560,6 +3560,7 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage) - { - CLog::Log(LOGDEBUG, "DVDNAV_STOP"); - m_dvd.state = DVDSTATE_NORMAL; -+ CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(16026), g_localizeStrings.Get(16029)); - } - break; - default: -diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index a3d3928..9799a10 100644 ---- a/xbmc/cores/omxplayer/OMXPlayer.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -3831,6 +3831,7 @@ int COMXPlayer::OnDVDNavResult(void* pData, int iMessage) - { - CLog::Log(LOGDEBUG, "DVDNAV_STOP"); - m_dvd.state = DVDSTATE_NORMAL; -+ CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(16026), g_localizeStrings.Get(16029)); - } - break; - default: --- -1.8.5.5 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.80.010-PR4414.patch b/packages/mediacenter/xbmc/patches/xbmc-999.80.010-PR4414.patch deleted file mode 100644 index 9f19ec0068..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-999.80.010-PR4414.patch +++ /dev/null @@ -1,393 +0,0 @@ -From 8d52b6d62e8872ecbc72064b36dad5e7a298f299 Mon Sep 17 00:00:00 2001 -From: Memphiz -Date: Tue, 11 Mar 2014 20:30:19 +0100 -Subject: [PATCH 1/3] [airplay] - ensure to announce airtunes before airplay - via zeroconf (makes it more likely that ios7 clients detect us correctly at - the first shot) - ---- - xbmc/network/NetworkServices.cpp | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/xbmc/network/NetworkServices.cpp b/xbmc/network/NetworkServices.cpp -index f1b82d7..32ef819 100644 ---- a/xbmc/network/NetworkServices.cpp -+++ b/xbmc/network/NetworkServices.cpp -@@ -210,12 +210,7 @@ bool CNetworkServices::OnSettingChanging(const CSetting *setting) - } - #endif //HAS_ZEROCONF - -- if (!StartAirPlayServer()) -- { -- CGUIDialogOK::ShowAndGetInput(g_localizeStrings.Get(1273), "", g_localizeStrings.Get(33100), ""); -- return false; -- } -- -+ // note - airtunesserver has to start before airplay server (ios7 client detection bug) - #ifdef HAS_AIRTUNES - if (!StartAirTunesServer()) - { -@@ -223,6 +218,12 @@ bool CNetworkServices::OnSettingChanging(const CSetting *setting) - return false; - } - #endif //HAS_AIRTUNES -+ -+ if (!StartAirPlayServer()) -+ { -+ CGUIDialogOK::ShowAndGetInput(g_localizeStrings.Get(1273), "", g_localizeStrings.Get(33100), ""); -+ return false; -+ } - } - else - { -@@ -402,8 +403,10 @@ void CNetworkServices::Start() - CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Warning, g_localizeStrings.Get(33102), g_localizeStrings.Get(33100)); - if (CSettings::Get().GetBool("services.esenabled") && !StartJSONRPCServer()) - CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Warning, g_localizeStrings.Get(33103), g_localizeStrings.Get(33100)); -- StartAirPlayServer(); -+ -+ // note - airtunesserver has to start before airplay server (ios7 client detection bug) - StartAirTunesServer(); -+ StartAirPlayServer(); - StartRss(); - } - --- -1.8.5.5 - - -From 4de71aac2c41627f3466c191a0c8fa0c77b569ff Mon Sep 17 00:00:00 2001 -From: Memphiz -Date: Tue, 11 Mar 2014 20:31:58 +0100 -Subject: [PATCH 2/3] [zeroconf] - add method to reannounce already published - services - ---- - xbmc/network/Zeroconf.cpp | 11 +++++++++++ - xbmc/network/Zeroconf.h | 15 ++++++++++++++- - xbmc/network/linux/ZeroconfAvahi.cpp | 20 ++++++++++++++++++++ - xbmc/network/linux/ZeroconfAvahi.h | 1 + - xbmc/network/mdns/ZeroconfMDNS.cpp | 36 +++++++++++++++++++++++++++++++----- - xbmc/network/mdns/ZeroconfMDNS.h | 9 ++++++++- - xbmc/network/osx/ZeroconfOSX.cpp | 26 ++++++++++++++++++++++++++ - xbmc/network/osx/ZeroconfOSX.h | 2 ++ - 8 files changed, 113 insertions(+), 7 deletions(-) - -diff --git a/xbmc/network/Zeroconf.cpp b/xbmc/network/Zeroconf.cpp -index ac13ac4..1569ec4 100644 ---- a/xbmc/network/Zeroconf.cpp -+++ b/xbmc/network/Zeroconf.cpp -@@ -45,6 +45,8 @@ class CZeroconfDummy : public CZeroconf - { - return false; - } -+ -+ virtual bool doForceReAnnounceService(const std::string&){return false;} - virtual bool doRemoveService(const std::string& fcr_ident){return false;} - virtual void doStop(){} - }; -@@ -93,6 +95,15 @@ bool CZeroconf::RemoveService(const std::string& fcr_identifier) - return true; - } - -+bool CZeroconf::ForceReAnnounceService(const std::string& fcr_identifier) -+{ -+ if (HasService(fcr_identifier) && m_started) -+ { -+ return doForceReAnnounceService(fcr_identifier); -+ } -+ return false; -+} -+ - bool CZeroconf::HasService(const std::string& fcr_identifier) const - { - return (m_service_map.find(fcr_identifier) != m_service_map.end()); -diff --git a/xbmc/network/Zeroconf.h b/xbmc/network/Zeroconf.h -index 441c0c1..d87e34c 100644 ---- a/xbmc/network/Zeroconf.h -+++ b/xbmc/network/Zeroconf.h -@@ -40,7 +40,7 @@ class CZeroconf - public: - - //tries to publish this service via zeroconf -- //fcr_identifier can be used to stop this service later -+ //fcr_identifier can be used to stop or reannounce this service later - //fcr_type is the zeroconf service type to publish (e.g. _http._tcp for webserver) - //fcr_name is the name of the service to publish. The hostname is currently automatically appended - // and used for name collisions. e.g. XBMC would get published as fcr_name@Martn or, after collision fcr_name@Martn-2 -@@ -51,6 +51,14 @@ class CZeroconf - const std::string& fcr_name, - unsigned int f_port, - std::vector > txt /*= std::vector >()*/); -+ -+ //tries to rebroadcast that service on the network without removing/readding -+ //this can be achieved by changing a fake txt record. Implementations should -+ //implement it by doing so. -+ // -+ //fcr_identifier - the identifier of the already published service which should be reannounced -+ // returns true on successfull reannonuce - false if this service isn't published yet -+ bool ForceReAnnounceService(const std::string& fcr_identifier); - - ///removes the specified service - ///returns false if fcr_identifier does not exist -@@ -90,6 +98,11 @@ class CZeroconf - const std::string& fcr_name, - unsigned int f_port, - const std::vector >& txt) = 0; -+ -+ //methods to implement for concrete implementations -+ //update this service -+ virtual bool doForceReAnnounceService(const std::string& fcr_identifier) = 0; -+ - //removes the service if published - virtual bool doRemoveService(const std::string& fcr_ident) = 0; - -diff --git a/xbmc/network/linux/ZeroconfAvahi.cpp b/xbmc/network/linux/ZeroconfAvahi.cpp -index 355b7ce..78d5eae 100644 ---- a/xbmc/network/linux/ZeroconfAvahi.cpp -+++ b/xbmc/network/linux/ZeroconfAvahi.cpp -@@ -167,6 +167,26 @@ bool CZeroconfAvahi::doPublishService(const std::string& fcr_identifier, - return true; - } - -+bool CZeroconfAvahi::doForceReAnnounceService(const std::string& fcr_identifier) -+{ -+ bool ret = false; -+ ScopedEventLoopBlock l_block(mp_poll); -+ tServiceMap::iterator it = m_services.find(fcr_identifier); -+ if (it != m_services.end() && it->second->mp_group) -+ { -+ // to force a reannounce on avahi its enough to reverse the txtrecord list -+ it->second->mp_txt = avahi_string_list_reverse(it->second->mp_txt); -+ -+ // this will trigger the reannouncement -+ if ((avahi_entry_group_update_service_txt_strlst(it->second->mp_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AvahiPublishFlags(0), -+ it->second->m_name.c_str(), -+ it->second->m_type.c_str(), NULL, it->second->mp_txt)) >= 0) -+ ret = true; -+ } -+ -+ return ret; -+} -+ - bool CZeroconfAvahi::doRemoveService(const std::string& fcr_ident) - { - CLog::Log(LOGDEBUG, "CZeroconfAvahi::doRemoveService named: %s", fcr_ident.c_str()); -diff --git a/xbmc/network/linux/ZeroconfAvahi.h b/xbmc/network/linux/ZeroconfAvahi.h -index 281dc21..e0b46b5 100644 ---- a/xbmc/network/linux/ZeroconfAvahi.h -+++ b/xbmc/network/linux/ZeroconfAvahi.h -@@ -50,6 +50,7 @@ class CZeroconfAvahi : public CZeroconf - unsigned int f_port, - const std::vector >& txt); - -+ virtual bool doForceReAnnounceService(const std::string& fcr_identifier); - virtual bool doRemoveService(const std::string& fcr_ident); - - virtual void doStop(); -diff --git a/xbmc/network/mdns/ZeroconfMDNS.cpp b/xbmc/network/mdns/ZeroconfMDNS.cpp -index b81ea11..00d02c5 100644 ---- a/xbmc/network/mdns/ZeroconfMDNS.cpp -+++ b/xbmc/network/mdns/ZeroconfMDNS.cpp -@@ -144,21 +144,46 @@ bool CZeroconfMDNS::doPublishService(const std::string& fcr_identifier, - else - { - CSingleLock lock(m_data_guard); -- m_services.insert(make_pair(fcr_identifier, netService)); -+ struct tServiceRef newService; -+ newService.serviceRef = netService; -+ newService.txtRecordRef = txtRecord; -+ newService.updateNumber = 0; -+ m_services.insert(make_pair(fcr_identifier, newService)); - } - -- TXTRecordDeallocate(&txtRecord); -- - return err == kDNSServiceErr_NoError; - } - -+bool CZeroconfMDNS::doForceReAnnounceService(const std::string& fcr_identifier) -+{ -+ bool ret = false; -+ CSingleLock lock(m_data_guard); -+ tServiceMap::iterator it = m_services.find(fcr_identifier); -+ if(it != m_services.end()) -+ { -+ // for force announcing a service with mdns we need -+ // to change a txt record - so we diddle between -+ // even and odd dummy records here -+ if ( (it->second.updateNumber % 2) == 0) -+ TXTRecordSetValue(&it->second.txtRecordRef, "xbmcdummy", strlen("evendummy"), "evendummy"); -+ else -+ TXTRecordSetValue(&it->second.txtRecordRef, "xbmcdummy", strlen("odddummy"), "odddummy"); -+ it->second.updateNumber++; -+ -+ if (DNSServiceUpdateRecord(it->second.serviceRef, NULL, 0, TXTRecordGetLength(&it->second.txtRecordRef), TXTRecordGetBytesPtr(&it->second.txtRecordRef), 0) == kDNSServiceErr_NoError) -+ ret = true; -+ } -+ return ret; -+} -+ - bool CZeroconfMDNS::doRemoveService(const std::string& fcr_ident) - { - CSingleLock lock(m_data_guard); - tServiceMap::iterator it = m_services.find(fcr_ident); - if(it != m_services.end()) - { -- DNSServiceRefDeallocate(it->second); -+ DNSServiceRefDeallocate(it->second.serviceRef); -+ TXTRecordDeallocate(&it->second.txtRecordRef); - m_services.erase(it); - CLog::Log(LOGDEBUG, "ZeroconfMDNS: Removed service %s", fcr_ident.c_str()); - return true; -@@ -174,7 +199,8 @@ void CZeroconfMDNS::doStop() - CLog::Log(LOGDEBUG, "ZeroconfMDNS: Shutdown services"); - for(tServiceMap::iterator it = m_services.begin(); it != m_services.end(); ++it) - { -- DNSServiceRefDeallocate(it->second); -+ DNSServiceRefDeallocate(it->second.serviceRef); -+ TXTRecordDeallocate(&it->second.txtRecordRef); - CLog::Log(LOGDEBUG, "ZeroconfMDNS: Removed service %s", it->first.c_str()); - } - m_services.clear(); -diff --git a/xbmc/network/mdns/ZeroconfMDNS.h b/xbmc/network/mdns/ZeroconfMDNS.h -index 075c22e..0156691 100644 ---- a/xbmc/network/mdns/ZeroconfMDNS.h -+++ b/xbmc/network/mdns/ZeroconfMDNS.h -@@ -44,6 +44,7 @@ class CZeroconfMDNS : public CZeroconf,public CThread - unsigned int f_port, - const std::vector >& txt); - -+ bool doForceReAnnounceService(const std::string& fcr_identifier); - bool doRemoveService(const std::string& fcr_ident); - - virtual void doStop(); -@@ -65,7 +66,13 @@ class CZeroconfMDNS : public CZeroconf,public CThread - - //lock + data (accessed from runloop(main thread) + the rest) - CCriticalSection m_data_guard; -- typedef std::map tServiceMap; -+ struct tServiceRef -+ { -+ DNSServiceRef serviceRef; -+ TXTRecordRef txtRecordRef; -+ int updateNumber; -+ }; -+ typedef std::map tServiceMap; - tServiceMap m_services; - DNSServiceRef m_service; - }; -diff --git a/xbmc/network/osx/ZeroconfOSX.cpp b/xbmc/network/osx/ZeroconfOSX.cpp -index 298dea4..24ad68c 100644 ---- a/xbmc/network/osx/ZeroconfOSX.cpp -+++ b/xbmc/network/osx/ZeroconfOSX.cpp -@@ -125,6 +125,32 @@ bool CZeroconfOSX::doPublishService(const std::string& fcr_identifier, - return result; - } - -+bool CZeroconfOSX::doForceReAnnounceService(const std::string& fcr_identifier) -+{ -+ bool ret = false; -+ CSingleLock lock(m_data_guard); -+ tServiceMap::iterator it = m_services.find(fcr_identifier); -+ if(it != m_services.end()) -+ { -+ CFNetServiceRef service = it->second; -+ -+ CFDataRef txtData = CFNetServiceGetTXTData(service); -+ // convert the txtdata back and forth is enough to trigger a reannounce later -+ CFDictionaryRef txtDict = CFNetServiceCreateDictionaryWithTXTData(NULL, txtData); -+ CFMutableDictionaryRef txtDictMutable =CFDictionaryCreateMutableCopy(NULL, 0, txtDict); -+ txtData = CFNetServiceCreateTXTDataWithDictionary(NULL, txtDictMutable); -+ -+ // this triggers the reannounce -+ ret = CFNetServiceSetTXTData(service, txtData); -+ -+ CFRelease(txtDictMutable); -+ CFRelease(txtDict); -+ CFRelease(txtData); -+ } -+ return ret; -+} -+ -+ - bool CZeroconfOSX::doRemoveService(const std::string& fcr_ident) - { - CSingleLock lock(m_data_guard); -diff --git a/xbmc/network/osx/ZeroconfOSX.h b/xbmc/network/osx/ZeroconfOSX.h -index 368c2d4..8952a96 100644 ---- a/xbmc/network/osx/ZeroconfOSX.h -+++ b/xbmc/network/osx/ZeroconfOSX.h -@@ -45,6 +45,8 @@ class CZeroconfOSX : public CZeroconf - unsigned int f_port, - const std::vector >& txt); - -+ bool doForceReAnnounceService(const std::string& fcr_identifier); -+ - bool doRemoveService(const std::string& fcr_ident); - - virtual void doStop(); --- -1.8.5.5 - - -From 251bacc4b45eb57758f5c28381b0546f0270cd9a Mon Sep 17 00:00:00 2001 -From: Memphiz -Date: Tue, 11 Mar 2014 20:32:22 +0100 -Subject: [PATCH 3/3] [airplay] - reannounce airplay service every 10 secs - (fixes ios7 clients not detecting us when their wlan was asleep or they saw - the airplay announcement before the airtunes annoncement) - ---- - xbmc/network/AirPlayServer.cpp | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp -index 7db6754..4c93368 100644 ---- a/xbmc/network/AirPlayServer.cpp -+++ b/xbmc/network/AirPlayServer.cpp -@@ -43,6 +43,9 @@ - #include "URL.h" - #include "cores/IPlayer.h" - #include "interfaces/AnnouncementManager.h" -+#ifdef HAS_ZEROCONF -+#include "network/Zeroconf.h" -+#endif // HAS_ZEROCONF - - using namespace ANNOUNCEMENT; - -@@ -277,6 +280,18 @@ void CAirPlayServer::AnnounceToClients(int state) - CAnnouncementManager::RemoveAnnouncer(this); - } - -+void handleZeroconfAnnouncement() -+{ -+#if defined(HAS_ZEROCONF) -+ static XbmcThreads::EndTime timeout(10000); -+ if(timeout.IsTimePast()) -+ { -+ CZeroconf::GetInstance()->ForceReAnnounceService("servers.airplay"); -+ timeout.Set(10000); -+ } -+#endif -+} -+ - void CAirPlayServer::Process() - { - m_bStop = false; -@@ -357,6 +372,12 @@ void CAirPlayServer::Process() - } - } - } -+ -+ // by reannouncing the zeroconf service -+ // we fix issues where xbmc is detected -+ // as audio-only target on devices with -+ // ios7 and later -+ handleZeroconfAnnouncement(); - } - - Deinitialize(); --- -1.8.5.5 -