From 8296e8d7a1d963ac726adc54916742199d2bdd4c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 30 Dec 2011 02:21:41 +0100 Subject: [PATCH] xbmc: update libcec patches Signed-off-by: Stephan Raue --- ...7e6-801-cec-libcec_upstream_updates.patch} | 74 +++++++++++++++---- 1 file changed, 58 insertions(+), 16 deletions(-) rename packages/mediacenter/{xbmc/patches/xbmc-22ad8e4-811-cec_PR570.patch => xbmc-pvr/patches/xbmc-pvr-84817e6-801-cec-libcec_upstream_updates.patch} (88%) diff --git a/packages/mediacenter/xbmc/patches/xbmc-22ad8e4-811-cec_PR570.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-801-cec-libcec_upstream_updates.patch similarity index 88% rename from packages/mediacenter/xbmc/patches/xbmc-22ad8e4-811-cec_PR570.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-801-cec-libcec_upstream_updates.patch index e31f338a20..81ae552c28 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-22ad8e4-811-cec_PR570.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-84817e6-801-cec-libcec_upstream_updates.patch @@ -1,7 +1,7 @@ -From 93e3b1bf60b03132f3aa3f85194385364abfeb6a Mon Sep 17 00:00:00 2001 +From 94ec6e9f96f23613da43a8cb14352d0fbd99f552 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Sun, 11 Dec 2011 23:42:17 +0100 -Subject: [PATCH 1/4] cec: added volume control on a CEC enabled amplifier +Subject: [PATCH 1/5] cec: added volume control on a CEC enabled amplifier when one is found --- @@ -12,10 +12,10 @@ Subject: [PATCH 1/4] cec: added volume control on a CEC enabled amplifier 4 files changed, 208 insertions(+), 2 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 36eb715..47bb339 100644 +index 0e0511e..2cfb8d3 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2530,6 +2530,26 @@ bool CApplication::OnAction(const CAction &action) +@@ -2592,6 +2592,26 @@ bool CApplication::OnAction(const CAction &action) // Check for global volume control if (action.GetAmount() && (action.GetID() == ACTION_VOLUME_UP || action.GetID() == ACTION_VOLUME_DOWN)) { @@ -42,7 +42,7 @@ index 36eb715..47bb339 100644 if (!m_pPlayer || !m_pPlayer->IsPassthrough()) { // increase or decrease the volume -@@ -4935,11 +4955,49 @@ void CApplication::ShowVolumeBar(const CAction *action) +@@ -5031,11 +5051,49 @@ void CApplication::ShowVolumeBar(const CAction *action) bool CApplication::IsMuted() const { @@ -92,7 +92,7 @@ index 36eb715..47bb339 100644 if (g_settings.m_bMute) UnMute(); else -@@ -4948,6 +5006,9 @@ void CApplication::ToggleMute(void) +@@ -5044,6 +5102,9 @@ void CApplication::ToggleMute(void) void CApplication::Mute() { @@ -102,7 +102,7 @@ index 36eb715..47bb339 100644 g_settings.m_iPreMuteVolumeLevel = GetVolume(); SetVolume(0); g_settings.m_bMute = true; -@@ -4955,6 +5016,9 @@ void CApplication::Mute() +@@ -5051,6 +5112,9 @@ void CApplication::Mute() void CApplication::UnMute() { @@ -113,10 +113,10 @@ index 36eb715..47bb339 100644 g_settings.m_iPreMuteVolumeLevel = 0; g_settings.m_bMute = false; diff --git a/xbmc/Application.h b/xbmc/Application.h -index d4bb9b3..cc07209 100644 +index 7688de7..26552ba 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h -@@ -166,6 +166,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs +@@ -172,6 +172,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs void SetVolume(long iValue, bool isPercentage = true); bool IsMuted() const; void ToggleMute(void); @@ -346,10 +346,10 @@ index 2fcbb1d..e1e302d 100644 1.7.5.4 -From 3a093c1931360c98bdeac8d40b9fdf9b69c778a0 Mon Sep 17 00:00:00 2001 +From 35730475f96d0482b7a101cc49da6cc9d1894351 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Sun, 11 Dec 2011 23:43:17 +0100 -Subject: [PATCH 2/4] cec: set the HDMI port and the device to which the CEC +Subject: [PATCH 2/5] cec: set the HDMI port and the device to which the CEC adapter was connected, to be able to determine the correct physical address. this is a work around, until the CEC adapter's firmware supports physical address @@ -436,10 +436,10 @@ index e1e302d..768e38a 100644 1.7.5.4 -From 7b49cb45bf33f7f00784c3655a95756f34de2f51 Mon Sep 17 00:00:00 2001 +From 010c90708d5fe891feed31913382150757de5b2a Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Sun, 11 Dec 2011 23:44:29 +0100 -Subject: [PATCH 3/4] cec: audiosystem control and the previous commit require +Subject: [PATCH 3/5] cec: audiosystem control and the previous commit require libcec v1.3 or higher --- @@ -450,7 +450,7 @@ Subject: [PATCH 3/4] cec: audiosystem control and the previous commit require 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in -index bca9239..b31b4dd 100755 +index e7045ba..f6c28ca 100755 --- a/configure.in +++ b/configure.in @@ -1173,7 +1173,7 @@ if test "x$use_libcec" != "xno"; then @@ -494,10 +494,10 @@ index c6b44c0..38f9162 100644 1.7.5.4 -From bbb7dfa9c9d4c21b55034562de902d62ee644adb Mon Sep 17 00:00:00 2001 +From 732175d6474da5a9f698fadd8c21617e8783bb6c Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Wed, 21 Dec 2011 00:05:54 +0100 -Subject: [PATCH 4/4] cec: improved the volume change response time +Subject: [PATCH 4/5] cec: improved the volume change response time --- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 33 ++++++++++++-------- @@ -580,3 +580,45 @@ index d0c4e6c..9a49a46 100644 -- 1.7.5.4 + +From a7f0ec61297ce7b832576c97a641a7baa5d0f9b3 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp +Date: Tue, 20 Dec 2011 21:17:46 +0100 +Subject: [PATCH 5/5] cec: don't send playstate updates, but always keep the + default playstate. fixes buttons becoming deactivated + on some TVs. it also wasn't very fast, which resulted + in delays when starting/stopping playback + +--- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 15 --------------- + 1 files changed, 0 insertions(+), 15 deletions(-) + +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index 9a49a46..8990478 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -175,21 +175,6 @@ void CPeripheralCecAdapter::Announce(EAnnouncementFlag flag, const char *sender, + } + } + } +- else if (flag == Player && !strcmp(sender, "xbmc") && !strcmp(message, "OnStop")) +- { +- m_cecAdapter->SetDeckControlMode(CEC_DECK_CONTROL_MODE_STOP, false); +- m_cecAdapter->SetDeckInfo(CEC_DECK_INFO_STOP); +- } +- else if (flag == Player && !strcmp(sender, "xbmc") && !strcmp(message, "OnPause")) +- { +- m_cecAdapter->SetDeckControlMode(CEC_DECK_CONTROL_MODE_SKIP_FORWARD_WIND, false); +- m_cecAdapter->SetDeckInfo(CEC_DECK_INFO_STILL); +- } +- else if (flag == Player && !strcmp(sender, "xbmc") && !strcmp(message, "OnPlay")) +- { +- m_cecAdapter->SetDeckControlMode(CEC_DECK_CONTROL_MODE_SKIP_FORWARD_WIND, false); +- m_cecAdapter->SetDeckInfo(CEC_DECK_INFO_PLAY); +- } + } + + bool CPeripheralCecAdapter::InitialiseFeature(const PeripheralFeature feature) +-- +1.7.5.4 +