Merge pull request #1895 from opdenkamp/libcec2.0.5

[cec] bump to libCEC 2.0.5
xbmc · Dec 6, 2012 · 130e8f7 · 130e8f7
2 parents a6821e5 + f45b8e8
commit 130e8f7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt
@@ -1,3 +1,3 @@
 ; filename                        source of the file
 
-libcec-2.0.3.zip                  http://mirrors.xbmc.org/build-deps/win32/
+libcec-2.0.5.zip                  http://mirrors.xbmc.org/build-deps/win32/
diff --git a/tools/android/depends/libcec/Makefile b/tools/android/depends/libcec/Makefile
@@ -3,15 +3,15 @@ DEPS= ../Makefile.include android.patch Makefile
 
 # lib name, version
 LIBNAME=libcec
-VERSION=1.5.2
+VERSION=2.0.5
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
 # configuration settings
 CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \
           ac_cv_search_dlopen=yes
 
-LIBDYLIB=$(PLATFORM)/src/lib/.libs/libcec.so.1.0.5
+LIBDYLIB=$(PLATFORM)/src/lib/.libs/libcec.so.2.0.0
 
 all: .installed-$(PLATFORM)
 

diff --git a/tools/darwin/depends/libcec/Makefile b/tools/darwin/depends/libcec/Makefile
@@ -3,7 +3,7 @@ include ../config.site.mk
 
 # lib name, version
 LIBNAME=libcec
-VERSION=2.0.3
+VERSION=2.0.5
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 

diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -379,13 +379,12 @@ bool CPeripheralCecAdapter::OpenConnection(void)
     libcec_configuration config;
     if (m_cecAdapter->GetCurrentConfiguration(&config))
     {
-      // send wakeup commands
-      if (!config.wakeDevices.IsEmpty())
-        m_cecAdapter->PowerOnDevices(CECDEVICE_BROADCAST);
-
-      // make xbmc the active source
-      if (config.bActivateSource == 1)
-        m_cecAdapter->SetActiveSource();
+      // 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);