aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--language/Dutch/strings.xml3
-rw-r--r--language/English/strings.xml1
-rw-r--r--lib/libcec/Makefile2
-rw-r--r--project/BuildDependencies/scripts/libcec_d.txt2
-rw-r--r--system/peripherals.xml21
-rw-r--r--tools/darwin/depends/libcec/Makefile2
-rw-r--r--xbmc/peripherals/devices/PeripheralCecAdapter.cpp17
7 files changed, 29 insertions, 19 deletions
diff --git a/language/Dutch/strings.xml b/language/Dutch/strings.xml
index 545cc333c8..8452a88435 100644
--- a/language/Dutch/strings.xml
+++ b/language/Dutch/strings.xml
@@ -2407,4 +2407,7 @@
<string id="36020">Maak XBMC de actieve bron bij het opstarten</string>
<string id="36021">Physiek adres (overschrijft HDMI poort)</string>
<string id="36022">COM poort (laat leeg, tenzij noodzakelijk)</string>
+ <string id="36023">Configuratie aangepast</string>
+ <string id="36024">Kon de nieuwe configuratie niet instellen. Controleer de instellingen.</string>
+ <string id="36025">Verstuur 'inactieve bron' commando bij het stoppen</string>
</strings> \ No newline at end of file
diff --git a/language/English/strings.xml b/language/English/strings.xml
index c3e4608a5d..5ad11ddcea 100644
--- a/language/English/strings.xml
+++ b/language/English/strings.xml
@@ -2414,4 +2414,5 @@
<string id="36022">COM port (leave empty unless needed)</string>
<string id="36023">Configuration updated</string>
<string id="36024">Failed to set the new configuration. Please check your settings.</string>
+ <string id="36025">Send 'inactive source' command when stopping XBMC</string>
</strings>
diff --git a/lib/libcec/Makefile b/lib/libcec/Makefile
index d9af68808a..27eb5d27f3 100644
--- a/lib/libcec/Makefile
+++ b/lib/libcec/Makefile
@@ -7,7 +7,7 @@
# lib name, version
LIBNAME=libcec
-VERSION=1.5.0
+VERSION=1.5.1
SOURCE=$(LIBNAME)-$(VERSION)
# download location and format
diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt
index 0f7046189b..9aa0d55531 100644
--- a/project/BuildDependencies/scripts/libcec_d.txt
+++ b/project/BuildDependencies/scripts/libcec_d.txt
@@ -1,3 +1,3 @@
; filename source of the file
-libcec1.5.0.zip http://packages.pulse-eight.net/windows/
+libcec1.5.1.zip http://packages.pulse-eight.net/windows/
diff --git a/system/peripherals.xml b/system/peripherals.xml
index 1df6f1a461..c6852f7b03 100644
--- a/system/peripherals.xml
+++ b/system/peripherals.xml
@@ -10,18 +10,19 @@
<peripheral vendor_product="2548:1001" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
<setting key="enabled" type="bool" value="1" label="305" order="1" />
- <setting key="activate_source" type="bool" value="1" label="36020" order="2" />
- <setting key="wake_devices" type="string" value="0" label="36007" order="3" />
- <setting key="standby_devices" type="string" value="0" label="36008" order="4" />
+ <setting key="activate_source" type="bool" value="1" label="36020" order="2" />
+ <setting key="wake_devices" type="string" value="0" label="36007" order="3" />
+ <setting key="standby_devices" type="string" value="0" label="36008" order="4" />
<setting key="cec_standby_screensaver" type="bool" value="1" label="36009" order="5" />
- <setting key="standby_pc_on_tv_standby" type="bool" value="1" label="36014" order="6" />
- <setting key="use_tv_menu_language" type="bool" value="1" label="36018" order="7" />
- <setting key="physical_address" type="string" label="36021" value="0" order="8" />
- <setting key="cec_hdmi_port" type="int" value="1" min="1" max="16" label="36015" order="9" />
- <setting key="connected_device" type="int" label="36019" value="0" min="0" max="15" step="1" order="10" />
- <setting key="port" type="string" value="" label="36022" order="11" />
+ <setting key="standby_pc_on_tv_standby" type="bool" value="1" label="36014" order="6" />
+ <setting key="send_inactive_source" type="bool" value="1" label="36025" order="7" />
+ <setting key="use_tv_menu_language" type="bool" value="1" label="36018" order="8" />
+ <setting key="physical_address" type="string" label="36021" value="0" order="9" />
+ <setting key="cec_hdmi_port" type="int" value="1" min="1" max="16" label="36015" order="10" />
+ <setting key="connected_device" type="int" label="36019" value="0" min="0" max="15" step="1" order="11" />
+ <setting key="port" type="string" value="" label="36022" order="12" />
- <setting key="tv_vendor" type="int" value="0" configurable="0" />
+ <setting key="tv_vendor" type="int" value="0" configurable="0" />
<setting key="device_name" type="string" value="XBMC" configurable="0" />
<setting key="device_type" type="int" value="1" configurable="0" />
</peripheral>
diff --git a/tools/darwin/depends/libcec/Makefile b/tools/darwin/depends/libcec/Makefile
index be4ee35648..abba42d268 100644
--- a/tools/darwin/depends/libcec/Makefile
+++ b/tools/darwin/depends/libcec/Makefile
@@ -2,7 +2,7 @@ include ../Makefile.include
# lib name, version
LIBNAME=libcec
-VERSION=1.5.0
+VERSION=1.5.1
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
index cf398fd5b3..658a9ea30b 100644
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -309,7 +309,7 @@ void CPeripheralCecAdapter::Process(void)
{
if (m_configuration.bPowerOffOnStandby == 1)
m_cecAdapter->StandbyDevices();
- else
+ else if (m_configuration.bSendInactiveSource == 1)
m_cecAdapter->SetInactiveView();
}
@@ -956,23 +956,27 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu
SetSetting("wake_devices", strPowerOffDevices.Trim());
// set the boolean settings
- m_configuration.bUseTVMenuLanguage = m_configuration.bUseTVMenuLanguage;
+ m_configuration.bUseTVMenuLanguage = config.bUseTVMenuLanguage;
SetSetting("use_tv_menu_language", m_configuration.bUseTVMenuLanguage == 1);
- m_configuration.bActivateSource = m_configuration.bActivateSource;
+ m_configuration.bActivateSource = config.bActivateSource;
SetSetting("activate_source", m_configuration.bActivateSource == 1);
- m_configuration.bPowerOffScreensaver = m_configuration.bPowerOffScreensaver;
+ m_configuration.bPowerOffScreensaver = config.bPowerOffScreensaver;
SetSetting("cec_standby_screensaver", m_configuration.bPowerOffScreensaver == 1);
- m_configuration.bPowerOffOnStandby = m_configuration.bPowerOffOnStandby;
+ m_configuration.bPowerOffOnStandby = config.bPowerOffOnStandby;
SetSetting("standby_pc_on_tv_standby", m_configuration.bPowerOffOnStandby == 1);
+
+ if (config.serverVersion >= CEC_SERVER_VERSION_1_5_1)
+ m_configuration.bSendInactiveSource = config.bSendInactiveSource;
+ SetSetting("send_inactive_source", m_configuration.bSendInactiveSource == 1);
}
void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
{
// client version 1.5.0
- m_configuration.clientVersion = CEC_CLIENT_VERSION_1_5_0;
+ m_configuration.clientVersion = CEC_CLIENT_VERSION_1_5_1;
// device name 'XBMC'
snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());
@@ -1030,6 +1034,7 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
m_configuration.bActivateSource = GetSettingBool("activate_source") ? 1 : 0;
m_configuration.bPowerOffScreensaver = GetSettingBool("cec_standby_screensaver") ? 1 : 0;
m_configuration.bPowerOffOnStandby = GetSettingBool("standby_pc_on_tv_standby") ? 1 : 0;
+ m_configuration.bSendInactiveSource = GetSettingBool("send_inactive_source") ? 1 : 0;
}
void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses)
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-16 14:57:17 +0000