diff --git a/packages/mediacenter/xbmc-theme-Confluence/package.mk b/packages/mediacenter/xbmc-theme-Confluence/package.mk index ca0649b03f..4fd1d66a8a 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-7f24c56" +PKG_VERSION="13-0a5b020" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 670aac73aa..9e037186e7 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13-7f24c56" +PKG_VERSION="13-0a5b020" 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 0217e927d1..6dd34787a2 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,7 +1,7 @@ -From 8a412a4b2a6dbd4e984a5bda80f3746306435979 Mon Sep 17 00:00:00 2001 +From cd390c16efd020e7b02296bcdac9d700ce088e5c 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/96] videoplayer: adapt lateness detection and dropping to buffering --- @@ -584,10 +584,10 @@ index f8ad541..186e271 100644 1.9.1 -From 9164e2a6e09673f7f2681f85aac73fb75f76dd2f Mon Sep 17 00:00:00 2001 +From 3b8554f9ad09aaed840ae6e00f5073c6e0015721 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/96] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -655,10 +655,10 @@ index 186e271..59c7f09 100644 1.9.1 -From f26e0dcf222941f167916ab701fccc4d21bd0a9c Mon Sep 17 00:00:00 2001 +From 1b02662cd1ad58a5421f4dccb61cef38fea3de4e 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/96] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 28 ++++++++++++++++++++-- @@ -768,10 +768,10 @@ index 1d29b6f..ee07f30 100644 1.9.1 -From 5b38710e938ad7510997d95f2e5bbb5c369695ce Mon Sep 17 00:00:00 2001 +From 79a3a5317beae2966b118a77a25b60b8b3a88c22 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/96] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -794,10 +794,10 @@ index dc2712a..9edfbd4 100644 1.9.1 -From 40779a6b4a50f6e3a5b3544be3c44a2facf42456 Mon Sep 17 00:00:00 2001 +From 307a65669e2b2936d77ec1f06cb60ff45fa5ffa9 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/96] videoplayer: update frametime, it might change due to fps detection --- @@ -821,10 +821,10 @@ index ee07f30..b3175cd 100644 1.9.1 -From 6bf3a618ec98d30265b9e1d54123b38ac8822381 Mon Sep 17 00:00:00 2001 +From 0c8b92541bac2a40e3cad9f7da8fd6ce028a27ae 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/96] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -848,10 +848,10 @@ index b3175cd..9c36bdb 100644 1.9.1 -From aef1aabba9800f3dbd1da817c578f20293ecadee Mon Sep 17 00:00:00 2001 +From 08385386346bd04b66867a679271e8e6ad99ff6c 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/96] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -888,10 +888,10 @@ index 3a37dee..15e490c 100644 1.9.1 -From 2076d4c0af6f9513a4ee90b5806314ed7880ef03 Mon Sep 17 00:00:00 2001 +From 79e223a725462b9e0ce94c5d9f820a92e782a197 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/96] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -907,7 +907,7 @@ 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 2f832b8..9f8eb4c 100644 +index 5e31453..5a24ffb 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -917,7 +917,7 @@ bool CApplication::CreateGUI() @@ -2428,10 +2428,10 @@ index b1464d0..34b912f 100644 1.9.1 -From 44cb758529806e3ff949c8ce4fd7e120abb1cfdc Mon Sep 17 00:00:00 2001 +From df8808f316b757da4e760ee8669326901191a6e5 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/96] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -2621,10 +2621,10 @@ index 34b912f..352e90e 100644 1.9.1 -From 252aeafb26ec461519b3091eb7a3df3129a8d755 Mon Sep 17 00:00:00 2001 +From 66e95a677c6705dcbf031610fa2f3dbf5d15efbe 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/96] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -2678,10 +2678,10 @@ index ad58aad..6f57a87 100644 1.9.1 -From d50602b4c1407aa1672830639231bc50d7009680 Mon Sep 17 00:00:00 2001 +From 3f976cfab6a42dd7232464c7a366f4e6fa43b19f 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/96] X11: factor out code handling device reset notification --- xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- @@ -2744,10 +2744,10 @@ index 352e90e..3f91b9b 100644 1.9.1 -From 5d87f6a01c748666c6069808c72b0b65edb26b2b Mon Sep 17 00:00:00 2001 +From ff1ddbc3986fb6e541d9850c4e51321fed42dab8 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/96] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -2891,10 +2891,10 @@ index 304dac8..16b13aa 100644 1.9.1 -From a7b30d1d49e0f6a2704aeab80af7d045cbf45987 Mon Sep 17 00:00:00 2001 +From 3a1d2d126d78b438efa6da902b41fb4f65866dd0 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/96] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -2973,10 +2973,10 @@ index 0aec487..00b49dc 100644 1.9.1 -From fc6a66db6c496928a1c09d1c22c0efdb8dac228f Mon Sep 17 00:00:00 2001 +From 17b89c5e0ee97f7a162ba8c0f46c6efeb11fdd24 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/96] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -3191,10 +3191,10 @@ index 00b49dc..508604d 100644 1.9.1 -From c9260a19208ffbd85741b0de80c56e7ef6c67162 Mon Sep 17 00:00:00 2001 +From 50b8649389095c3b80ed2d698630eaf95fc9218e 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/96] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -3369,10 +3369,10 @@ index 508604d..d37838a 100644 1.9.1 -From 8e8cba435cbf594637a03f9a4b0b566c88cf6d2d Mon Sep 17 00:00:00 2001 +From 1c4250942d2478de4241bfd7f54b627faf476824 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/96] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -3402,10 +3402,10 @@ index 616a321..685847c 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 042c09e..9558547 100644 +index f92bd59..fba4561 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2247,6 +2247,15 @@ +@@ -2251,6 +2251,15 @@
@@ -3421,7 +3421,7 @@ index 042c09e..9558547 100644 0 0 -@@ -2268,6 +2277,7 @@ +@@ -2272,6 +2281,7 @@ -1 @@ -3429,7 +3429,7 @@ index 042c09e..9558547 100644 -@@ -2285,6 +2295,7 @@ +@@ -2289,6 +2299,7 @@ -1 @@ -3450,10 +3450,10 @@ index 4bd540b..f1e2c50 100644 virtual void SetViewPort(CRect& viewPort); virtual void GetViewPort(CRect& viewPort); diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp -index c8c2bbd..966d08f 100644 +index daa1b18..db2f667 100644 --- a/xbmc/settings/DisplaySettings.cpp +++ b/xbmc/settings/DisplaySettings.cpp -@@ -219,13 +219,19 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) +@@ -219,7 +219,8 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) const std::string &settingId = setting->GetId(); if (settingId == "videoscreen.resolution" || @@ -3463,9 +3463,10 @@ index c8c2bbd..966d08f 100644 { RESOLUTION newRes = RES_DESKTOP; if (settingId == "videoscreen.resolution") - newRes = (RESOLUTION)((CSettingInt*)setting)->GetValue(); - else if (settingId == "videoscreen.screen") +@@ -235,6 +236,11 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) + // get desktop resolution for screen newRes = GetResolutionForScreen(); + } + else if (settingId == "videoscreen.monitor") + { + g_Windowing.UpdateResolutions(); @@ -3474,7 +3475,7 @@ index c8c2bbd..966d08f 100644 string screenmode = GetStringFromResolution(newRes); CSettings::Get().SetString("videoscreen.screenmode", screenmode); -@@ -236,7 +242,11 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) +@@ -245,7 +251,11 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) RESOLUTION newRes = GetResolutionFromString(((CSettingString*)setting)->GetValue()); SetCurrentResolution(newRes, false); @@ -3487,7 +3488,7 @@ index c8c2bbd..966d08f 100644 // check if the old or the new resolution was/is windowed // in which case we don't show any prompt to the user -@@ -622,6 +632,10 @@ void CDisplaySettings::SettingOptionsScreensFiller(const CSetting *setting, std: +@@ -641,6 +651,10 @@ void CDisplaySettings::SettingOptionsScreensFiller(const CSetting *setting, std: if (g_advancedSettings.m_canWindowed) list.push_back(make_pair(g_localizeStrings.Get(242), DM_WINDOWED)); @@ -3498,7 +3499,7 @@ index c8c2bbd..966d08f 100644 for (int idx = 0; idx < g_Windowing.GetNumScreens(); idx++) { int screen = CDisplaySettings::Get().GetResolutionInfo(RES_DESKTOP + idx).iScreen; -@@ -636,6 +650,7 @@ void CDisplaySettings::SettingOptionsScreensFiller(const CSetting *setting, std: +@@ -655,6 +669,7 @@ void CDisplaySettings::SettingOptionsScreensFiller(const CSetting *setting, std: RESOLUTION_INFO resInfo = CDisplaySettings::Get().GetResolutionInfo(res); current = resInfo.iScreen; } @@ -3506,7 +3507,7 @@ index c8c2bbd..966d08f 100644 } void CDisplaySettings::SettingOptionsVerticalSyncsFiller(const CSetting *setting, std::vector< std::pair > &list, int ¤t) -@@ -663,3 +678,28 @@ void CDisplaySettings::SettingOptionsPreferredStereoscopicViewModesFiller(const +@@ -683,3 +698,28 @@ void CDisplaySettings::SettingOptionsPreferredStereoscopicViewModesFiller(const SettingOptionsStereoscopicModesFiller(setting, list, current); list.push_back(make_pair(g_localizeStrings.Get(36525), RENDER_STEREO_MODE_AUTO)); // option for autodetect } @@ -3556,7 +3557,7 @@ index 8ee1be2..bead24b 100644 protected: CDisplaySettings(); diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 606edf8..c68a305 100644 +index d8d50ea..013adf9 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -406,6 +406,7 @@ void CSettings::Uninitialize() @@ -3575,7 +3576,7 @@ index 606edf8..c68a305 100644 m_settingsManager->RegisterSettingOptionsFiller("shutdownstates", CPowerManager::SettingOptionsShutdownStatesFiller); m_settingsManager->RegisterSettingOptionsFiller("startupwindows", ADDON::CSkinInfo::SettingOptionsStartupWindowsFiller); m_settingsManager->RegisterSettingOptionsFiller("streamlanguages", CLangInfo::SettingOptionsStreamLanguagesFiller); -@@ -865,6 +867,9 @@ void CSettings::InitializeConditions() +@@ -868,6 +870,9 @@ void CSettings::InitializeConditions() #ifdef HAS_GL m_settingsManager->AddCondition("has_gl"); #endif @@ -3585,7 +3586,7 @@ index 606edf8..c68a305 100644 #ifdef HAS_GLES m_settingsManager->AddCondition("has_gles"); #endif -@@ -1017,6 +1022,7 @@ void CSettings::InitializeISettingCallbacks() +@@ -1021,6 +1026,7 @@ void CSettings::InitializeISettingCallbacks() settingSet.insert("videoscreen.resolution"); settingSet.insert("videoscreen.screenmode"); settingSet.insert("videoscreen.vsync"); @@ -4131,10 +4132,10 @@ index 4175aab..94584ab 100644 1.9.1 -From a640bb0a87af94948bcb3ad6595a0e399b919fa1 Mon Sep 17 00:00:00 2001 +From 42b6e1775d61778a57119471091900998ddf6d37 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/96] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -4202,10 +4203,10 @@ index 6383754..21e7dc5 100644 1.9.1 -From 1e4053a047e6c665bb8c8273f55e33edf472a0b5 Mon Sep 17 00:00:00 2001 +From 227a92bca30d905570f4827cef6102b0ba5f1022 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/96] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -4277,10 +4278,10 @@ index 0b3950a..ca43b5a 100644 1.9.1 -From 8dc338e26cb0776432279640aa925627d3ab661a Mon Sep 17 00:00:00 2001 +From 9244c0ac286705cc5e8577138b219a25db3bdda3 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/96] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -4431,10 +4432,10 @@ index 21e7dc5..8e68d5d 100644 1.9.1 -From de2c6ad2d702e389a3ea8e0e938ba654de289c29 Mon Sep 17 00:00:00 2001 +From b3587cc41599e6bd73bd54a58f59118d1edfced4 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/96] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -4639,10 +4640,10 @@ index dd65a1b..afd71fc 100644 1.9.1 -From 66ab4eb4496e3ddb4ba2239f1c162bb1057a706e Mon Sep 17 00:00:00 2001 +From e9fe9c2f0dae615075a9173e5c4a0c6ef6700097 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/96] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -4734,10 +4735,10 @@ index 9666cc3..5b52d6c 100644 1.9.1 -From 6217a0be42692faddde86de8329f2e72b2955544 Mon Sep 17 00:00:00 2001 +From 1d80e75563853da38393b91d38c1c3b449db0bd9 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/96] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -4807,10 +4808,10 @@ index 5b52d6c..b2bd5a0 100644 1.9.1 -From 9cf36d3c7353a3bbe80cd76414e26fc74245c6f8 Mon Sep 17 00:00:00 2001 +From 2cd34f3f2ac582f71a042902d777b890234c7f93 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/96] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -4854,10 +4855,10 @@ index b76b229..869baa8 100644 1.9.1 -From 1154a11d1895ce346e3217237a03e8e2f4be0b4c Mon Sep 17 00:00:00 2001 +From 7ea6a5a0a6040f2277a510fc8752d7ca134e1f07 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/96] X11: reset key repeat and key modifier on focus lost and gain --- @@ -4889,10 +4890,10 @@ index d98f12f..743aca9 100644 1.9.1 -From 4b6a6e8d75b8c21013b285d8fd21dd617b70559b Mon Sep 17 00:00:00 2001 +From d3c56229317ecf38e4b3957f82669281a722482f 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/96] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -5109,10 +5110,10 @@ index a412f32..9a8a912 100644 1.9.1 -From 2909302cc5de3cebe7560b6208c0b263022eec0e Mon Sep 17 00:00:00 2001 +From 17f4e2e5c33d0574e944cba76a561e618051551a 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/96] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -5176,10 +5177,10 @@ index 9a8a912..c69169c 100644 1.9.1 -From 5f223a91958b39af63f2c13d39d55b7fade9a969 Mon Sep 17 00:00:00 2001 +From 90af49c63d9469c783629881e1846979594a8ff2 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/96] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -5202,10 +5203,10 @@ index d57f4d3..b807897 100644 1.9.1 -From 03a200a40c99f04c02ab0f9214865895732ef0af Mon Sep 17 00:00:00 2001 +From 049f7e527bf12b7322c7343f01e6f08a2415fe8e 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/96] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -5228,10 +5229,10 @@ index 0ddf102..3ae7107 100644 1.9.1 -From d27b1125f31c6d9e8da2c5895d6fed48b9ac0fc6 Mon Sep 17 00:00:00 2001 +From 23b43d522cb691b21ef572f3ee003b152fea4b3a 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/96] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -5262,10 +5263,10 @@ index 3ae7107..27bebde 100644 1.9.1 -From e2d7c2ecbebf0550058f6237fbda72e03d36d49d Mon Sep 17 00:00:00 2001 +From 263d964167a2eaf52713f513ef8cc4c912241e3b 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/96] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -5373,10 +5374,10 @@ index 869baa8..bfe3797 100644 1.9.1 -From 776cfbf1c77c6451f7b698b8a3ae8a7116e2d386 Mon Sep 17 00:00:00 2001 +From 648af86aa01874210d8ea6732cf7cef4f8e466e0 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/96] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -5497,10 +5498,10 @@ index b2bd5a0..3e62cd8 100644 1.9.1 -From d1ae5f31a8ad27205cd6f68ca1103d09573c2e0f Mon Sep 17 00:00:00 2001 +From f4ed19185a171a1967c30999e119abd661654102 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/96] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -5537,10 +5538,10 @@ index af82061..4f33c68 100644 1.9.1 -From 610332af77f0838e5c4da4c434637a5fdc50802d Mon Sep 17 00:00:00 2001 +From d174bc51e0e31ec6666bdc0479a4c948efc5bd63 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/96] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -5564,10 +5565,10 @@ index 4f33c68..bc4e963 100644 1.9.1 -From 8dd4c694cc7a831acba12034040688f5dbffcb93 Mon Sep 17 00:00:00 2001 +From b685749adb461364ad288593d1e62e4927c439c8 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/96] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -5590,10 +5591,10 @@ index bc4e963..57a8d20 100644 1.9.1 -From 435ecad6d2ce4ce97cf6322c8f2ac3d7035a2ce1 Mon Sep 17 00:00:00 2001 +From 9ac337cb7338a191037bb3e05599ce1f9de3419b 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 +Subject: [PATCH 35/96] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 197 ++++++++++++++++++++- @@ -5876,10 +5877,10 @@ index aef5ab1..35abbdf 100644 1.9.1 -From 6df8242735886d88a160f71c3d10c0ab3aaa1bbd Mon Sep 17 00:00:00 2001 +From edec7054fd66168c26cb16d624139a85d0feeb82 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 +Subject: [PATCH 36/96] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -5912,10 +5913,10 @@ index 9c36bdb..322a581 100644 1.9.1 -From a9073cb9b9120cf0749b07795d93384975c4370d Mon Sep 17 00:00:00 2001 +From aea69ca48e5ae5888feec63cd9ce8f16c971f5cf 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 +Subject: [PATCH 37/96] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -5981,10 +5982,10 @@ index 3995f35..c43351d 100644 1.9.1 -From 4f6168128f2d7210e0a84a3b91bcca59e518609f Mon Sep 17 00:00:00 2001 +From 075908a1dae8d28b939fe754686105b2106a97d1 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 +Subject: [PATCH 38/96] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -6199,10 +6200,10 @@ index 59c7f09..65dea76 100644 1.9.1 -From 947ac39433fc5bf94898cce5778ec4c3e4c834f7 Mon Sep 17 00:00:00 2001 +From 7070e0502de0d996e39c2a379dea650f773e220e 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 +Subject: [PATCH 39/96] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -6243,10 +6244,10 @@ index 4685413..e610150 100644 1.9.1 -From 3c377736e3b88cb2c7faa56d8205eae5fcf88919 Mon Sep 17 00:00:00 2001 +From 9495daa338e146f7efc13308d280ad9ebdf3f861 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 +Subject: [PATCH 40/96] X11: add debug log to print out refresh after xrr event --- xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ @@ -6273,10 +6274,10 @@ index 57a8d20..a237dc0 100644 1.9.1 -From b7c17e7d0360e607203b78a4f97a39748d232b20 Mon Sep 17 00:00:00 2001 +From 0b610b8e1040605b28907f72866a2be58b963a13 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 +Subject: [PATCH 41/96] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -6301,10 +6302,10 @@ index a237dc0..ab660b1 100644 1.9.1 -From 418c7248804b7770331f4405830b11bc01f2bf8f Mon Sep 17 00:00:00 2001 +From 1501643dfcda4e8e1c46feade3370964f8f344b9 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 +Subject: [PATCH 42/96] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6327,10 +6328,10 @@ index e610150..5c53574 100644 1.9.1 -From 739f413b5bb9df2b5f30a71bfe467d999a5b3998 Mon Sep 17 00:00:00 2001 +From 00c856df34e3941787d98d871b9b6d8905717d76 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 +Subject: [PATCH 43/96] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -6364,10 +6365,10 @@ index 7d0a732..d066610 100644 1.9.1 -From 3df22e353f885a4554a8ccb74f42193625e72650 Mon Sep 17 00:00:00 2001 +From 3021decc0764c58d5aa8e1d668106527f076343e 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 +Subject: [PATCH 44/96] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -6389,10 +6390,10 @@ index a62521f..263cb5a 100644 1.9.1 -From 0bde86e2a9d9f20f97f3d9e29134f55b926174c1 Mon Sep 17 00:00:00 2001 +From 3064c39cb89bc411e235fd4fdc0d82f795c894f7 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 +Subject: [PATCH 45/96] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -6418,10 +6419,10 @@ index 590a887..35b5a21 100644 1.9.1 -From 02e1af5f1b0d46d1b5bbae78515921df259077fa Mon Sep 17 00:00:00 2001 +From ad652ac8add735a9796acf9545eceba8c1e4d2fe 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 +Subject: [PATCH 46/96] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6444,10 +6445,10 @@ index 5c53574..4355ef7 100644 1.9.1 -From 9113b458acd48bc6559570dc787670810b995b1a Mon Sep 17 00:00:00 2001 +From 10b7c59751e8b809a2fdf5e0c0edd01a2acbc5f7 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 +Subject: [PATCH 47/96] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -6498,10 +6499,10 @@ index 3e62cd8..2a1fb41 100644 1.9.1 -From 57e76f2724bc8bcba2e030ca3020002153b57599 Mon Sep 17 00:00:00 2001 +From 353c653d504a568b28cf3e90380c8aeff0629c75 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 +Subject: [PATCH 48/96] pvr: do not show selection dialog for a single menu hook --- @@ -6539,10 +6540,10 @@ index 14c9cde..57b18a5 100644 1.9.1 -From 19924412864ab18a48f146a00a061e1d5b10cc01 Mon Sep 17 00:00:00 2001 +From 3f1eb64980be5bf9c5676c93e3a99bf107824c25 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 +Subject: [PATCH 49/96] X11: use default screen parameters if no output connected --- @@ -6646,10 +6647,10 @@ index 4329a22..2adf8a0 100644 1.9.1 -From 02878b198fc260de4f3825f678d0826c5ad97fdc Mon Sep 17 00:00:00 2001 +From aaeedaed5098ef4771c643a8d61b5d641e20c8ae 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 +Subject: [PATCH 50/96] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -6915,10 +6916,10 @@ index 2a1fb41..e8993f1 100644 1.9.1 -From 64f9551062e9333cbe7d4d5e7a2db32bb7331592 Mon Sep 17 00:00:00 2001 +From 085ec3cdb8b45b3885a7fc0cec7355ca211c055f 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 +Subject: [PATCH 51/96] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -7120,10 +7121,10 @@ index c69169c..6429291 100644 1.9.1 -From 2e3ab8f12b8bf6161e2dacd81055920897f54dfa Mon Sep 17 00:00:00 2001 +From dcb0640d4f41cc444f6b212799505d1d122170a7 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 +Subject: [PATCH 52/96] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -7161,20 +7162,20 @@ index c06b8c5..4390d2e 100644 1.9.1 -From 6af29f866e993f2405e4fb5bd4d064d9ebe86ac4 Mon Sep 17 00:00:00 2001 +From feb8150d84f4b83dbba365cad5eafa8831914654 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 +Subject: [PATCH 53/96] 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 05dadb0..c83465c 100644 +index 0b80be5..8eab2fd 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -2556,7 +2556,8 @@ void COMXPlayer::HandleMessages() +@@ -2548,7 +2548,8 @@ void COMXPlayer::HandleMessages() m_messenger.Put(new CDVDMsgPlayerSeek(GetTime(), (speed < 0), true, false, false, true)); m_playSpeed = speed; @@ -7188,20 +7189,20 @@ index 05dadb0..c83465c 100644 1.9.1 -From b0e14071ce2ba2f6e143f8864135669ca278d769 Mon Sep 17 00:00:00 2001 +From c66609611e7e6da48d14069e0a047bca7ea1b694 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 +Subject: [PATCH 54/96] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 9f8eb4c..3c3919c 100644 +index 5a24ffb..a0ca53a 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2317,10 +2317,11 @@ void CApplication::Render() +@@ -2320,10 +2320,11 @@ void CApplication::Render() if (frameTime < singleFrameTime) Sleep(singleFrameTime - frameTime); } @@ -7218,10 +7219,10 @@ index 9f8eb4c..3c3919c 100644 1.9.1 -From 91560c0f72342997502637e4280294a5522b597b Mon Sep 17 00:00:00 2001 +From 33ee35d980ddf952da1d577903154e19f8bad525 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 +Subject: [PATCH 55/96] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -7287,10 +7288,10 @@ index e8993f1..5cccfb7 100644 1.9.1 -From 98d68b80cc279d689c43f3904be80ee2c492b9ba Mon Sep 17 00:00:00 2001 +From 6b23cb08d6e6b72909750bd69630be1a4b381895 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 +Subject: [PATCH 56/96] X11: fix incorrectly used screen num in desktop resolution --- @@ -7325,10 +7326,10 @@ index 2acb36d..101ba98 100644 1.9.1 -From 8c91e302e66ba64eb2a41b1637fc7085ca80c576 Mon Sep 17 00:00:00 2001 +From 30326f85a2b363432abe0979d09f5eadd8520db1 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 +Subject: [PATCH 57/96] X11: do not overwrite user selected monitor with fallback --- @@ -7453,10 +7454,10 @@ index 5cccfb7..1b658e2 100644 1.9.1 -From f5bf9c0e577791f25c750ba515b374c4346e1fdb Mon Sep 17 00:00:00 2001 +From 640834140bad33d23f0d0228ac4a6f022405f276 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 +Subject: [PATCH 58/96] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -7622,10 +7623,10 @@ index d37838a..059062f 100644 1.9.1 -From 135f0d0ccbd160e893b66c729016851d3472c7c9 Mon Sep 17 00:00:00 2001 +From eb767b125450fc14c15cfe05dec4b696e1439bbe 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 +Subject: [PATCH 59/96] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -7682,10 +7683,10 @@ index 059062f..ab7cc63 100644 1.9.1 -From 962f336d9a3ec37694c885bb05da2f7b301c7faa Mon Sep 17 00:00:00 2001 +From 24471c2dd68d3bf52d1a5204d73fb48ac6b4d189 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 +Subject: [PATCH 60/96] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -7727,10 +7728,10 @@ index 685847c..9cc2090 100755 #: xbmc/video/VideoDatabase.cpp msgctxt "#15012" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 9558547..2a59885 100644 +index fba4561..798be52 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2248,7 +2248,7 @@ +@@ -2252,7 +2252,7 @@ @@ -7739,7 +7740,7 @@ index 9558547..2a59885 100644 0 Default -@@ -2256,6 +2256,11 @@ +@@ -2260,6 +2260,11 @@ @@ -7751,7 +7752,7 @@ index 9558547..2a59885 100644 0 0 -@@ -2308,6 +2313,7 @@ +@@ -2312,6 +2317,7 @@ @@ -7760,10 +7761,10 @@ index 9558547..2a59885 100644 false diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp -index 966d08f..40bc3b3 100644 +index db2f667..efb6cb1 100644 --- a/xbmc/settings/DisplaySettings.cpp +++ b/xbmc/settings/DisplaySettings.cpp -@@ -265,6 +265,10 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) +@@ -274,6 +274,10 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) m_resolutionChangeAborted = false; } } @@ -7975,10 +7976,10 @@ index 62003f5..8525ede 100644 1.9.1 -From 87524d5a4c3f4c6257673ec439256493aadce730 Mon Sep 17 00:00:00 2001 +From ca045d99ebbe5f35ea3d39a8f2356f53533a7269 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 +Subject: [PATCH 61/96] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -8010,10 +8011,10 @@ index 908c8b6..938ad26 100644 1.9.1 -From 23b89e6c23cfd02e81551e7b8292a0a62b05f64c Mon Sep 17 00:00:00 2001 +From 13b504eb4cb6bd21a6c1a3b658a9ddc05a18e252 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 +Subject: [PATCH 62/96] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -8073,10 +8074,10 @@ index 949c652..d84ff6c 100644 1.9.1 -From b7fceec7edc3e0085f6465be1c89378b3d5dfdba Mon Sep 17 00:00:00 2001 +From e7fb60e0d020111598f477e775c5c2aaac7f7aa5 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 +Subject: [PATCH 63/96] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -8109,10 +8110,10 @@ index 938ad26..e4ca56d 100644 1.9.1 -From d52bd6e79950f7ca1658b15ce31c48d0b0961e0c Mon Sep 17 00:00:00 2001 +From 96d631b30b33312b8041ece09a5660740e9bade3 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 +Subject: [PATCH 64/96] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -8154,17 +8155,17 @@ index b3fe510..df5fe9b 100644 1.9.1 -From 5fafa2aa4aaa519cd0a715bb42f1e04e9f611c52 Mon Sep 17 00:00:00 2001 +From 2594e2e409853924926bc3330d3bee0280c2c298 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 +Subject: [PATCH 65/96] 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 dfac0a4..4e6db55 100644 +index 3b7dbe1..6c5acfb 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ using namespace ActiveAE; @@ -8182,10 +8183,10 @@ index dfac0a4..4e6db55 100644 1.9.1 -From 6ca6b62d857147abc861f00553166c0426b0d8bf Mon Sep 17 00:00:00 2001 +From fd891b820c51301bda8391b1b599d4b10a44648f 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 +Subject: [PATCH 66/96] Revert "vdpau: comment some features that will be added later" This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. @@ -8241,10 +8242,10 @@ index cd72cc6..351586a 100644 1.9.1 -From dd9e5dce5fafc595cda72b9f5b367f6fd332673b Mon Sep 17 00:00:00 2001 +From 86b169528568416e4fe5a1dc718021d06ff78d26 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 +Subject: [PATCH 67/96] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8267,10 +8268,10 @@ index e4ca56d..b20130c 100644 1.9.1 -From 8b04eda34a487b5ffe2fb2a2765478b958733885 Mon Sep 17 00:00:00 2001 +From c7461145c0659e131b23fcc129739a1b06da1495 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 +Subject: [PATCH 68/96] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8293,10 +8294,10 @@ index b20130c..a38890c 100644 1.9.1 -From ef280d82f393c31fe1a6b43d49528ab051d54d16 Mon Sep 17 00:00:00 2001 +From f6fb3317cae4a96300b8c761c582410911d12f1f 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 +Subject: [PATCH 69/96] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -8351,10 +8352,10 @@ index ee6bb69..364b45a 100644 1.9.1 -From d0b999b360b2f3dd7a1d6ad4042a3f51a2bda9d7 Mon Sep 17 00:00:00 2001 +From 0112e8256276aa87c5587cd53914eb3b84b3e53a 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 +Subject: [PATCH 70/96] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8377,10 +8378,10 @@ index df5fe9b..d8e04d6 100644 1.9.1 -From 835137c5582496b80f9f9aa0b7fec59517643192 Mon Sep 17 00:00:00 2001 +From 60af8bad18fc0b752ff179039d0410401fdbcad2 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 +Subject: [PATCH 71/96] X11: do not poll default monitor --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8403,10 +8404,10 @@ index d8e04d6..01f5272 100644 1.9.1 -From 96e8922ff37d9f98f80eb23f6401aabaacbbbaf4 Mon Sep 17 00:00:00 2001 +From 0a2561c6afe499cea97e6f806db3a0be47eba77e 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 +Subject: [PATCH 72/96] X11: fix broken monitor switching --- system/settings/settings.xml | 1 - @@ -8414,10 +8415,10 @@ 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 2a59885..1f99ed9 100644 +index 798be52..890bb10 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2300,7 +2300,6 @@ +@@ -2304,7 +2304,6 @@ -1 @@ -8426,10 +8427,10 @@ index 2a59885..1f99ed9 100644 diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp -index 40bc3b3..1663836 100644 +index efb6cb1..da5873f 100644 --- a/xbmc/settings/DisplaySettings.cpp +++ b/xbmc/settings/DisplaySettings.cpp -@@ -219,19 +219,13 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) +@@ -219,8 +219,7 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) const std::string &settingId = setting->GetId(); if (settingId == "videoscreen.resolution" || @@ -8439,9 +8440,10 @@ index 40bc3b3..1663836 100644 { RESOLUTION newRes = RES_DESKTOP; if (settingId == "videoscreen.resolution") - newRes = (RESOLUTION)((CSettingInt*)setting)->GetValue(); - else if (settingId == "videoscreen.screen") +@@ -236,11 +235,6 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) + // get desktop resolution for screen newRes = GetResolutionForScreen(); + } - else if (settingId == "videoscreen.monitor") - { - g_Windowing.UpdateResolutions(); @@ -8450,7 +8452,7 @@ index 40bc3b3..1663836 100644 string screenmode = GetStringFromResolution(newRes); CSettings::Get().SetString("videoscreen.screenmode", screenmode); -@@ -242,11 +236,7 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) +@@ -251,11 +245,7 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) RESOLUTION newRes = GetResolutionFromString(((CSettingString*)setting)->GetValue()); SetCurrentResolution(newRes, false); @@ -8463,7 +8465,7 @@ index 40bc3b3..1663836 100644 // check if the old or the new resolution was/is windowed // in which case we don't show any prompt to the user -@@ -265,6 +255,28 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) +@@ -274,6 +264,28 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) m_resolutionChangeAborted = false; } } @@ -8492,7 +8494,7 @@ index 40bc3b3..1663836 100644 else if (settingId == "videoscreen.monitorsingle") { g_Windowing.UpdateResolutions(); -@@ -688,9 +700,11 @@ void CDisplaySettings::SettingOptionsMonitorsFiller(const CSetting *setting, std +@@ -708,9 +720,11 @@ void CDisplaySettings::SettingOptionsMonitorsFiller(const CSetting *setting, std #if defined(HAS_GLX) std::vector monitors; g_Windowing.GetConnectedOutputs(&monitors); @@ -8509,10 +8511,10 @@ index 40bc3b3..1663836 100644 1.9.1 -From 775f267796bfaae8221cca4d54adac89efcd75b0 Mon Sep 17 00:00:00 2001 +From 24589dce42bebc68ae203a6c1e87b06f0e402302 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 +Subject: [PATCH 73/96] X11: remove polling for connected outputs, use xrr events --- @@ -8813,10 +8815,10 @@ index 7ec5be4..14622cb 100644 1.9.1 -From 9ec08d611c0591ed93aa3c279ae84cb8edbaa1f9 Mon Sep 17 00:00:00 2001 +From e84bb7507d0ed31b25ab3a2124b57b44e768e3d3 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 +Subject: [PATCH 74/96] X11: remove grabbing of keyboard and mouse --- xbmc/windowing/WinEventsX11.cpp | 4 ---- @@ -8934,10 +8936,10 @@ index 14622cb..d1c8729 100644 1.9.1 -From d229927f1cb262c71937a0750cbaea3dfacf1d6e Mon Sep 17 00:00:00 2001 +From 3ead8999a2b3509f552b4a0f6be22df4f7b3954f 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 +Subject: [PATCH 75/96] X11: set ExposureMask on gl window, fixes not updated areas --- @@ -8963,10 +8965,10 @@ index 695b352..e55583c 100644 1.9.1 -From 518d0e7e359c9b385993c6378a841aa9826e3a0f Mon Sep 17 00:00:00 2001 +From 56dcd536fd8135ec06ef4cf317db86858ead89c8 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 +Subject: [PATCH 76/96] X11: drop shortcuts, have WM do this --- xbmc/windowing/WinEventsX11.cpp | 21 --------------------- @@ -9028,20 +9030,20 @@ index 6429291..4334d21 100644 1.9.1 -From 7c55f82a3266e790deecafb9d00d8c3fc36636d0 Mon Sep 17 00:00:00 2001 +From 7c7bd83bede5ceaaca6e153486bef8d66662c4c5 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 +Subject: [PATCH 77/96] 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 1f99ed9..185d7ee 100644 +index 890bb10..124a14d 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2260,6 +2260,7 @@ +@@ -2264,6 +2264,7 @@ HAS_GLX 0 false @@ -9053,10 +9055,10 @@ index 1f99ed9..185d7ee 100644 1.9.1 -From aab6c228634732821bfbc3fe6d6ec0429f4713fc Mon Sep 17 00:00:00 2001 +From 97bc3eb5a047e69019c70221d35e478c4b66a363 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 +Subject: [PATCH 78/96] X11: adapt to changes in cstdstring --- xbmc/windowing/X11/WinSystemX11.cpp | 4 ++-- @@ -9104,10 +9106,10 @@ index 8525ede..c94f2e3 100644 1.9.1 -From b08353460d87b060093bfbf08051af77528f304e Mon Sep 17 00:00:00 2001 +From bd0d10452531941af72d9de8c920574312108608 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 +Subject: [PATCH 79/96] ActiveAE: correct time of buffered samples by resample ratio --- @@ -9116,7 +9118,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 4e6db55..86c4dd9 100644 +index 6c5acfb..3ed310a 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) @@ -9144,10 +9146,10 @@ index 99989b3..0287e73 100644 1.9.1 -From db5080a48ed833c7d47c61c96d87dac841243667 Mon Sep 17 00:00:00 2001 +From 2ec9169c90eb33866d139a09b38ff04018cae905 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 +Subject: [PATCH 80/96] ffmpeg demuxer: faster channel change for PVR addons without internal demuxing (such as MediaPortal, ArgusTV, MythTV, NextPVR) Credits: FernetMenta, Davilla, Popcornmix, Whaupt @@ -9461,10 +9463,10 @@ index ca689d0..f383563 100644 1.9.1 -From 31093f81bd7906712b638f8f25a9570458788c17 Mon Sep 17 00:00:00 2001 +From 1c6901d50fc7b5d499e423fd2d5721da1913c203 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 +Subject: [PATCH 81/96] ffmpeg demuxer: make sure we start mpegts video with an i-frame --- @@ -9548,10 +9550,10 @@ index acde9a8..9ec0877 100644 1.9.1 -From 89db9ce2b2b94b95fde1ba230b9f72d602fa62b5 Mon Sep 17 00:00:00 2001 +From 75043ecb88a683165524d49f5cdd6809af3443fd 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 +Subject: [PATCH 82/96] DVDFactoryDemuxer: skip streaminfo for udp tcp and pvr-channels --- @@ -9675,10 +9677,10 @@ index b94e94c..b45630f 100644 1.9.1 -From 73a6d71ce880a06deb38aa16303c5279e21f7561 Mon Sep 17 00:00:00 2001 +From 3041272619e91e0b028462b53c59bd0cf620e1f9 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 +Subject: [PATCH 83/96] squash fast switch --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 23 ++++++++++++++-------- @@ -9744,10 +9746,10 @@ index d5da14b..f4ba29c 100644 1.9.1 -From 45e87edb31eee5805551231cbe9e416530ec2d64 Mon Sep 17 00:00:00 2001 +From c70b0943cb55465cde76dde9a2dbcf4db1ced09b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 22 Dec 2013 14:52:29 +0100 -Subject: [PATCH 84/93] linux: add shared lib for sse4 operations +Subject: [PATCH 84/96] linux: add shared lib for sse4 operations --- Makefile.in | 8 ++- @@ -9788,7 +9790,7 @@ index 6f689cf..a79adc7 100644 externals: codecs libs visualizations screensavers libaddon pvraddons diff --git a/configure.in b/configure.in -index d5ff793..cf49292 100644 +index d0775a9..6cf2a44 100644 --- a/configure.in +++ b/configure.in @@ -883,6 +883,19 @@ if test "$use_static_ffmpeg" = "yes"; then @@ -10042,10 +10044,10 @@ index 0000000..45aa826 1.9.1 -From b16c5714e67f362e9227547a6cb9e4db63049941 Mon Sep 17 00:00:00 2001 +From d8669de8aeb2268b9ae0b91602215b4890366f15 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 19 Dec 2013 15:36:11 +0100 -Subject: [PATCH 85/93] vaapi: option to enable sw filters +Subject: [PATCH 85/96] vaapi: option to enable sw filters --- language/English/strings.po | 17 ++- @@ -10055,9 +10057,9 @@ Subject: [PATCH 85/93] vaapi: option to enable sw filters .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 76 ++++++++-- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 3 + xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 154 +++++++++++++++++++++ - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h | 36 ++++- + xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h | 34 +++++ xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 32 ++--- - 9 files changed, 296 insertions(+), 42 deletions(-) + 9 files changed, 295 insertions(+), 41 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po index 9cc2090..88b945e 100755 @@ -10095,7 +10097,7 @@ index 9cc2090..88b945e 100755 #: system/settings/settings.xml diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 185d7ee..84857a9 100644 +index 124a14d..fdf5f41 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -715,6 +715,21 @@ @@ -10550,18 +10552,10 @@ index bfefc9d..51f9bed 100644 + #endif diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -index a520e42..3541c9c 100644 +index a520e42..755c192 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -@@ -22,14 +22,19 @@ - #include "system_gl.h" - - #include "DllAvCodec.h" -+ - #include "DVDVideoCodecFFmpeg.h" --#include - #include - #include +@@ -29,7 +29,12 @@ #include #include #include @@ -10702,10 +10696,10 @@ index 9c5469b..b30e450 100644 1.9.1 -From 47e4cf354197dc5188d1632d61226075fe2edb79 Mon Sep 17 00:00:00 2001 +From a866228fc54a4e95423387a83c8de012e247efc3 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 +Subject: [PATCH 86/96] X11: check for user output on resize window --- xbmc/windowing/X11/WinSystemX11.cpp | 17 ++++++++++++++--- @@ -10750,10 +10744,10 @@ index 9962f08..c95f4ec 100644 1.9.1 -From 05e3a34ee94cf92cb3852fc75eaf500a29c68058 Mon Sep 17 00:00:00 2001 +From a153c72c0b53c9cbad7fc545abb7730e8eecaf19 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 +Subject: [PATCH 87/96] dvdplayer: flush ffmpeg after hw decoder returned an error --- @@ -10793,10 +10787,10 @@ index 2df9de9..f4c9929 100644 1.9.1 -From e0305c0e6a652ea051df176a60bcfe95d27ea95d Mon Sep 17 00:00:00 2001 +From d4e3e0920e61b7115b1053010fc7a00e1631e04a 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 +Subject: [PATCH 88/96] xbmc pr 3080 --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 14 ++++++++++++-- @@ -10838,10 +10832,10 @@ index f4c9929..283af9e 100644 1.9.1 -From 8d888e4a4d1708ab92886bc6c0f385d7203c5f4c Mon Sep 17 00:00:00 2001 +From 23e4b30e3463b01d5f9acf1287767ca96c88fdb0 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 +Subject: [PATCH 89/96] set preatpicture if pts is equal to last frame --- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 8 ++++++++ @@ -10871,10 +10865,10 @@ index 283af9e..ff18b73 100644 1.9.1 -From 3bc5d692439ef18257ab31173b6e2c8eadb164ad Mon Sep 17 00:00:00 2001 +From 3732925c369d10341ed813ea6c0775ea5ecc1cb5 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 +Subject: [PATCH 90/96] Introduce SWCodec - these are codecs that don't have any GPU acceleration (yet) - add HVEC --- @@ -10989,10 +10983,10 @@ index c43351d..7075f05 100644 1.9.1 -From e79bda1a3b664e591a86361cdc282e2484d14480 Mon Sep 17 00:00:00 2001 +From 552f5cec0cd0a753fcd920a1d5d7b3eb6d37e696 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 +Subject: [PATCH 91/96] ActiveAE: add some debug logging --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp | 6 ++++++ @@ -11020,15 +11014,162 @@ index 0287e73..6904cb9 100644 1.9.1 -From 445a8fa7e24853d4a0f9f9c788bf60642f633ddf Mon Sep 17 00:00:00 2001 +From b10b79798aa7827134f34e5ad436e491a402cf77 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Tue, 1 Apr 2014 15:45:16 +0200 +Subject: [PATCH 92/96] X11: remove obsolete sdl include + +--- + xbmc/windowing/X11/WinSystemX11.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h +index d1c8729..5489543 100644 +--- a/xbmc/windowing/X11/WinSystemX11.h ++++ b/xbmc/windowing/X11/WinSystemX11.h +@@ -25,7 +25,6 @@ + + #include "system_gl.h" + #include +-#include + + #include "windowing/WinSystem.h" + #include "utils/Stopwatch.h" +-- +1.9.1 + + +From da2f57d73f6df8892b759b465ee47d9401b390f9 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 13 Apr 2014 10:52:26 +0200 +Subject: [PATCH 93/96] squash fast channel + +--- + xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 13 ++++++++++--- + xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h | 1 + + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +index f4ba29c..ca545c0 100644 +--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp ++++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +@@ -220,6 +220,7 @@ CDVDDemuxFFmpeg::CDVDDemuxFFmpeg() : CDVDDemux() + m_pkt.result = -1; + memset(&m_pkt.pkt, 0, sizeof(AVPacket)); + m_streaminfo = true; /* set to true if we want to look for streams before playback */ ++ m_checkvideo = false; + } + + CDVDDemuxFFmpeg::~CDVDDemuxFFmpeg() +@@ -448,11 +449,10 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo) + if (iformat && (strcmp(iformat->name, "mjpeg") == 0) && m_ioContext->seekable == 0) + m_pFormatContext->max_analyze_duration = 500000; + +- bool short_analyze = false; + if (iformat && (strcmp(iformat->name, "mpegts") == 0)) + { + m_pFormatContext->max_analyze_duration = 500000; +- short_analyze = true; ++ m_checkvideo = true; + } + + // we need to know if this is matroska or avi later +@@ -484,14 +484,17 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo) + } + CLog::Log(LOGDEBUG, "%s - av_find_stream_info finished", __FUNCTION__); + +- if (short_analyze) ++ if (m_checkvideo) + { + // make sure we start video with an i-frame + ResetVideoStreams(); + } + } + else ++ { + m_program = 0; ++ m_checkvideo = true; ++ } + + // reset any timeout + m_timeout.SetInfinite(); +@@ -1784,6 +1787,10 @@ bool CDVDDemuxFFmpeg::IsVideoReady() + { + AVStream *st; + bool hasVideo = false; ++ ++ if(!m_checkvideo) ++ return true; ++ + if(m_program != UINT_MAX) + { + for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) +diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h +index 9ec0877..c8d706b 100644 +--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h ++++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h +@@ -166,5 +166,6 @@ protected: + bool m_bPtsWrap, m_bPtsWrapChecked; + int64_t m_iStartTime, m_iMaxTime, m_iEndTime; + bool m_streaminfo; ++ bool m_checkvideo; + }; + +-- +1.9.1 + + +From 303fbf8b6724f2a01cb0ed213922dc8a6bd57b01 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 13 Apr 2014 15:34:26 +0200 +Subject: [PATCH 94/96] X11: do not call xrandr until we have a window + +--- + xbmc/windowing/X11/WinSystemX11.cpp | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp +index c95f4ec..d1e6c1f 100644 +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -243,15 +243,17 @@ bool CWinSystemX11::SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool bl + } + + // only call xrandr if mode changes +- if (currmode.w != mode.w || currmode.h != mode.h || +- currmode.hz != mode.hz || currmode.id != mode.id) ++ if (m_mainWindow) + { +- CLog::Log(LOGNOTICE, "CWinSystemX11::SetFullScreen - calling xrandr"); +- OnLostDevice(); +- m_bIsInternalXrr = true; +- g_xrandr.SetMode(out, mode); +- if (m_mainWindow) ++ if (currmode.w != mode.w || currmode.h != mode.h || ++ currmode.hz != mode.hz || currmode.id != mode.id) ++ { ++ CLog::Log(LOGNOTICE, "CWinSystemX11::SetFullScreen - calling xrandr"); ++ OnLostDevice(); ++ m_bIsInternalXrr = true; ++ g_xrandr.SetMode(out, mode); + return true; ++ } + } + } + #endif +-- +1.9.1 + + +From 836de0e5d789ea37b526d5869477f356c5cebfd1 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 +Date: Wed, 16 Apr 2014 12:40:42 +0300 +Subject: [PATCH 95/96] vaapi: fix build --- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 13 ++----------- - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h | 6 +----- - 2 files changed, 3 insertions(+), 16 deletions(-) + xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h | 5 ----- + 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp index 51f9bed..f957393 100644 @@ -11073,20 +11214,10 @@ index 51f9bed..f957393 100644 frame->data[0] = m_frame_buffer + image.offsets[0]; frame->linesize[0] = image.pitches[0]; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -index 3541c9c..49d3117 100644 +index 755c192..b6fb320 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -@@ -22,8 +22,8 @@ - #include "system_gl.h" - - #include "DllAvCodec.h" -- - #include "DVDVideoCodecFFmpeg.h" -+#include - #include - #include - #include -@@ -31,10 +31,6 @@ +@@ -31,11 +31,6 @@ #include #include "linux/sse4/DllLibSSE4.h" @@ -11094,17 +11225,18 @@ index 3541c9c..49d3117 100644 -#include "libavcodec/vaapi.h" -#include "libavcodec/avcodec.h" -} - +- namespace VAAPI { + typedef boost::shared_ptr VASurfacePtr; -- 1.9.1 -From 99374a345edf869893c50e48f40af2f11918a880 Mon Sep 17 00:00:00 2001 +From d54319d818ed995076e5e4470673891788d0ef8e 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 +Subject: [PATCH 96/96] no hevc in ffmpeg 1.2 --- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 6 ++++-- diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.03-check_suspend_state.patch b/packages/mediacenter/xbmc/patches/xbmc-995.03-check_suspend_state.patch deleted file mode 100644 index 64204c7e84..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-995.03-check_suspend_state.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5c2362940defe41799d9d46aad4d31c391f342e8 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Mon, 14 Apr 2014 18:05:34 +0200 -Subject: [PATCH] ActiveAE: check suspend state before creating a stream - ---- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index a613004..e118294 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -2632,6 +2632,9 @@ bool CActiveAE::ResampleSound(CActiveAESound *sound) - - IAEStream *CActiveAE::MakeStream(enum AEDataFormat dataFormat, unsigned int sampleRate, unsigned int encodedSampleRate, CAEChannelInfo channelLayout, unsigned int options) - { -+ if (IsSuspended()) -+ return NULL; -+ - //TODO: pass number of samples in audio packet - - AEAudioFormat format; --- -1.9.1 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.80.001-PR4562.patch b/packages/mediacenter/xbmc/patches/xbmc-999.80.001-PR4562.patch deleted file mode 100644 index a60c4b0b82..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-999.80.001-PR4562.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 0c510ff6acea4a9afc049006ad8a173256aa8290 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sat, 12 Apr 2014 18:13:32 +0200 -Subject: [PATCH 1/2] flac demuxer: improve seeking - ---- - lib/ffmpeg/libavcodec/flac_parser.c | 8 +++++++ - lib/ffmpeg/libavformat/flacdec.c | 45 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 53 insertions(+) - -diff --git a/lib/ffmpeg/libavcodec/flac_parser.c b/lib/ffmpeg/libavcodec/flac_parser.c -index e2c6744..0b7bf9b 100644 ---- a/lib/ffmpeg/libavcodec/flac_parser.c -+++ b/lib/ffmpeg/libavcodec/flac_parser.c -@@ -468,6 +468,14 @@ static int get_best_header(FLACParseContext* fpc, const uint8_t **poutbuf, - &fpc->wrap_buf, - &fpc->wrap_buf_allocated_size); - -+ -+ if (fpc->pc->flags & PARSER_FLAG_USE_CODEC_TS){ -+ if (header->fi.is_var_size) -+ fpc->pc->pts = header->fi.frame_or_sample_num; -+ else if (header->best_child) -+ fpc->pc->pts = header->fi.frame_or_sample_num * header->fi.blocksize; -+ } -+ - fpc->best_header_valid = 0; - /* Return the negative overread index so the client can compute pos. - This should be the amount overread to the beginning of the child */ -diff --git a/lib/ffmpeg/libavformat/flacdec.c b/lib/ffmpeg/libavformat/flacdec.c -index ecc47e6..66c8809 100644 ---- a/lib/ffmpeg/libavformat/flacdec.c -+++ b/lib/ffmpeg/libavformat/flacdec.c -@@ -284,12 +284,57 @@ static int flac_probe(AVProbeData *p) - else return AVPROBE_SCORE_MAX/2; - } - -+static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_index, -+ int64_t *ppos, int64_t pos_limit) -+{ -+ AVPacket pkt, out_pkt; -+ AVStream *st = s->streams[stream_index]; -+ int ret; -+ -+ if (avio_seek(s->pb, *ppos, SEEK_SET) < 0) -+ return AV_NOPTS_VALUE; -+ -+ av_init_packet(&pkt); -+ st->parser = av_parser_init(st->codec->codec_id); -+ if (!st->parser){ -+ return AV_NOPTS_VALUE; -+ } -+ st->parser->flags |= PARSER_FLAG_USE_CODEC_TS; -+ -+ for (;;){ -+ ret = ff_raw_read_partial_packet(s, &pkt); -+ if (ret < 0){ -+ if (ret == AVERROR(EAGAIN)) -+ continue; -+ else -+ return AV_NOPTS_VALUE; -+ } -+ av_init_packet(&out_pkt); -+ ret = av_parser_parse2(st->parser, st->codec, -+ &out_pkt.data, &out_pkt.size, pkt.data, pkt.size, -+ pkt.pts, pkt.dts, *ppos); -+ -+ if (out_pkt.size){ -+ int size = out_pkt.size; -+ av_free_packet(&out_pkt); -+ if (st->parser->pts != AV_NOPTS_VALUE){ -+ // seeking may not have started from beginning of a frame -+ // calculate frame start position from next frame backwards -+ *ppos = st->parser->next_frame_offset - size; -+ return st->parser->pts; -+ } -+ } -+ } -+ return AV_NOPTS_VALUE; -+} -+ - AVInputFormat ff_flac_demuxer = { - .name = "flac", - .long_name = NULL_IF_CONFIG_SMALL("raw FLAC"), - .read_probe = flac_probe, - .read_header = flac_read_header, - .read_packet = ff_raw_read_partial_packet, -+ .read_timestamp = flac_read_timestamp, - .flags = AVFMT_GENERIC_INDEX, - .extensions = "flac", - .raw_codec_id = AV_CODEC_ID_FLAC, --- -1.9.1 - - -From f6a8444f36675da5df96ddc10e6b54160319675e Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Mon, 14 Apr 2014 18:50:30 +0200 -Subject: [PATCH 2/2] ffmpeg: backport flac seeking patch - ---- - .../0072-flac-demuxer-improve-seeking.patch | 94 ++++++++++++++++++++++ - 1 file changed, 94 insertions(+) - create mode 100644 lib/ffmpeg/patches/0072-flac-demuxer-improve-seeking.patch - -diff --git a/lib/ffmpeg/patches/0072-flac-demuxer-improve-seeking.patch b/lib/ffmpeg/patches/0072-flac-demuxer-improve-seeking.patch -new file mode 100644 -index 0000000..a6b6488 ---- /dev/null -+++ b/lib/ffmpeg/patches/0072-flac-demuxer-improve-seeking.patch -@@ -0,0 +1,94 @@ -+From 0c510ff6acea4a9afc049006ad8a173256aa8290 Mon Sep 17 00:00:00 2001 -+From: Rainer Hochecker -+Date: Sat, 12 Apr 2014 18:13:32 +0200 -+Subject: [PATCH] flac demuxer: improve seeking -+ -+--- -+ lib/ffmpeg/libavcodec/flac_parser.c | 8 +++++++ -+ lib/ffmpeg/libavformat/flacdec.c | 45 +++++++++++++++++++++++++++++++++++++ -+ 2 files changed, 53 insertions(+) -+ -+diff --git a/lib/ffmpeg/libavcodec/flac_parser.c b/lib/ffmpeg/libavcodec/flac_parser.c -+index e2c6744..0b7bf9b 100644 -+--- a/lib/ffmpeg/libavcodec/flac_parser.c -++++ b/lib/ffmpeg/libavcodec/flac_parser.c -+@@ -468,6 +468,14 @@ static int get_best_header(FLACParseContext* fpc, const uint8_t **poutbuf, -+ &fpc->wrap_buf, -+ &fpc->wrap_buf_allocated_size); -+ -++ -++ if (fpc->pc->flags & PARSER_FLAG_USE_CODEC_TS){ -++ if (header->fi.is_var_size) -++ fpc->pc->pts = header->fi.frame_or_sample_num; -++ else if (header->best_child) -++ fpc->pc->pts = header->fi.frame_or_sample_num * header->fi.blocksize; -++ } -++ -+ fpc->best_header_valid = 0; -+ /* Return the negative overread index so the client can compute pos. -+ This should be the amount overread to the beginning of the child */ -+diff --git a/lib/ffmpeg/libavformat/flacdec.c b/lib/ffmpeg/libavformat/flacdec.c -+index ecc47e6..66c8809 100644 -+--- a/lib/ffmpeg/libavformat/flacdec.c -++++ b/lib/ffmpeg/libavformat/flacdec.c -+@@ -284,12 +284,57 @@ static int flac_probe(AVProbeData *p) -+ else return AVPROBE_SCORE_MAX/2; -+ } -+ -++static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_index, -++ int64_t *ppos, int64_t pos_limit) -++{ -++ AVPacket pkt, out_pkt; -++ AVStream *st = s->streams[stream_index]; -++ int ret; -++ -++ if (avio_seek(s->pb, *ppos, SEEK_SET) < 0) -++ return AV_NOPTS_VALUE; -++ -++ av_init_packet(&pkt); -++ st->parser = av_parser_init(st->codec->codec_id); -++ if (!st->parser){ -++ return AV_NOPTS_VALUE; -++ } -++ st->parser->flags |= PARSER_FLAG_USE_CODEC_TS; -++ -++ for (;;){ -++ ret = ff_raw_read_partial_packet(s, &pkt); -++ if (ret < 0){ -++ if (ret == AVERROR(EAGAIN)) -++ continue; -++ else -++ return AV_NOPTS_VALUE; -++ } -++ av_init_packet(&out_pkt); -++ ret = av_parser_parse2(st->parser, st->codec, -++ &out_pkt.data, &out_pkt.size, pkt.data, pkt.size, -++ pkt.pts, pkt.dts, *ppos); -++ -++ if (out_pkt.size){ -++ int size = out_pkt.size; -++ av_free_packet(&out_pkt); -++ if (st->parser->pts != AV_NOPTS_VALUE){ -++ // seeking may not have started from beginning of a frame -++ // calculate frame start position from next frame backwards -++ *ppos = st->parser->next_frame_offset - size; -++ return st->parser->pts; -++ } -++ } -++ } -++ return AV_NOPTS_VALUE; -++} -++ -+ AVInputFormat ff_flac_demuxer = { -+ .name = "flac", -+ .long_name = NULL_IF_CONFIG_SMALL("raw FLAC"), -+ .read_probe = flac_probe, -+ .read_header = flac_read_header, -+ .read_packet = ff_raw_read_partial_packet, -++ .read_timestamp = flac_read_timestamp, -+ .flags = AVFMT_GENERIC_INDEX, -+ .extensions = "flac", -+ .raw_codec_id = AV_CODEC_ID_FLAC, -+-- -+1.9.1 -+ --- -1.9.1 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.80.008-PR4491.patch b/packages/mediacenter/xbmc/patches/xbmc-999.80.008-PR4491.patch deleted file mode 100644 index 6e324f9c5e..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-999.80.008-PR4491.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 9707c09eb7a14c66a8f1fcacce1ca76c640aa441 Mon Sep 17 00:00:00 2001 -From: ruuk -Date: Sun, 30 Mar 2014 11:22:23 -0700 -Subject: [PATCH] Added optional parameter 'ignoreCache' to xbmc.playSFX() - Added parameter 'ignoreCache' to g_audioManager.PlayPythonSound() When - ignoreCache is true, PlayPythonSound no frees any matching cached sound - before continuing - ---- - xbmc/guilib/GUIAudioManager.cpp | 14 +++++++++++--- - xbmc/guilib/GUIAudioManager.h | 2 +- - xbmc/interfaces/legacy/ModuleXbmc.cpp | 4 ++-- - xbmc/interfaces/legacy/ModuleXbmc.h | 3 ++- - 4 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/xbmc/guilib/GUIAudioManager.cpp b/xbmc/guilib/GUIAudioManager.cpp -index aeb83a6..d0893e7 100644 ---- a/xbmc/guilib/GUIAudioManager.cpp -+++ b/xbmc/guilib/GUIAudioManager.cpp -@@ -131,7 +131,7 @@ void CGUIAudioManager::PlayWindowSound(int id, WINDOW_SOUND event) - } - - // \brief Play a sound given by filename --void CGUIAudioManager::PlayPythonSound(const CStdString& strFileName) -+void CGUIAudioManager::PlayPythonSound(const CStdString& strFileName, bool ignoreCache) - { - CSingleLock lock(m_cs); - -@@ -144,8 +144,16 @@ void CGUIAudioManager::PlayPythonSound(const CStdString& strFileName) - if (itsb != m_pythonSounds.end()) - { - IAESound* sound = itsb->second; -- sound->Play(); -- return; -+ if (ignoreCache) -+ { -+ FreeSound(sound); -+ m_pythonSounds.erase(itsb); -+ } -+ else -+ { -+ sound->Play(); -+ return; -+ } - } - - IAESound *sound = LoadSound(strFileName); -diff --git a/xbmc/guilib/GUIAudioManager.h b/xbmc/guilib/GUIAudioManager.h -index ab0d965..a38f579 100644 ---- a/xbmc/guilib/GUIAudioManager.h -+++ b/xbmc/guilib/GUIAudioManager.h -@@ -66,7 +66,7 @@ class CGUIAudioManager : public ISettingCallback - - void PlayActionSound(const CAction& action); - void PlayWindowSound(int id, WINDOW_SOUND event); -- void PlayPythonSound(const CStdString& strFileName); -+ void PlayPythonSound(const CStdString& strFileName, bool ignoreCache); - - void Enable(bool bEnable); - void SetVolume(float level); -diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp -index 6507155..28a865f 100644 ---- a/xbmc/interfaces/legacy/ModuleXbmc.cpp -+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp -@@ -325,7 +325,7 @@ - return g_infoManager.GetImage(ret, WINDOW_INVALID); - } - -- void playSFX(const char* filename) -+ void playSFX(const char* filename, bool ignoreCache) - { - XBMC_TRACE; - if (!filename) -@@ -333,7 +333,7 @@ - - if (XFILE::CFile::Exists(filename)) - { -- g_audioManager.PlayPythonSound(filename); -+ g_audioManager.PlayPythonSound(filename,ignoreCache); - } - } - -diff --git a/xbmc/interfaces/legacy/ModuleXbmc.h b/xbmc/interfaces/legacy/ModuleXbmc.h -index f26fa93..35c20e3 100644 ---- a/xbmc/interfaces/legacy/ModuleXbmc.h -+++ b/xbmc/interfaces/legacy/ModuleXbmc.h -@@ -223,11 +223,12 @@ - * playSFX(filename) -- Plays a wav file by filename - * - * filename : string - filename of the wav file to play. -+ * ignoreCache : [opt] bool - True = Ignores any previously cached wav associated with filename - * - * example: - * - xbmc.playSFX('special://xbmc/scripts/dingdong.wav') - */ -- void playSFX(const char* filename); -+ void playSFX(const char* filename, bool ignoreCache = false); - - /** - * stopSFX() -- Stops wav file --- -1.9.1 -