Permalink
Browse files

Merge pull request #1576 from Pulse-Eight/libcec2

[cec] libCEC 2.0.0 support
  • Loading branch information...
2 parents ad6ef9b + 415d11c commit 922dfc46ef06a8fe7a00f90b195cb735bbdfcff7 @opdenkamp opdenkamp committed Oct 10, 2012
View
@@ -1449,9 +1449,9 @@ if test "x$use_libcec" != "xno"; then
# libcec is dyloaded, so we need to check for its headers and link any depends.
if test "x$use_libcec" != "xno"; then
if test "x$use_libcec" != "xauto"; then
- PKG_CHECK_MODULES([CEC],[libcec >= 1.8.0],,[use_libcec="no";AC_MSG_ERROR($libcec_disabled)])
+ PKG_CHECK_MODULES([CEC],[libcec >= 2.0.0],,[use_libcec="no";AC_MSG_ERROR($libcec_disabled)])
else
- PKG_CHECK_MODULES([CEC],[libcec >= 1.8.0],,[use_libcec="no";AC_MSG_RESULT($libcec_disabled)])
+ PKG_CHECK_MODULES([CEC],[libcec >= 2.0.0],,[use_libcec="no";AC_MSG_RESULT($libcec_disabled)])
fi
if test "x$use_libcec" != "xno"; then
@@ -10914,7 +10914,7 @@ msgid "Product ID"
msgstr ""
#empty strings from id 35505 to 35999
-
+#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
msgctxt "#36000"
msgid "Pulse-Eight CEC adapter"
msgstr ""
@@ -10965,11 +10965,7 @@ msgctxt "#36012"
msgid "Could not initialise the CEC adapter. Please check your settings."
msgstr ""
-msgctxt "#36013"
-msgid "Unsupported libCEC interface version. %d is greater than the version XBMC supports (%d)"
-msgstr ""
-
-#empty string with id 36014
+#empty strings from id 36013 to 36014
msgctxt "#36015"
msgid "HDMI port number"
@@ -11061,3 +11057,21 @@ msgstr ""
msgctxt "#36036"
msgid "On start/stop"
msgstr ""
+
+#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+msgctxt "#36037"
+msgid "TV"
+msgstr ""
+
+msgctxt "#36038"
+msgid "Amplifier / AVR device"
+msgstr ""
+
+msgctxt "#36039"
+msgid "TV and AVR device (explicit)"
+msgstr ""
+
+msgctxt "#36040"
+msgid "Unsupported libCEC interface version. %x is lower than the version XBMC supports (%x)"
+msgstr ""
+
View
@@ -7,7 +7,7 @@
# lib name, version
LIBNAME=libcec
-VERSION=1.8.1
+VERSION=2.0.0
SOURCE=$(LIBNAME)-$(VERSION)
# download location and format
@@ -1,3 +1,3 @@
; filename source of the file
-libcec-1.8.1.zip http://mirrors.xbmc.org/build-deps/win32/
+libcec-2.0.0.zip http://mirrors.xbmc.org/build-deps/win32/
View
@@ -12,12 +12,12 @@
<peripheral vendor_product="2708:1001" bus="rpi" name="Raspberry Pi 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="cec_standby_screensaver" type="bool" value="0" label="36009" order="5" />
- <setting key="standby_pc_on_tv_standby" type="enum" value="13011" label="36029" order="6" lvalues="36028|13005|13011" />
- <setting key="standby_tv_on_pc_standby" type="bool" value="1" label="36026" order="7" />
- <setting key="send_inactive_source" type="bool" value="1" label="36025" order="8" />
+ <setting key="wake_devices" type="enum" value="36037" label="36007" lvalues="36037|36038|36039|231" order="3" />
+ <setting key="standby_devices" type="enum" value="36037" label="36008" lvalues="36037|36038|36039|231" order="4" />
+ <setting key="send_inactive_source" type="bool" value="1" label="36025" order="5" />
+ <setting key="cec_standby_screensaver" type="bool" value="0" label="36009" order="7" />
+ <setting key="standby_pc_on_tv_standby" type="enum" value="13011" label="36029" order="7" lvalues="36028|13005|13011" />
+ <setting key="standby_tv_on_pc_standby" type="bool" value="1" label="36026" order="8" />
<setting key="use_tv_menu_language" type="bool" value="1" label="36018" order="9" />
<setting key="tv_vendor" type="int" value="0" configurable="0" />
@@ -27,27 +27,33 @@
<setting key="cec_hdmi_port" type="int" value="1" label="36015" configurable="0" />
<setting key="connected_device" type="int" label="36019" value="0" configurable="0" />
<setting key="port" type="string" value="" label="36022" 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="2000" configurable="0" />
</peripheral>
<peripheral vendor_product="2548:1001,2548:1002" 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="cec_standby_screensaver" type="bool" value="0" label="36009" order="5" />
- <setting key="standby_pc_on_tv_standby" type="enum" value="13011" label="36029" order="6" lvalues="36028|13005|13011" />
- <setting key="standby_tv_on_pc_standby" type="bool" value="1" label="36026" order="7" />
- <setting key="send_inactive_source" type="bool" value="1" label="36025" order="8" />
+ <setting key="wake_devices" type="enum" value="36037" label="36007" lvalues="36037|36038|36039|231" order="3" />
+ <setting key="standby_devices" type="enum" value="36037" label="36008" lvalues="36037|36038|36039|231" order="4" />
+ <setting key="send_inactive_source" type="bool" value="1" label="36025" order="5" />
+ <setting key="cec_standby_screensaver" type="bool" value="0" label="36009" order="6" />
+ <setting key="standby_pc_on_tv_standby" type="enum" value="13011" label="36029" order="7" lvalues="36028|13005|13011" />
+ <setting key="standby_tv_on_pc_standby" type="bool" value="1" label="36026" order="8" />
<setting key="use_tv_menu_language" type="bool" value="1" label="36018" order="9" />
<setting key="pause_playback_on_deactivate" type="bool" value="1" label="36033" order="10" />
- <setting key="physical_address" type="string" label="36021" value="0" order="11" />
+ <setting key="connected_device" type="enum" label="36019" value="36037" lvalues="36037|36038" order="11" />
<setting key="cec_hdmi_port" type="int" value="1" min="1" max="15" label="36015" order="12" />
- <setting key="connected_device" type="int" label="36019" value="0" min="0" max="15" step="1" order="13" />
+ <setting key="physical_address" type="string" label="36021" value="0" order="13" />
<setting key="port" type="string" value="" label="36022" order="14" />
<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" />
+ <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="2000" configurable="0" />
</peripheral>
<peripheral vendor_product="15C2:32,15C2:33,15C2:34,15C2:35,15C2:36,15C2:37,15C2:38,15C2:39,15C2:3A,15C2:3B,15C2:3C,15C2:3D,15C2:3E,15C2:3F,15C2:41,15C2:42,15C2:43,15C2:44,15C2:45,15C2:46" bus="usb" name="iMON HID device" mapTo="imon">
@@ -3,7 +3,7 @@ include ../config.site.mk
# lib name, version
LIBNAME=libcec
-VERSION=1.8.1
+VERSION=2.0.0
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
Oops, something went wrong.

0 comments on commit 922dfc4

Please sign in to comment.