diff options
| author | Lars Op den Kamp <opdenkamp@gmail.com> | 2012-12-06 14:06:52 -0800 |
|---|---|---|
| committer | Lars Op den Kamp <opdenkamp@gmail.com> | 2012-12-06 14:06:52 -0800 |
| commit | 130e8f77e2d5091a3401035fc6c6ef06acf2c868 (patch) | |
| tree | cad32b22fb6a495ab183781e3ab2f6508562322b | |
| parent | a6821e5825c09de07784d37b16cc3d254825e629 (diff) | |
| parent | f45b8e8f8942f6fd86aaa31a8a856f59b1346483 (diff) | |
Merge pull request #1895 from opdenkamp/libcec2.0.5
[cec] bump to libCEC 2.0.5
| -rw-r--r-- | project/BuildDependencies/scripts/libcec_d.txt | 2 | ||||
| -rw-r--r-- | tools/android/depends/libcec/Makefile | 4 | ||||
| -rw-r--r-- | tools/darwin/depends/libcec/Makefile | 2 | ||||
| -rw-r--r-- | xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 13 |
4 files changed, 10 insertions, 11 deletions
diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt index c4032f92a3..c1419b58df 100644 --- 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 index 2c9565bae2..8cc3c7ba49 100644 --- a/tools/android/depends/libcec/Makefile +++ b/tools/android/depends/libcec/Makefile @@ -3,7 +3,7 @@ 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 @@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.gz 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 index a82ad02d23..b06fd0e84c 100644 --- 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 index 9762da19ae..366bca3cf0 100644 --- 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); |