From d7ec6ab0a9570302d1aa29c3c507d2190f03dd1e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 4 Nov 2013 18:06:00 +0200 Subject: [PATCH] xbmc: update to xbmc-13.alpha-fd297a5 --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/package.mk | 2 +- ...add_as.xml_busy_dialog_delay_control.patch | 57 -- ...mc-995.01-fernetmenta-fixes-81fd4d3.patch} | 487 +++++------------- 4 files changed, 139 insertions(+), 409 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-503-add_as.xml_busy_dialog_delay_control.patch rename packages/mediacenter/xbmc/patches/{xbmc-995.01-fernetmenta-fixes-b17818b.patch => xbmc-995.01-fernetmenta-fixes-81fd4d3.patch} (95%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index e8b6f2c30c..247e1555be 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="13.alpha-2975e4a" +PKG_VERSION="13.alpha-fd297a5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 1610ce4765..65ac4227e1 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13.alpha-2975e4a" +PKG_VERSION="13.alpha-fd297a5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-503-add_as.xml_busy_dialog_delay_control.patch b/packages/mediacenter/xbmc/patches/xbmc-503-add_as.xml_busy_dialog_delay_control.patch deleted file mode 100644 index 88807638f3..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-503-add_as.xml_busy_dialog_delay_control.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur xbmc-13.alpha-6edea14/xbmc/cores/dvdplayer/DVDPlayer.cpp xbmc-13.alpha-6edea14.patch/xbmc/cores/dvdplayer/DVDPlayer.cpp ---- xbmc-13.alpha-6edea14/xbmc/cores/dvdplayer/DVDPlayer.cpp 2013-08-02 16:28:51.000000000 +0200 -+++ xbmc-13.alpha-6edea14.patch/xbmc/cores/dvdplayer/DVDPlayer.cpp 2013-08-02 17:19:34.162512140 +0200 -@@ -479,7 +479,7 @@ - #endif - - Create(); -- if(!m_ready.WaitMSec(100)) -+ if(!m_ready.WaitMSec(g_advancedSettings.m_videoBusyDialogDelay_ms)) - { - CGUIDialogBusy* dialog = (CGUIDialogBusy*)g_windowManager.GetWindow(WINDOW_DIALOG_BUSY); - if(dialog) -diff -Naur xbmc-13.alpha-6edea14/xbmc/cores/omxplayer/OMXPlayer.cpp xbmc-13.alpha-6edea14.patch/xbmc/cores/omxplayer/OMXPlayer.cpp ---- xbmc-13.alpha-6edea14/xbmc/cores/omxplayer/OMXPlayer.cpp 2013-08-02 16:28:51.000000000 +0200 -+++ xbmc-13.alpha-6edea14.patch/xbmc/cores/omxplayer/OMXPlayer.cpp 2013-08-02 17:19:34.164512143 +0200 -@@ -522,7 +522,7 @@ - #endif - - Create(); -- if(!m_ready.WaitMSec(100)) -+ if(!m_ready.WaitMSec(g_advancedSettings.m_videoBusyDialogDelay_ms)) - { - CGUIDialogBusy* dialog = (CGUIDialogBusy*)g_windowManager.GetWindow(WINDOW_DIALOG_BUSY); - if(dialog) -diff -Naur xbmc-13.alpha-6edea14/xbmc/settings/AdvancedSettings.cpp xbmc-13.alpha-6edea14.patch/xbmc/settings/AdvancedSettings.cpp ---- xbmc-13.alpha-6edea14/xbmc/settings/AdvancedSettings.cpp 2013-08-02 16:28:51.000000000 +0200 -+++ xbmc-13.alpha-6edea14.patch/xbmc/settings/AdvancedSettings.cpp 2013-08-02 17:21:43.772739525 +0200 -@@ -184,6 +184,7 @@ - - m_videoDefaultLatency = 0.0; - m_videoDisableHi10pMultithreading = false; -+ m_videoBusyDialogDelay_ms = 100; - - m_musicUseTimeSeeking = true; - m_musicTimeSeekForward = 10; -@@ -700,6 +701,10 @@ - //0 = disable fps detect, 1 = only detect on timestamps with uniform spacing, 2 detect on all timestamps - XMLUtils::GetInt(pElement, "fpsdetect", m_videoFpsDetect, 0, 2); - -+ // controls the delay, in milliseconds, until -+ // the busy dialog is shown when starting video playback. -+ XMLUtils::GetInt(pElement, "busydialogdelayms", m_videoBusyDialogDelay_ms, 0, 1000); -+ - // Store global display latency settings - TiXmlElement* pVideoLatency = pElement->FirstChildElement("latency"); - if (pVideoLatency) -diff -Naur xbmc-13.alpha-6edea14/xbmc/settings/AdvancedSettings.h xbmc-13.alpha-6edea14.patch/xbmc/settings/AdvancedSettings.h ---- xbmc-13.alpha-6edea14/xbmc/settings/AdvancedSettings.h 2013-08-02 16:28:51.000000000 +0200 -+++ xbmc-13.alpha-6edea14.patch/xbmc/settings/AdvancedSettings.h 2013-08-02 17:21:29.790714897 +0200 -@@ -190,6 +190,7 @@ - bool m_DXVANoDeintProcForProgressive; - int m_videoFpsDetect; - bool m_videoDisableHi10pMultithreading; -+ int m_videoBusyDialogDelay_ms; - StagefrightConfig m_stagefrightConfig; - - CStdString m_videoDefaultPlayer; diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b17818b.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-81fd4d3.patch similarity index 95% rename from packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b17818b.patch rename to packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-81fd4d3.patch index 360cd8ff7b..c1e530836d 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b17818b.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-81fd4d3.patch @@ -1,4 +1,4 @@ -From 72cebd615a84986c340adba5b022fa5fef83adb0 Mon Sep 17 00:00:00 2001 +From 54a044fb221073109f36f42dc18302987202cd02 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 Subject: [PATCH 01/79] videoplayer: adapt lateness detection and dropping to @@ -582,7 +582,7 @@ index f8ad541..186e271 100644 1.8.4 -From 69be147918746749346a6cc87deabf2589220c10 Mon Sep 17 00:00:00 2001 +From 89a773d12365d6e7f4dde3ef06cfb8cd0447360e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 Subject: [PATCH 02/79] video player: present correct pts to user for a/v sync @@ -653,7 +653,7 @@ index 186e271..59c7f09 100644 1.8.4 -From 47480f39ee7b9b7445d01bb6723268d842986392 Mon Sep 17 00:00:00 2001 +From 9c5055c07c3606c2026fb4e95f7c738f82f772b6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 Subject: [PATCH 03/79] videoplayer: some rework and documentation @@ -767,7 +767,7 @@ index 752a291..0aef5ee 100644 1.8.4 -From 3550ef4848a4eb170c31a5ec93c27516d03a9054 Mon Sep 17 00:00:00 2001 +From eb55770281207a2864f1bb83bef8b87af3b7be78 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 Subject: [PATCH 04/79] renderer: bump buffers to 5 @@ -793,7 +793,7 @@ index a61d3cf..df5fe0e 100644 1.8.4 -From 1090164aab0a333514c82091fd9b263928fa5832 Mon Sep 17 00:00:00 2001 +From 391e6905d0e8043ae27eebfdd19ca947a0d6d29a Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 Subject: [PATCH 05/79] videoplayer: update frametime, it might change due to @@ -820,7 +820,7 @@ index 0aef5ee..e7e5097 100644 1.8.4 -From d4659b465903adff0cdf6a17b7c42e9bdec091ae Mon Sep 17 00:00:00 2001 +From 8ddae454fd8ebff67192bbe58c3afda9865b49d9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 Subject: [PATCH 06/79] videoplayer: give streams with invalid fps a chance for @@ -847,7 +847,7 @@ index e7e5097..c40d193 100644 1.8.4 -From 532c0b2be73bfc2412540fd4123a9aebca6bc65e Mon Sep 17 00:00:00 2001 +From 2d6788dce632ac58e5203b477c40da9600ae6e76 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 Subject: [PATCH 07/79] dvdplayer: allow rewinding at end of stream, do a seek @@ -858,7 +858,7 @@ Subject: [PATCH 07/79] 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 c412b9f..437276b 100644 +index ed11151..5c1b31e 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1548,7 +1548,7 @@ void CDVDPlayer::HandlePlaySpeed() @@ -887,7 +887,7 @@ index c412b9f..437276b 100644 1.8.4 -From 7bb9bb2605c142b1646dee8c1db62217ad86f005 Mon Sep 17 00:00:00 2001 +From 22aec370845072e477277452916f13e2f1a9df9f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 Subject: [PATCH 08/79] X11: ditch SDL for video and window events @@ -906,7 +906,7 @@ Subject: [PATCH 08/79] 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 e1465df..4f639d0 100644 +index c78b847..f62c9fa 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -856,7 +856,7 @@ bool CApplication::CreateGUI() @@ -2428,7 +2428,7 @@ index 2454fb1..f5e5731 100644 1.8.4 -From 976a956d41f93b1871adf2122dd5cf8d3d243c76 Mon Sep 17 00:00:00 2001 +From c9c2f0027ecabd6593b8c7fd5f7cffa0095be6c4 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 Subject: [PATCH 09/79] X11: Add xbmc icon @@ -2621,7 +2621,7 @@ index f5e5731..6953b68 100644 1.8.4 -From 340df543fec60cacca9bb6995f74c39d01b0cd96 Mon Sep 17 00:00:00 2001 +From 1829af44c7d393f48cd82258c270db660e38bb92 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 Subject: [PATCH 10/79] X11: add SDL joystick until we have a better solution @@ -2678,7 +2678,7 @@ index ad58aad..6f57a87 100644 1.8.4 -From 9c7a16c8ce5166f342bc3a6f3fc9334446f0f94f Mon Sep 17 00:00:00 2001 +From 08fb8df97e96dfbf8b78ea7fac651230b42748ca Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 Subject: [PATCH 11/79] X11: factor out code handling device reset notification @@ -2744,7 +2744,7 @@ index 6953b68..d60d04a 100644 1.8.4 -From 8330470474c87a7d7ccba6eed88f31137535bcad Mon Sep 17 00:00:00 2001 +From 3a661ebc7a116c316f91199ea8c8ea8018c819d6 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 Subject: [PATCH 12/79] X11: move xrandr events to WinEventsX11 @@ -2891,7 +2891,7 @@ index b3be9fc..7259674 100644 1.8.4 -From 505060e9631082164b165e7c3b329b330521f88a Mon Sep 17 00:00:00 2001 +From 08c1afa9a285b7224c2f1078154653ab2963280b Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 Subject: [PATCH 13/79] xrandr: remove method RestoreState @@ -2973,7 +2973,7 @@ index 0aec487..00b49dc 100644 1.8.4 -From c07e98a91a5dd7f94991ff1f02d7ab58de58f95d Mon Sep 17 00:00:00 2001 +From 4e4a6dcbcfd7a80d12c72b78325841b6bb9af512 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 Subject: [PATCH 14/79] xrandr: observe orientation @@ -3191,7 +3191,7 @@ index 00b49dc..508604d 100644 1.8.4 -From 112eebd688325cbbd78dd738b1e7756c2da39a09 Mon Sep 17 00:00:00 2001 +From 13a042ed277448a4aa56f415d00762641e366b0e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 Subject: [PATCH 15/79] xrandr: allow getting info for multiple screen's @@ -3369,7 +3369,7 @@ index 508604d..d37838a 100644 1.8.4 -From cb51740435835f09ff776e2d02c07145542cd912 Mon Sep 17 00:00:00 2001 +From 0fc30291ebd470b1958686d2ada9a1350a32982e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 Subject: [PATCH 16/79] X11: fix multi-head setups @@ -3387,7 +3387,7 @@ Subject: [PATCH 16/79] X11: fix multi-head setups 9 files changed, 229 insertions(+), 116 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 74be31c..e15ddc7 100755 +index 5096061..b581e01 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1019,7 +1019,9 @@ msgctxt "#245" @@ -3402,10 +3402,10 @@ index 74be31c..e15ddc7 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index d25dd72..e1176d6 100644 +index 00dce05..144e569 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -1865,6 +1865,15 @@ +@@ -1988,6 +1988,15 @@
@@ -3421,7 +3421,7 @@ index d25dd72..e1176d6 100644 0 0 -@@ -1886,6 +1895,7 @@ +@@ -2009,6 +2018,7 @@ -1 @@ -3429,7 +3429,7 @@ index d25dd72..e1176d6 100644 -@@ -1903,6 +1913,7 @@ +@@ -2026,6 +2036,7 @@ -1 @@ -3556,10 +3556,10 @@ index cc4002b..d80f1dc 100644 protected: CDisplaySettings(); diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 57ba0c1..0d7c745 100644 +index 226669a..19ac324 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp -@@ -387,6 +387,7 @@ void CSettings::Uninitialize() +@@ -406,6 +406,7 @@ void CSettings::Uninitialize() m_settingsManager->UnregisterSettingOptionsFiller("screens"); m_settingsManager->UnregisterSettingOptionsFiller("stereoscopicmodes"); m_settingsManager->UnregisterSettingOptionsFiller("preferedstereoscopicviewmodes"); @@ -3567,7 +3567,7 @@ index 57ba0c1..0d7c745 100644 m_settingsManager->UnregisterSettingOptionsFiller("shutdownstates"); m_settingsManager->UnregisterSettingOptionsFiller("startupwindows"); m_settingsManager->UnregisterSettingOptionsFiller("streamlanguages"); -@@ -701,6 +702,7 @@ void CSettings::InitializeOptionFillers() +@@ -729,6 +730,7 @@ void CSettings::InitializeOptionFillers() m_settingsManager->RegisterSettingOptionsFiller("screens", CDisplaySettings::SettingOptionsScreensFiller); m_settingsManager->RegisterSettingOptionsFiller("stereoscopicmodes", CDisplaySettings::SettingOptionsStereoscopicModesFiller); m_settingsManager->RegisterSettingOptionsFiller("preferedstereoscopicviewmodes", CDisplaySettings::SettingOptionsPreferredStereoscopicViewModesFiller); @@ -3575,7 +3575,7 @@ index 57ba0c1..0d7c745 100644 m_settingsManager->RegisterSettingOptionsFiller("shutdownstates", CPowerManager::SettingOptionsShutdownStatesFiller); m_settingsManager->RegisterSettingOptionsFiller("startupwindows", ADDON::CSkinInfo::SettingOptionsStartupWindowsFiller); m_settingsManager->RegisterSettingOptionsFiller("streamlanguages", CLangInfo::SettingOptionsStreamLanguagesFiller); -@@ -731,6 +733,9 @@ void CSettings::InitializeConditions() +@@ -759,6 +761,9 @@ void CSettings::InitializeConditions() #ifdef HAS_GL m_settingsManager->AddCondition("has_gl"); #endif @@ -3585,7 +3585,7 @@ index 57ba0c1..0d7c745 100644 #ifdef HAS_GLES m_settingsManager->AddCondition("has_gles"); #endif -@@ -880,6 +885,7 @@ void CSettings::InitializeISettingCallbacks() +@@ -908,6 +913,7 @@ void CSettings::InitializeISettingCallbacks() settingSet.insert("videoscreen.screen"); settingSet.insert("videoscreen.resolution"); settingSet.insert("videoscreen.screenmode"); @@ -4141,7 +4141,7 @@ index eb8005e..7d53d36 100644 1.8.4 -From 20c1a7aec3a58e3e5d18255b2e5a547dc5cfb579 Mon Sep 17 00:00:00 2001 +From 8633d4b566782cff1197c1fd811d710d8a9ad7f0 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 Subject: [PATCH 17/79] X11: remove all DefaultScreen and RootWindow macros @@ -4212,7 +4212,7 @@ index 81c6800..8a8ff83 100644 1.8.4 -From be55daf273b57c315d5c74fa9556f9d8d61281d1 Mon Sep 17 00:00:00 2001 +From 86034fa01e3d8f9bcfd7c9a6705b3ac22c5fb4ec Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 Subject: [PATCH 18/79] X11: remove all DefaultScreen and RootWindow macros @@ -4287,7 +4287,7 @@ index 3ba991a..7eecd40 100644 1.8.4 -From 49d702ce61ef96c16d182ea752ec6c1688a46ee3 Mon Sep 17 00:00:00 2001 +From c2f34af678ae662ea6e9a9205030374cb7696c4e Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 Subject: [PATCH 19/79] X11: recreate gl context after output has changed @@ -4441,7 +4441,7 @@ index 8a8ff83..8707467 100644 1.8.4 -From 219dd9c3f50c761ab548b829711e944a637e5065 Mon Sep 17 00:00:00 2001 +From ee99e1ee8777134c98e74480f17712edd4cd4c53 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 Subject: [PATCH 20/79] X11: hook video reference clock in windowing @@ -4649,7 +4649,7 @@ index dd65a1b..afd71fc 100644 1.8.4 -From 736ff37156a94cc302083e0e34fe1d5c2abb9f15 Mon Sep 17 00:00:00 2001 +From d1c587b9b46ef8d3fd9a4cde12af185ffdfde751 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 Subject: [PATCH 21/79] X11: fix video calibrations @@ -4744,7 +4744,7 @@ index 2868707..282bb9a 100644 1.8.4 -From 5f50bd5bc2ec1f4354c71ed1fa60913cde1d0d5b Mon Sep 17 00:00:00 2001 +From 5161e3e34fdf68ae804630749bde49813b1ca5c9 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 Subject: [PATCH 22/79] X11: deactivate screen saver on startup @@ -4817,7 +4817,7 @@ index 282bb9a..32f90da 100644 1.8.4 -From 0cba1040dc9a8837f789e5abb72ddf538de808f9 Mon Sep 17 00:00:00 2001 +From 99f047d587714fa274fbb2d79f3daf9c94316063 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 Subject: [PATCH 23/79] X11: change method of going full-screen @@ -4864,7 +4864,7 @@ index e1fd4e5..acd6497 100644 1.8.4 -From 381ecabb8ece719bf065496027313954bf1bbeb5 Mon Sep 17 00:00:00 2001 +From f370a34ab69bab8a687708d83bdb7fb935cecb3a Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 Subject: [PATCH 24/79] X11: reset key repeat and key modifier on focus lost @@ -4899,7 +4899,7 @@ index d98f12f..743aca9 100644 1.8.4 -From 6e4459b8807f6ed90c76941426d7071095903f54 Mon Sep 17 00:00:00 2001 +From 61a60e1ac6b5ba05c7de476232a1b5281d0d6e81 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 Subject: [PATCH 25/79] X11: replace custom utf8 to unicode with charset @@ -5119,7 +5119,7 @@ index a412f32..9a8a912 100644 1.8.4 -From b80952819085d013b524723be18b4f947783e9f8 Mon Sep 17 00:00:00 2001 +From 127c0dbe7de76d1b7601340de420ad0f73bc9ebd Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 Subject: [PATCH 26/79] X11: fixed invalid usage of sizeof() (squash into x11 @@ -5186,7 +5186,7 @@ index 9a8a912..c69169c 100644 1.8.4 -From b2dfe9f398dd68f7cd788d51ebc6a2237860ae6f Mon Sep 17 00:00:00 2001 +From 79b2e28df2b3a25d440ad976b5e48dbb1687c9a9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 Subject: [PATCH 27/79] add missing keys to xbmc keytable @@ -5212,7 +5212,7 @@ index b430f55..246164b 100644 1.8.4 -From 61736f65bbfe5f452f19b5546dedcc0fb2bcc945 Mon Sep 17 00:00:00 2001 +From e0a7af21b097d709cbeac6d98759ae57997ca13b Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 Subject: [PATCH 28/79] videorefclock: temp deactivate of nv settings @@ -5238,7 +5238,7 @@ index 4071ff0..b9afc09 100644 1.8.4 -From ee9f26a32c661157a855aab1a46487850595b5c4 Mon Sep 17 00:00:00 2001 +From 37c3ad8f9f41f3d9922025b0bee4614f78dd2f3f Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 Subject: [PATCH 29/79] videorefclock: ask graphics context for refresh rate @@ -5272,7 +5272,7 @@ index b9afc09..2f6c7de 100644 1.8.4 -From 0bf1cac40bb27ba6e26ca1e97d8dcc158b9fe197 Mon Sep 17 00:00:00 2001 +From 1111dbee1d7a3bf79a5c228d3583fd170e806acd Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 Subject: [PATCH 30/79] X11: fix icon texture after @@ -5383,7 +5383,7 @@ index acd6497..805eed7 100644 1.8.4 -From 09c9e82f6e88db8609dae7a9cac51ee9264f6d66 Mon Sep 17 00:00:00 2001 +From 488ba6b0d6ca6c020878b1c59c40e43823c50521 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 Subject: [PATCH 31/79] X11: check for window manager @@ -5507,7 +5507,7 @@ index 32f90da..28d9d03 100644 1.8.4 -From 92a868bbccc16fc16f7cd2bfc0c68af37d4d7bb2 Mon Sep 17 00:00:00 2001 +From 19704dd2ffcd514f23b72f5e05e20feba6585bc9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 Subject: [PATCH 32/79] X11: dont set window on xrandr if no mode available @@ -5547,7 +5547,7 @@ index b103248..45741d7 100644 1.8.4 -From d6c60654e348e63a83c5fe199d880c3813a6801f Mon Sep 17 00:00:00 2001 +From 5007fbf749b461038ad9f155bd9bfcdd6589fd02 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 Subject: [PATCH 33/79] X11: fix crash after a resolution change on startup @@ -5574,7 +5574,7 @@ index 45741d7..a6cb67f 100644 1.8.4 -From 660d47a9a44fe579988d51098a70ca74cba31c17 Mon Sep 17 00:00:00 2001 +From d6bdb0231e70b0e1dee81389d024b4410fd54b9e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 Subject: [PATCH 34/79] X11: lock graphics context in NotifyXRREvent @@ -5600,7 +5600,7 @@ index a6cb67f..70b5f10 100644 1.8.4 -From d7ef9c7fdd52024b77e68d8103bdae72cf52df93 Mon Sep 17 00:00:00 2001 +From fc3af19b1014e79056df52fbc74c3989c294f8af Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 Subject: [PATCH 35/79] ffmpeg: add av_find_default_stream_index to interface @@ -5649,7 +5649,7 @@ index 0016c0b..3514856 100644 1.8.4 -From b0a4bb7e9402c2e80ca8b3e98068e066733ce94b Mon Sep 17 00:00:00 2001 +From b765fdad776a4524371970ec2594890a99f8b6bb Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 Subject: [PATCH 36/79] dvdplayer: observe pts counter overflow @@ -5660,7 +5660,7 @@ Subject: [PATCH 36/79] dvdplayer: observe pts counter overflow 2 files changed, 201 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 8afeebe..cd02087 100644 +index af05077..13afcae 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -18,7 +18,6 @@ @@ -5679,7 +5679,7 @@ index 8afeebe..cd02087 100644 #include "stdint.h" #endif #include "DVDDemuxFFmpeg.h" -@@ -489,6 +489,9 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput) +@@ -490,6 +490,9 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput) CreateStreams(); @@ -5689,7 +5689,7 @@ index 8afeebe..cd02087 100644 return true; } -@@ -629,6 +632,12 @@ double CDVDDemuxFFmpeg::ConvertTimestamp(int64_t pts, int den, int num) +@@ -635,6 +638,12 @@ double CDVDDemuxFFmpeg::ConvertTimestamp(int64_t pts, int den, int num) if (pts == (int64_t)AV_NOPTS_VALUE) return DVD_NOPTS_VALUE; @@ -5702,7 +5702,7 @@ index 8afeebe..cd02087 100644 // do calculations in floats as they can easily overflow otherwise // we don't care for having a completly exact timestamp anyway double timestamp = (double)pts * num / den; -@@ -768,6 +777,24 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -774,6 +783,24 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() m_pkt.pkt.pts = AV_NOPTS_VALUE; } @@ -5727,7 +5727,7 @@ index 8afeebe..cd02087 100644 // copy contents into our own packet pPacket->iSize = m_pkt.pkt.size; -@@ -897,10 +924,20 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) +@@ -903,10 +930,20 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) int ret; { CSingleLock lock(m_critSection); @@ -5748,7 +5748,7 @@ index 8afeebe..cd02087 100644 } if(m_iCurrentPts == DVD_NOPTS_VALUE) -@@ -919,6 +956,165 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) +@@ -925,6 +962,165 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) return (ret >= 0); } @@ -5939,7 +5939,7 @@ index aef5ab1..35abbdf 100644 1.8.4 -From 5d8a1bcf25f178263df9a460954aaf31d7a62eb2 Mon Sep 17 00:00:00 2001 +From 927015a67e212990e2636fa29758adb59b15fd3b Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 Subject: [PATCH 37/79] dvdplayer: avoid short screen flicker caused by @@ -5975,7 +5975,7 @@ index c40d193..6419951 100644 1.8.4 -From 320bc936ecbed09442f80d8a8ad8e2fce4c775b3 Mon Sep 17 00:00:00 2001 +From 67aeb3b105793038cdaf11c8238c171d6f7946c5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 Subject: [PATCH 38/79] vdpau: advanced settings for auto deinterlacing @@ -6006,7 +6006,7 @@ index f026c92..73c9b50 100644 if (deint != -1) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 619490d..8f6981a 100644 +index dc10c0b..a2cc6f5 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -165,6 +165,8 @@ void CAdvancedSettings::Initialize() @@ -6018,7 +6018,7 @@ index 619490d..8f6981a 100644 m_videoVDPAUtelecine = false; m_videoVDPAUdeintSkipChromaHD = false; m_DXVACheckCompatibility = false; -@@ -602,6 +604,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -603,6 +605,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI); XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); @@ -6028,7 +6028,7 @@ index 619490d..8f6981a 100644 XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index d46ee0b..8f031ba 100644 +index 7f21bc4..9c4831b 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -160,6 +160,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler @@ -6044,7 +6044,7 @@ index d46ee0b..8f031ba 100644 1.8.4 -From 6c3a8cf8003172665ec87946119e142cfb02e79b Mon Sep 17 00:00:00 2001 +From 81ea69baabfc1a4453022f83832264f94a977a16 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 Subject: [PATCH 39/79] player: fix rewind @@ -6095,7 +6095,7 @@ index 2ea8b8f..e8274f9 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 437276b..2c9fdf1 100644 +index 5c1b31e..0af6b7c 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1549,11 +1549,13 @@ void CDVDPlayer::HandlePlaySpeed() @@ -6153,7 +6153,7 @@ index 437276b..2c9fdf1 100644 } // if playspeed is different then DVD_PLAYSPEED_NORMAL or DVD_PLAYSPEED_PAUSE -@@ -3174,7 +3178,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) +@@ -3175,7 +3179,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) return true; } @@ -6162,7 +6162,7 @@ index 437276b..2c9fdf1 100644 { double startpts; if(accurate) -@@ -3186,19 +3190,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3187,19 +3191,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) if(startpts != DVD_NOPTS_VALUE) startpts -= m_offset_pts; @@ -6190,7 +6190,7 @@ index 437276b..2c9fdf1 100644 m_CurrentTeletext.dts = DVD_NOPTS_VALUE; m_CurrentTeletext.startpts = startpts; -@@ -3242,7 +3250,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3243,7 +3251,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) m_CurrentTeletext.started = false; } @@ -6262,7 +6262,7 @@ index 59c7f09..65dea76 100644 1.8.4 -From d80ac0938668fcd7c89bef31ee23f351c8d468ad Mon Sep 17 00:00:00 2001 +From 03463194d42977133366d0563d281d128571d25a Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 Subject: [PATCH 40/79] xrandr: fix query for multiple screens @@ -6306,7 +6306,7 @@ index 9e181f2..ce0a02b 100644 1.8.4 -From 98c1b1d56eff376b2e254144542a765839c16c38 Mon Sep 17 00:00:00 2001 +From 3e7454db53221bd4531f23c11c4cb32d8168f12f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 Subject: [PATCH 41/79] X11: add debug log to print out refresh after xrr event @@ -6336,7 +6336,7 @@ index 70b5f10..64d5730 100644 1.8.4 -From b8be44c2e84e218ed8a8d09de68c9b64b9b5445b Mon Sep 17 00:00:00 2001 +From 0cef0072305e36b3ff36467859505a612cf3649b Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 Subject: [PATCH 42/79] X11: dont call XCloseDisplay on shutdown, it crashes @@ -6364,7 +6364,7 @@ index 64d5730..edc81c8 100644 1.8.4 -From 6ec0065be773ec8b661ea35d9592c6dafa8ce00a Mon Sep 17 00:00:00 2001 +From 287fd3cdb8f86f8394bd5ae1b01bdb68fed87eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= Date: Wed, 12 Dec 2012 19:49:47 +0100 Subject: [PATCH 43/79] x11: support for multiple x screens @@ -6390,7 +6390,7 @@ index ce0a02b..aa27d2b 100644 1.8.4 -From 5fcf035cdcd13c7928443ef74b8e657ca7b55bb9 Mon Sep 17 00:00:00 2001 +From 8d6932814e15fda0d6a8e695227014b3d61838de Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 Subject: [PATCH 44/79] pvr: increase changes counter of stream on stream @@ -6427,7 +6427,7 @@ index b96d520..df89f6f 100644 1.8.4 -From 29594329f122b6991d61162ce5cb6f4e87967a36 Mon Sep 17 00:00:00 2001 +From 24596101ec30d223d370f60b776d14168d34f010 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 Subject: [PATCH 45/79] X11: add keymapping for XF86XK_Sleep @@ -6452,7 +6452,7 @@ index a62521f..263cb5a 100644 1.8.4 -From d3fee0228ae7c89ae33099705fc31e4f822b8eb7 Mon Sep 17 00:00:00 2001 +From 603aab617e0ab490fa9d2dd6c71838cceed03100 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 Subject: [PATCH 46/79] X11: remove toggle full screen after resume @@ -6481,7 +6481,7 @@ index 2033574..c79bbc1 100644 1.8.4 -From 6c77dee351a2b096b2f5aab32aeeb84e5c781240 Mon Sep 17 00:00:00 2001 +From 8152b2ccb41679ff584606761770af36704cc35d Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 Subject: [PATCH 47/79] xrandr: set screen on mode change command @@ -6507,7 +6507,7 @@ index aa27d2b..67bf6ca 100644 1.8.4 -From 70dcb516375ee30ff3f2e0d173799161139a24a5 Mon Sep 17 00:00:00 2001 +From accfee15fc5f56a91a8a48d1229db4e29743a024 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 Subject: [PATCH 48/79] X11: recreate glx context when output changes @@ -6561,7 +6561,7 @@ index 28d9d03..5a21b00 100644 1.8.4 -From 02977db461fbb19ab359a6fc458e0f71dca6d034 Mon Sep 17 00:00:00 2001 +From bb5b45e26408df190fbd470b6f51873e790cbad8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 Subject: [PATCH 49/79] pvr: do not show selection dialog for a single menu @@ -6602,7 +6602,7 @@ index 5aaf881..4c64877 100644 1.8.4 -From a1c7e4fa455db38093952673207f38be66cba652 Mon Sep 17 00:00:00 2001 +From 685fb07e0ef2f35ad9f42db6fd03892f076d2178 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 Subject: [PATCH 50/79] X11: use default screen parameters if no output @@ -6709,7 +6709,7 @@ index c6aa51a..f481ea4 100644 1.8.4 -From 2d7b852710eddd55e45c5641b976974defe1e749 Mon Sep 17 00:00:00 2001 +From 99ef928d3aecd8da98807a22367146dccbc19bdc Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 Subject: [PATCH 51/79] X11: create parent window @@ -6978,7 +6978,7 @@ index 5a21b00..b866d52 100644 1.8.4 -From 7b5f3ed1e2544c233b6ed19f02abc500e1b9fa95 Mon Sep 17 00:00:00 2001 +From 9a582b91956cdf46239de00265bdd9b34a1f11d8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 Subject: [PATCH 52/79] X11: use system key repeat rate instead of hardcoded @@ -7183,7 +7183,7 @@ index c69169c..6429291 100644 1.8.4 -From 0aaa41de7be27361abdeee8f8dcb99d2ce13b560 Mon Sep 17 00:00:00 2001 +From a17f3c7fdd4783520fdd8684ce128d1dc5797fdb Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 Subject: [PATCH 53/79] linux: use CLOCK_MONOTONIC_RAW as this is not subject @@ -7224,7 +7224,7 @@ index c06b8c5..4390d2e 100644 1.8.4 -From b0067f736bf84f24b7ce7ba92bba6f28c7fe49da Mon Sep 17 00:00:00 2001 +From 6a5610785a97af067163ef3e8f24aa3ebca6f087 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 Subject: [PATCH 54/79] OMXPlayer: some caching fixes for pvr @@ -7234,10 +7234,10 @@ Subject: [PATCH 54/79] 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 56099fe..fc1d725 100644 +index a149070..5903081 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -2465,7 +2465,8 @@ void COMXPlayer::HandleMessages() +@@ -2461,7 +2461,8 @@ void COMXPlayer::HandleMessages() m_messenger.Put(new CDVDMsgPlayerSeek(GetTime(), (speed < 0), true, false, false, true)); m_playSpeed = speed; @@ -7251,7 +7251,7 @@ index 56099fe..fc1d725 100644 1.8.4 -From dfbc9afc4544d36ac7c67d79fe7c4a2b3b93300b Mon Sep 17 00:00:00 2001 +From 8519ba9a8ca2c3937d45764f25e99a556f50f253 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 Subject: [PATCH 55/79] fix incorrect display of fps when dr kicks in @@ -7261,7 +7261,7 @@ Subject: [PATCH 55/79] 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 4f639d0..571a67e 100644 +index f62c9fa..0bf1e80 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -2224,10 +2224,11 @@ void CApplication::Render() @@ -7281,7 +7281,7 @@ index 4f639d0..571a67e 100644 1.8.4 -From f3f3a2a31352cc5bb9649f44384bc6a46936eb28 Mon Sep 17 00:00:00 2001 +From a568fd7bca6b7481cf8b00f4adcb2de7727a8151 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 Subject: [PATCH 56/79] X11: fix mouse coverage @@ -7350,7 +7350,7 @@ index b866d52..3f1b5f8 100644 1.8.4 -From 77460bf3afa3fec34e95bef131f6926525fdfcac Mon Sep 17 00:00:00 2001 +From b3957dc0082cb0e619750a90920685e598d6ddc5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 Subject: [PATCH 57/79] X11: fix incorrectly used screen num in desktop @@ -7388,7 +7388,7 @@ index 7987cc2..b13f1a5 100644 1.8.4 -From 88d254b466cad8eb42c7e60bed5bd0fd081c7ec1 Mon Sep 17 00:00:00 2001 +From 1dae812688760a3ad13f6052437faebcf658022c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 Subject: [PATCH 58/79] X11: do not overwrite user selected monitor with @@ -7516,7 +7516,7 @@ index 3f1b5f8..ed70d9c 100644 1.8.4 -From de43cd6d84f77de06ac19a310a3302c354bf5715 Mon Sep 17 00:00:00 2001 +From 853f2aafb21fbe6debbb62829f191228f6fa3260 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 Subject: [PATCH 59/79] xrandr: add turn on/off to wrapper @@ -7685,7 +7685,7 @@ index d37838a..059062f 100644 1.8.4 -From da89d4e60f92ea127a9e39dd2037c4d267e31e2e Mon Sep 17 00:00:00 2001 +From d4250ce921b968555481b625f3726d21983eb122 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 Subject: [PATCH 60/79] xrandr: add GetPreferredMode to wrapper @@ -7745,7 +7745,7 @@ index 059062f..ab7cc63 100644 1.8.4 -From e9d0cd6d39f65819d5c70a6a8621a8dbfcec0d7b Mon Sep 17 00:00:00 2001 +From c8bf0955dceeb9bec9e7e5b5a4bfb89ad05418f2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 Subject: [PATCH 61/79] X11: multi-head improvement - poll for desired output @@ -7763,10 +7763,10 @@ Subject: [PATCH 61/79] X11: multi-head improvement - poll for desired output 8 files changed, 105 insertions(+), 12 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index e15ddc7..e99288e 100755 +index b581e01..382c963 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6440,7 +6440,7 @@ msgctxt "#14071" +@@ -6456,7 +6456,7 @@ msgctxt "#14071" msgid "Allow file renaming and deletion" msgstr "" @@ -7775,7 +7775,7 @@ index e15ddc7..e99288e 100755 msgctxt "#14074" msgid "Set timezone" -@@ -6572,7 +6572,12 @@ msgctxt "#14100" +@@ -6588,7 +6588,12 @@ msgctxt "#14100" msgid "Stop ripping CD" msgstr "" @@ -7790,10 +7790,10 @@ index e15ddc7..e99288e 100755 #: xbmc/dialogs/GUIDialogFavourites.cpp msgctxt "#15015" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index e1176d6..4852107 100644 +index 144e569..5118f4f 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -1874,6 +1874,11 @@ +@@ -1997,6 +1997,11 @@ @@ -7805,8 +7805,8 @@ index e1176d6..4852107 100644 0 0 -@@ -1925,6 +1930,7 @@ - +@@ -2049,6 +2054,7 @@ + + !HAS_GLX @@ -8029,7 +8029,7 @@ index 4809821..1ad26b2 100644 1.8.4 -From ffe6d71032c479aa0474de824e3de795cbf0b2aa Mon Sep 17 00:00:00 2001 +From 06979523bdc4684eba060007e4faba3f8935833f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 Subject: [PATCH 62/79] X11: ignore mouse move event form other windows @@ -8064,7 +8064,7 @@ index 908c8b6..938ad26 100644 1.8.4 -From f241bbfa83ffaa1c68de1edc2d5dcb6283ed7023 Mon Sep 17 00:00:00 2001 +From 5ea114fcdb8a2a27ac7b234d752a69c310087e66 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 Subject: [PATCH 63/79] renderer: allow some lateness within vblank interval @@ -8127,7 +8127,7 @@ index 949c652b..d84ff6c 100644 1.8.4 -From afdba8c930869a5fb9ceb7da14b09a139a4372c7 Mon Sep 17 00:00:00 2001 +From 6844340b06198a528efdba74e38cd78838516a67 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 Subject: [PATCH 64/79] X11: another fix for mouse coverage @@ -8163,7 +8163,7 @@ index 938ad26..e4ca56d 100644 1.8.4 -From 2027815558b83a8ed0f93dcf7bedd6fb222d3b27 Mon Sep 17 00:00:00 2001 +From 722537eadc8823298e4b5f3adaed4da7874ead46 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 Subject: [PATCH 65/79] X11: set windows class name @@ -8208,7 +8208,7 @@ index cbb56bf..e74f2b0 100644 1.8.4 -From b602d69de5ac76897df92af813f2bc0e77dd9d93 Mon Sep 17 00:00:00 2001 +From e9fd40531b497ed3064f5f956c9cb1c5929ec8fe Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 Subject: [PATCH 66/79] fixed: typo @@ -8218,10 +8218,10 @@ Subject: [PATCH 66/79] fixed: typo 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/English/strings.po b/language/English/strings.po -index e99288e..f464c3b 100755 +index 382c963..bb17807 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6574,7 +6574,7 @@ msgstr "" +@@ -6590,7 +6590,7 @@ msgstr "" #: xbmc/settings/settings.xml msgctxt "#14101" @@ -8234,7 +8234,7 @@ index e99288e..f464c3b 100755 1.8.4 -From 1482ad00eac98e349ad0eee7d86219c37137739d Mon Sep 17 00:00:00 2001 +From 35f160e240780e3182cff100d86033d53ed87948 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 Subject: [PATCH 67/79] ActiveAE: slightly reduce buffer size @@ -8244,7 +8244,7 @@ Subject: [PATCH 67/79] 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 991c086..c872ee5 100644 +index 7194945..3c2ec99 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ @@ -8262,7 +8262,7 @@ index 991c086..c872ee5 100644 1.8.4 -From 628115df2620a96df7852fe38d742798abebc872 Mon Sep 17 00:00:00 2001 +From 231fd3a7a3ace2e28e5f89ed82dad2463274079f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 Subject: [PATCH 68/79] Revert "vdpau: comment some features that will be added @@ -8321,7 +8321,7 @@ index 73c9b50..1ac0978 100644 1.8.4 -From 05bad776bb2d59fdd6e24cf88a71324289b497c0 Mon Sep 17 00:00:00 2001 +From 82ef507245686fae7204edc40a1e24eb4c2a484b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 Subject: [PATCH 69/79] X11: fix keysyms @@ -8347,7 +8347,7 @@ index e4ca56d..b20130c 100644 1.8.4 -From cb65e3c014355f19f5d68a3ed97f27b56eecd53e Mon Sep 17 00:00:00 2001 +From a69eaa48d12dfc43babd1f1b4e000622135e7977 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 Subject: [PATCH 70/79] X11: fix keysym for non-IM @@ -8373,7 +8373,7 @@ index b20130c..a38890c 100644 1.8.4 -From 078f78a11933f389180207eecece5a26d83a1dd7 Mon Sep 17 00:00:00 2001 +From 38e7da7bb2245eb3f3bb88c8bba289cd100c0cba Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 Subject: [PATCH 71/79] add some missing multi media keys @@ -8431,7 +8431,7 @@ index ee6bb69..364b45a 100644 1.8.4 -From 970099abff5809b3e192c4dfa9cf8c8b5edbeb87 Mon Sep 17 00:00:00 2001 +From 594c4bc4173da8c6c9c3c973cb037e275a0c494a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 Subject: [PATCH 72/79] X11: squash multi @@ -8457,7 +8457,7 @@ index e74f2b0..480efb3 100644 1.8.4 -From 1f63425ed1b28df7e455c4ea6fde7e5d6433e3be Mon Sep 17 00:00:00 2001 +From fe2f0fa9ee2ae337066f8bba00dc383311372e5a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 Subject: [PATCH 73/79] X11: do not poll default monitor @@ -8483,7 +8483,7 @@ index 480efb3..dd04357 100644 1.8.4 -From 08bc3bea62692b03f21e83819f470d36bdabd3e2 Mon Sep 17 00:00:00 2001 +From 52581c2959288fb4567b3cf9ea12ad81be19357b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:28 +0100 Subject: [PATCH 74/79] X11: fix broken monitor switching @@ -8494,10 +8494,10 @@ Subject: [PATCH 74/79] 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 4852107..e7a8ebc 100644 +index 5118f4f..ad98bcb 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -1918,7 +1918,6 @@ +@@ -2041,7 +2041,6 @@ -1 @@ -8589,7 +8589,7 @@ index 46895d2..c495bb0 100644 1.8.4 -From dea4112356b810df7a21f837b4b940a3a8c9f365 Mon Sep 17 00:00:00 2001 +From 5a59a7d29c1cdd91ca93f99f6de3a12062c635e2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:59 +0100 Subject: [PATCH 75/79] X11: remove polling for connected outputs, use xrr @@ -8893,7 +8893,7 @@ index f0d22bb..03bccc9 100644 1.8.4 -From f96d27f5066fcfb0c45abd9789cdd11a4c6aa181 Mon Sep 17 00:00:00 2001 +From 7596d2468a416f8a542c4379904f6539ae3fcab6 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 09:37:13 +0100 Subject: [PATCH 76/79] X11: remove grabbing of keyboard and mouse @@ -9014,7 +9014,7 @@ index 03bccc9..1b8bbcb 100644 1.8.4 -From 3fd61aa80d15da6df7bec507406e889334e21bde Mon Sep 17 00:00:00 2001 +From 73a91630fd2b2f293013301d69abfc1c3dee7c1e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 10:46:40 +0100 Subject: [PATCH 77/79] X11: set ExposureMask on gl window, fixes not updated @@ -9047,7 +9047,7 @@ index 6b5aa09..1a67943 100644 1.8.4 -From c9bec76142838d9930e34890249a9aa38bae19bd Mon Sep 17 00:00:00 2001 +From 1e9f2f47dbe047fb550a9ef30a1e26c3b92af0b2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 11:25:19 +0100 Subject: [PATCH 78/79] X11: drop shortcuts, have WM do this @@ -9112,244 +9112,31 @@ index 6429291..4334d21 100644 1.8.4 -From 354cb9c0713658dd3f38757f1b6d90224d85479d Mon Sep 17 00:00:00 2001 +From ad6464b2ca6ef9b00485d4f633897db490ed47f5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker -Date: Fri, 1 Nov 2013 12:41:42 +0100 -Subject: [PATCH 79/79] ActiveAE: make viz not observe volume and mute +Date: Mon, 4 Nov 2013 13:08:27 +0100 +Subject: [PATCH 79/79] vdpau: correct field order for deinterlacing, credits + to zgreg --- - .../AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 124 ++++++++++++--------- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h | 1 + - 2 files changed, 70 insertions(+), 55 deletions(-) + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.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 c872ee5..6cdc9df 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -144,6 +144,7 @@ bool CEngineStats::IsSuspended() - m_silenceBuffers = NULL; - m_encoderBuffers = NULL; - m_vizBuffers = NULL; -+ m_vizBuffersInput = NULL; - m_volume = 1.0; - m_aeVolume = 1.0; - m_muted = false; -@@ -899,6 +900,11 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt) - m_discardBufferPools.push_back(m_vizBuffers); - m_vizBuffers = NULL; - } -+ if (m_vizBuffersInput) -+ { -+ m_discardBufferPools.push_back(m_vizBuffersInput); -+ m_vizBuffersInput = NULL; -+ } - } - // resample buffers for streams - else -@@ -1014,12 +1020,20 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt) - { - m_discardBufferPools.push_back(m_vizBuffers); - m_vizBuffers = NULL; -+ m_discardBufferPools.push_back(m_vizBuffersInput); -+ m_vizBuffersInput = NULL; - } - if (!m_vizBuffers) - { - AEAudioFormat vizFormat = m_internalFormat; - vizFormat.m_channelLayout = AE_CH_LAYOUT_2_0; - vizFormat.m_dataFormat = AE_FMT_FLOAT; -+ -+ // input buffers -+ m_vizBuffersInput = new CActiveAEBufferPool(m_internalFormat); -+ m_vizBuffersInput->Create(2000); -+ -+ // resample buffers - m_vizBuffers = new CActiveAEBufferPoolResample(m_internalFormat, vizFormat, m_settings.resampleQuality); - // TODO use cache of sync + water level - m_vizBuffers->Create(2000, false, false); -@@ -1650,12 +1664,12 @@ bool CActiveAE::RunStages() - for(int j=0; jpkt->planes; j++) - { - #ifdef __SSE__ -- CAEUtil::SSEMulArray((float*)out->pkt->data[j]+i*nb_floats, m_muted ? 0.0 : volume, nb_floats); -+ CAEUtil::SSEMulArray((float*)out->pkt->data[j]+i*nb_floats, volume, nb_floats); - #else - float* fbuffer = (float*) out->pkt->data[j]+i*nb_floats; - for (int k = 0; k < nb_floats; ++k) - { -- fbuffer[k] *= m_muted ? 0.0 : volume; -+ fbuffer[k] *= volume; - } - #endif - } -@@ -1718,7 +1732,7 @@ bool CActiveAE::RunStages() - float *dst = (float*)out->pkt->data[j]+i*nb_floats; - float *src = (float*)mix->pkt->data[j]+i*nb_floats; - #ifdef __SSE__ -- CAEUtil::SSEMulAddArray(dst, src, m_muted ? 0.0 : volume, nb_floats); -+ CAEUtil::SSEMulAddArray(dst, src, volume, nb_floats); - for (int k = 0; k < nb_floats; ++k) - { - if (fabs(dst[k]) > 1.0f) -@@ -1730,7 +1744,7 @@ bool CActiveAE::RunStages() - #else - for (int k = 0; k < nb_floats; ++k) - { -- dst[k] += src[k] * (m_muted ? 0.0 : volume); -+ dst[k] += src[k] * volume; - if (fabs(dst[k]) > 1.0f) - needClamp = true; - } -@@ -1754,78 +1768,78 @@ bool CActiveAE::RunStages() +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +index 1ac0978..55f17e5 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +@@ -2461,8 +2461,8 @@ void CMixer::ProcessPicture() + past_surfaces[1] = m_mixerInput[2].videoSurface; } + past_surfaces[0] = m_mixerInput[1].videoSurface; +- futu_surfaces[0] = m_mixerInput[1].videoSurface; +- futu_surfaces[1] = m_mixerInput[1].videoSurface; ++ futu_surfaces[0] = m_mixerInput[0].videoSurface; ++ futu_surfaces[1] = m_mixerInput[0].videoSurface; - // process output buffer, gui sounds, encode, viz -- CSampleBuffer *viz = NULL; - if (out) - { -+ // viz -+ { -+ CSingleLock lock(m_vizLock); -+ if (m_audioCallback && m_vizBuffers && !m_streams.empty()) -+ { -+ if (!m_vizInitialized) -+ { -+ m_audioCallback->OnInitialize(2, m_vizBuffers->m_format.m_sampleRate, 32); -+ m_vizInitialized = true; -+ } -+ -+ if (!m_vizBuffersInput->m_freeSamples.empty()) -+ { -+ // copy the samples into the viz input buffer -+ CSampleBuffer *viz = m_vizBuffersInput->GetFreeBuffer(); -+ int samples = std::min(512, out->pkt->nb_samples); -+ int bytes = samples * out->pkt->config.channels / out->pkt->planes * out->pkt->bytes_per_sample; -+ for(int i= 0; i < out->pkt->planes; i++) -+ { -+ memcpy(viz->pkt->data[i], out->pkt->data[i], bytes); -+ } -+ viz->pkt->nb_samples = samples; -+ m_vizBuffers->m_inputSamples.push_back(viz); -+ } -+ else -+ CLog::Log(LOGWARNING,"ActiveAE::%s - viz ran out of free buffers", __FUNCTION__); -+ unsigned int now = XbmcThreads::SystemClockMillis(); -+ unsigned int timestamp = now + m_stats.GetDelay() * 1000; -+ busy |= m_vizBuffers->ResampleBuffers(timestamp); -+ while(!m_vizBuffers->m_outputSamples.empty()) -+ { -+ CSampleBuffer *buf = m_vizBuffers->m_outputSamples.front(); -+ if ((now - buf->timestamp) & 0x80000000) -+ break; -+ else -+ { -+ int samples; -+ samples = std::min(512, buf->pkt->nb_samples); -+ m_audioCallback->OnAudioData((float*)(buf->pkt->data[0]), samples); -+ buf->Return(); -+ m_vizBuffers->m_outputSamples.pop_front(); -+ } -+ } -+ } -+ else if (m_vizBuffers) -+ m_vizBuffers->Flush(); -+ } -+ - // mix gui sounds - MixSounds(*(out->pkt)); -- if (!m_sinkHasVolume) -+ if (!m_sinkHasVolume || m_muted) - Deamplify(*(out->pkt)); - -- // encode and backup out buffer for viz -- viz = out; - if (m_mode == MODE_TRANSCODE && m_encoder) - { - CSampleBuffer *buf = m_encoderBuffers->GetFreeBuffer(); - m_encoder->Encode(out->pkt->data[0], out->pkt->planes*out->pkt->linesize, - buf->pkt->data[0], buf->pkt->planes*buf->pkt->linesize); - buf->pkt->nb_samples = buf->pkt->max_nb_samples; -+ out->Return(); - out = buf; - } -- - busy = true; - } - -- // viz -- { -- CSingleLock lock(m_vizLock); -- if (m_audioCallback && m_vizBuffers && !m_streams.empty()) -- { -- if (!m_vizInitialized) -- { -- m_audioCallback->OnInitialize(2, m_vizBuffers->m_format.m_sampleRate, 32); -- m_vizInitialized = true; -- } -- -- // if viz has no free buffer, it won't return current buffer "viz" -- if (!m_vizBuffers->m_freeSamples.empty()) -- { -- if (viz) -- { -- viz->Acquire(); -- m_vizBuffers->m_inputSamples.push_back(viz); -- } -- } -- else -- CLog::Log(LOGWARNING,"ActiveAE::%s - viz ran out of free buffers", __FUNCTION__); -- unsigned int now = XbmcThreads::SystemClockMillis(); -- unsigned int timestamp = now + m_stats.GetDelay() * 1000; -- busy |= m_vizBuffers->ResampleBuffers(timestamp); -- while(!m_vizBuffers->m_outputSamples.empty()) -- { -- CSampleBuffer *buf = m_vizBuffers->m_outputSamples.front(); -- if ((now - buf->timestamp) & 0x80000000) -- break; -- else -- { -- int samples; -- samples = std::min(512, buf->pkt->nb_samples); -- m_audioCallback->OnAudioData((float*)(buf->pkt->data[0]), samples); -- buf->Return(); -- m_vizBuffers->m_outputSamples.pop_front(); -- } -- } -- } -- else if (m_vizBuffers) -- m_vizBuffers->Flush(); -- } - // update stats - if(out) - { - m_stats.AddSamples(out->pkt->nb_samples, m_streams); - m_sinkBuffers->m_inputSamples.push_back(out); -- if(viz && (viz != out)) -- viz->Return(); - } - } - // pass through -@@ -1934,7 +1948,7 @@ void CActiveAE::MixSounds(CSoundPacket &dstSample) - - void CActiveAE::Deamplify(CSoundPacket &dstSample) - { -- if (m_volume < 1.0) -+ if (m_volume < 1.0 || m_muted) - { - float *buffer; - int nb_floats = dstSample.nb_samples * dstSample.config.channels / dstSample.planes; -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -index e3e772a..0156593 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -@@ -307,6 +307,7 @@ class CActiveAE : public IAE, private CThread - // buffers - CActiveAEBufferPoolResample *m_sinkBuffers; - CActiveAEBufferPoolResample *m_vizBuffers; -+ CActiveAEBufferPool *m_vizBuffersInput; - CActiveAEBufferPool *m_silenceBuffers; // needed to drive gui sounds if we have no streams - CActiveAEBufferPool *m_encoderBuffers; - + if (m_mixerInput[0].DVDPic.pts != DVD_NOPTS_VALUE && + m_mixerInput[1].DVDPic.pts != DVD_NOPTS_VALUE) -- 1.8.4