mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 22:26:42 +00:00
projects/RPi*/patches/kodi: update RPi support patches
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
0fa72090c6
commit
316ea09daa
@ -1,83 +0,0 @@
|
|||||||
From 486c88dcd90bbbadb5fb5f69a697872adf12c43a Mon Sep 17 00:00:00 2001
|
|
||||||
From: popcornmix <popcornmix@gmail.com>
|
|
||||||
Date: Tue, 28 Oct 2014 00:19:40 +0000
|
|
||||||
Subject: [PATCH] [cec] Add settings for configuring button repeats
|
|
||||||
|
|
||||||
---
|
|
||||||
addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++
|
|
||||||
system/peripherals.xml | 4 +++-
|
|
||||||
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 16 ++++++++++++++++
|
|
||||||
3 files changed, 34 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
|
|
||||||
index bedbd87..6db61ed 100644
|
|
||||||
--- a/addons/resource.language.en_gb/resources/strings.po
|
|
||||||
+++ b/addons/resource.language.en_gb/resources/strings.po
|
|
||||||
@@ -16687,3 +16687,18 @@ msgstr ""
|
|
||||||
msgctxt "#38009"
|
|
||||||
msgid "%i dB"
|
|
||||||
msgstr ""
|
|
||||||
+
|
|
||||||
+#: system/peripherals.xml
|
|
||||||
+msgctxt "#38050"
|
|
||||||
+msgid "Remote button press delay before repeating (ms)"
|
|
||||||
+msgstr ""
|
|
||||||
+
|
|
||||||
+#: system/peripherals.xml
|
|
||||||
+msgctxt "#38051"
|
|
||||||
+msgid "Remote button press repeat rate (ms)"
|
|
||||||
+msgstr ""
|
|
||||||
+
|
|
||||||
+#: system/peripherals.xml
|
|
||||||
+msgctxt "#38052"
|
|
||||||
+msgid "Remote button press release time (ms)"
|
|
||||||
+msgstr ""
|
|
||||||
diff --git a/system/peripherals.xml b/system/peripherals.xml
|
|
||||||
index a67dc2f..6841bda 100644
|
|
||||||
--- a/system/peripherals.xml
|
|
||||||
+++ b/system/peripherals.xml
|
|
||||||
@@ -30,7 +30,9 @@
|
|
||||||
<setting key="device_type" type="int" value="1" configurable="0" />
|
|
||||||
<setting key="wake_devices_advanced" type="string" value="" configurable="0" />
|
|
||||||
<setting key="standby_devices_advanced" type="string" value="" configurable="0" />
|
|
||||||
- <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" />
|
|
||||||
+ <setting key="double_tap_timeout_ms" type="int" min="50" max="1000" step="50" value="300" label="38050" order="16" />
|
|
||||||
+ <setting key="button_repeat_rate_ms" type="int" min="0" max="250" step="10" value="0" label="38051" order="17" />
|
|
||||||
+ <setting key="button_release_delay_ms" type="int" min="0" max="500" step="50" value="0" label="38052" order="18" />
|
|
||||||
</peripheral>
|
|
||||||
|
|
||||||
<peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
|
|
||||||
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
|
||||||
index ea702e5..b5ff693 100644
|
|
||||||
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
|
||||||
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
|
||||||
@@ -1267,6 +1267,20 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu
|
|
||||||
m_configuration.bSendInactiveSource = config.bSendInactiveSource;
|
|
||||||
bChanged |= SetSetting("send_inactive_source", m_configuration.bSendInactiveSource == 1);
|
|
||||||
|
|
||||||
+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD)
|
|
||||||
+ m_configuration.iDoubleTapTimeout50Ms = config.iDoubleTapTimeout50Ms;
|
|
||||||
+ bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeout50Ms * 50);
|
|
||||||
+#else
|
|
||||||
+ m_configuration.iDoubleTapTimeoutMs = config.iDoubleTapTimeoutMs;
|
|
||||||
+ bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeoutMs;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ m_configuration.iButtonRepeatRateMs = config.iButtonRepeatRateMs;
|
|
||||||
+ bChanged |= SetSetting("button_repeat_rate_ms", (int)m_configuration.iButtonRepeatRateMs);
|
|
||||||
+
|
|
||||||
+ m_configuration.iButtonReleaseDelayMs = config.iButtonReleaseDelayMs;
|
|
||||||
+ bChanged |= SetSetting("button_release_delay_ms", (int)m_configuration.iButtonReleaseDelayMs);
|
|
||||||
+
|
|
||||||
m_configuration.iFirmwareVersion = config.iFirmwareVersion;
|
|
||||||
m_configuration.bShutdownOnStandby = config.bShutdownOnStandby;
|
|
||||||
|
|
||||||
@@ -1371,6 +1385,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
|
|
||||||
// backwards compatibility. will be removed once the next major release of libCEC is out
|
|
||||||
m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
|
|
||||||
#endif
|
|
||||||
+ m_configuration.iButtonRepeatRateMs = GetSettingInt("button_repeat_rate_ms");
|
|
||||||
+ m_configuration.iButtonReleaseDelayMs = GetSettingInt("button_release_delay_ms");
|
|
||||||
}
|
|
||||||
|
|
||||||
void CPeripheralCecAdapter::ReadLogicalAddresses(const std::string &strString, cec_logical_addresses &addresses)
|
|
@ -1,25 +0,0 @@
|
|||||||
From defea2828a7b4dba7c94c33896c1cd16d1f29f29 Mon Sep 17 00:00:00 2001
|
|
||||||
From: popcornmix <popcornmix@gmail.com>
|
|
||||||
Date: Mon, 3 Nov 2014 23:17:46 +0000
|
|
||||||
Subject: [PATCH] [cec] Don't discard buttons when repeat mode is enabled
|
|
||||||
|
|
||||||
---
|
|
||||||
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 5 ++++-
|
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
|
||||||
index b5ff693..6086bf5 100644
|
|
||||||
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
|
||||||
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
|
||||||
@@ -767,7 +767,10 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key)
|
|
||||||
CLog::Log(LOGDEBUG, "%s - received key %2x duration %d", __FUNCTION__, key.iButton, key.iDuration);
|
|
||||||
|
|
||||||
CSingleLock lock(m_critSection);
|
|
||||||
- if (key.iDuration > 0)
|
|
||||||
+ // avoid the queue getting too long
|
|
||||||
+ if (m_configuration.iButtonRepeatRateMs && m_buttonQueue.size() > 5)
|
|
||||||
+ return;
|
|
||||||
+ if (m_configuration.iButtonRepeatRateMs == 0 && key.iDuration > 0)
|
|
||||||
{
|
|
||||||
if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0)
|
|
||||||
{
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -Naur kodi-15.0-rc1-9ff25f8/configure.ac kodi-15.0-rc1-9ff25f8.patch/configure.ac
|
|
||||||
--- kodi-15.0-rc1-9ff25f8/configure.ac 2015-07-02 23:35:21.000000000 +0200
|
|
||||||
+++ kodi-15.0-rc1-9ff25f8.patch/configure.ac 2015-07-04 08:15:52.284856500 +0200
|
|
||||||
@@ -1051,7 +1051,7 @@
|
|
||||||
AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
|
|
||||||
AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
|
|
||||||
AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
|
|
||||||
- LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util"
|
|
||||||
+ LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lvcsm"
|
|
||||||
else
|
|
||||||
AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library))
|
|
||||||
AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user