Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[cec] missing commits from #2386

  • Loading branch information...
commit 7b1d0b0e8a4ad67c0ae946b534e619e51f7819d1 1 parent d7d7b6d
Lars Op den Kamp authored
2  lib/libcec/Makefile
View
@@ -7,7 +7,7 @@
# lib name, version
LIBNAME=libcec
-VERSION=2.0.3
+VERSION=2.1.1
SOURCE=$(LIBNAME)-$(VERSION)
# download location and format
2  project/BuildDependencies/scripts/libcec_d.txt
View
@@ -1,3 +1,3 @@
; filename source of the file
-libcec-2.1.0.zip http://mirrors.xbmc.org/build-deps/win32/
+libcec-2.1.1.zip http://mirrors.xbmc.org/build-deps/win32/
2  tools/android/depends/libcec/Makefile
View
@@ -3,7 +3,7 @@ DEPS= ../Makefile.include Makefile
# lib name, version
LIBNAME=libcec
-VERSION=2.1.0
+VERSION=2.1.1
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
2  tools/darwin/depends/libcec/Makefile
View
@@ -3,7 +3,7 @@ include ../config.site.mk
# lib name, version
LIBNAME=libcec
-VERSION=2.1.0
+VERSION=2.1.1
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
23 xbmc/peripherals/devices/PeripheralCecAdapter.cpp
View
@@ -44,7 +44,7 @@ using namespace ANNOUNCEMENT;
using namespace CEC;
using namespace std;
-#define CEC_LIB_SUPPORTED_VERSION 0x2000
+#define CEC_LIB_SUPPORTED_VERSION 0x2100
/* time in seconds to ignore standby commands from devices after the screensaver has been activated */
#define SCREENSAVER_TIMEOUT 10
@@ -347,13 +347,6 @@ bool CPeripheralCecAdapter::OpenConnection(void)
libcec_configuration config;
if (m_cecAdapter->GetCurrentConfiguration(&config))
{
- // wake devices
- for (uint8_t iDevice = CECDEVICE_TV; iDevice < CECDEVICE_BROADCAST; iDevice++)
- {
- if ((config.bActivateSource == 0 || iDevice != CECDEVICE_TV) && config.wakeDevices.IsSet((cec_logical_address)iDevice))
- m_cecAdapter->PowerOnDevices((cec_logical_address)iDevice);
- }
-
// update the local configuration
CSingleLock lock(m_critSection);
SetConfigurationFromLibCEC(config);
@@ -1305,8 +1298,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu
void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
{
- // client version 2.0.0
- m_configuration.clientVersion = CEC_CLIENT_VERSION_2_0_0;
+ // use the same client version as libCEC version
+ m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT;
// device name 'XBMC'
snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());
@@ -1558,14 +1551,16 @@ CStdString CPeripheralCecAdapterUpdateThread::UpdateAudioSystemStatus(void)
bool CPeripheralCecAdapterUpdateThread::SetInitialConfiguration(void)
{
- // devices to wake are set
- if (!m_configuration.wakeDevices.IsEmpty())
- m_adapter->m_cecAdapter->PowerOnDevices(CECDEVICE_BROADCAST);
-
// the option to make XBMC the active source is set
if (m_configuration.bActivateSource == 1)
m_adapter->m_cecAdapter->SetActiveSource();
+ // devices to wake are set
+ cec_logical_addresses tvOnly;
+ tvOnly.Clear(); tvOnly.Set(CECDEVICE_TV);
+ if (!m_configuration.wakeDevices.IsEmpty() && (m_configuration.wakeDevices != tvOnly || m_configuration.bActivateSource == 0))
+ m_adapter->m_cecAdapter->PowerOnDevices(CECDEVICE_BROADCAST);
+
// wait until devices are powered up
if (!WaitReady())
return false;
Please sign in to comment.
Something went wrong with that request. Please try again.