From: Lars Op den Kamp Date: Tue, 22 Jan 2013 01:39:03 +0000 (+0100) Subject: bump to libCEC v2.1.0. closes #125 X-Git-Tag: upstream/2.2.0~1^2~6^2~7 X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=9b56a19a140bd34799c558e4d879f517ff3ad5ca bump to libCEC v2.1.0. closes #125 --- diff --git a/ChangeLog b/ChangeLog index d284eda..b537d2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +libcec (2.1.0-1) unstable; urgency=low + + * changed: + * added vendor id for Denon + * LibCECTray: Added ability to send modifiers by nesting commands in + KeyInput.cs. credits: Nate Burr + * rpi: Added /opt/vc/include/interface/vmcs_host/linux to rpi_cflags to fix + building on 'next' firmware branch. credits: Nedim Lisica + * fixed: + * don't send two active source message sequences to philips. issue #118 + * don't send deck status updates to philips when activating the source + * update the active source status correctly after a manual switch to + another source. closes #124 + * rename cec_audio_status() to cec_audio_get_status() to avoid conflict + with the cec_audio_status enum. This makes the C API compile again. + credits: Dave Chapman + * LibCECTray: Fixed bug with libcec adding the keyup for button commands + and making sure they are still executed. credits: Nate Burr + * rpi: don't wait for a response (and fail) when opening a connection. + issue #109 + * rpi: don't try to re-register a logical address when the logical address + isn't registered and we receive a VC_CEC_LOGICAL_ADDR_LOST message from + the firmware. issue #109 + + -- Pulse-Eight Packaging Tue, 22 Jan 2013 02:37:00 +0100 + libcec (2.0.5-1) unstable; urgency=low * changed: diff --git a/configure.ac b/configure.ac index 3b61291..9b2ac34 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([libcec], [2:0:0], [http://libcec.pulse-eight.com/]) +AC_INIT([libcec], [2:1:0], [http://libcec.pulse-eight.com/]) AC_CONFIG_HEADERS([config.h]) AH_TOP([#pragma once]) diff --git a/debian/changelog b/debian/changelog index d284eda..b537d2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +libcec (2.1.0-1) unstable; urgency=low + + * changed: + * added vendor id for Denon + * LibCECTray: Added ability to send modifiers by nesting commands in + KeyInput.cs. credits: Nate Burr + * rpi: Added /opt/vc/include/interface/vmcs_host/linux to rpi_cflags to fix + building on 'next' firmware branch. credits: Nedim Lisica + * fixed: + * don't send two active source message sequences to philips. issue #118 + * don't send deck status updates to philips when activating the source + * update the active source status correctly after a manual switch to + another source. closes #124 + * rename cec_audio_status() to cec_audio_get_status() to avoid conflict + with the cec_audio_status enum. This makes the C API compile again. + credits: Dave Chapman + * LibCECTray: Fixed bug with libcec adding the keyup for button commands + and making sure they are still executed. credits: Nate Burr + * rpi: don't wait for a response (and fail) when opening a connection. + issue #109 + * rpi: don't try to re-register a logical address when the logical address + isn't registered and we receive a VC_CEC_LOGICAL_ADDR_LOST message from + the firmware. issue #109 + + -- Pulse-Eight Packaging Tue, 22 Jan 2013 02:37:00 +0100 + libcec (2.0.5-1) unstable; urgency=low * changed: diff --git a/include/cectypes.h b/include/cectypes.h index 002ff97..3a004aa 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -307,7 +307,7 @@ namespace CEC { /*! * libCEC's minor version number */ -#define CEC_LIB_VERSION_MINOR 0 +#define CEC_LIB_VERSION_MINOR 1 #define MSGSTART 0xFF #define MSGEND 0xFE @@ -1399,7 +1399,8 @@ typedef enum cec_client_version CEC_CLIENT_VERSION_2_0_3 = 0x2003, CEC_CLIENT_VERSION_2_0_4 = 0x2004, CEC_CLIENT_VERSION_2_0_5 = 0x2005, - CEC_CLIENT_VERSION_CURRENT = 0x2005 + CEC_CLIENT_VERSION_2_1_0 = 0x2100, + CEC_CLIENT_VERSION_CURRENT = 0x2100 } cec_client_version; typedef enum cec_server_version @@ -1427,7 +1428,8 @@ typedef enum cec_server_version CEC_SERVER_VERSION_2_0_3 = 0x2003, CEC_SERVER_VERSION_2_0_4 = 0x2004, CEC_SERVER_VERSION_2_0_5 = 0x2005, - CEC_SERVER_VERSION_CURRENT = 0x2005 + CEC_SERVER_VERSION_2_1_0 = 0x2100, + CEC_SERVER_VERSION_CURRENT = 0x2100 } cec_server_version; struct libcec_configuration diff --git a/project/libCEC.nsi b/project/libCEC.nsi index 635df7a..2e60739 100644 --- a/project/libCEC.nsi +++ b/project/libCEC.nsi @@ -7,7 +7,7 @@ !include "LogicLib.nsh" !include "x64.nsh" -Name "Pulse-Eight libCEC version 2.0.5" +Name "Pulse-Eight libCEC version 2.1.0" OutFile "..\build\libCEC-installer.exe" XPStyle on diff --git a/project/libcec.rc b/project/libcec.rc index 0b1ebe1..3b766b5 100644 Binary files a/project/libcec.rc and b/project/libcec.rc differ diff --git a/project/testclient.rc b/project/testclient.rc index 1f44a18..161e867 100644 Binary files a/project/testclient.rc and b/project/testclient.rc differ diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs index 0e8f460..16f7774 100644 --- a/src/CecSharpTester/CecSharpClient.cs +++ b/src/CecSharpTester/CecSharpClient.cs @@ -43,7 +43,7 @@ namespace CecSharpClient Config = new LibCECConfiguration(); Config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice; Config.DeviceName = "CEC Tester"; - Config.ClientVersion = CecClientVersion.Version2_0_5; + Config.ClientVersion = CecClientVersion.Version2_1_0; Config.SetCallbacks(this); LogLevel = (int)CecLogLevel.All; diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs index d49913b..88b38b1 100644 --- a/src/CecSharpTester/Properties/AssemblyInfo.cs +++ b/src/CecSharpTester/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.5.0")] -[assembly: AssemblyFileVersion("2.0.5.0")] +[assembly: AssemblyVersion("2.1.0.0")] +[assembly: AssemblyFileVersion("2.1.0.0")] diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp index 8e4ecb8..d78f5d8 100644 --- a/src/LibCecSharp/AssemblyInfo.cpp +++ b/src/LibCecSharp/AssemblyInfo.cpp @@ -13,7 +13,7 @@ using namespace System::Security::Permissions; [assembly:AssemblyTrademarkAttribute("")]; [assembly:AssemblyCultureAttribute("")]; -[assembly:AssemblyVersionAttribute("2.0.5.0")]; +[assembly:AssemblyVersionAttribute("2.1.0.0")]; [assembly:ComVisible(false)]; [assembly:CLSCompliantAttribute(true)]; diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h index ff97ef4..67829da 100644 --- a/src/LibCecSharp/CecSharpTypes.h +++ b/src/LibCecSharp/CecSharpTypes.h @@ -1187,7 +1187,11 @@ namespace CecSharp /// /// v2.0.5 /// - Version2_0_5 = 0x2005 + Version2_0_5 = 0x2005, + /// + /// v2.1.0 + /// + Version2_1_0 = 0x2100 }; /// @@ -1286,7 +1290,11 @@ namespace CecSharp /// /// v2.0.5 /// - Version2_0_5 = 0x2005 + Version2_0_5 = 0x2005, + /// + /// v2.1.0 + /// + Version2_1_0 = 0x2100 }; /// @@ -1309,7 +1317,11 @@ namespace CecSharp /// /// Raspberry Pi /// - RaspberryPi = 0x100 + RaspberryPi = 0x100, + /// + /// TDA995x + /// + TDA995x = 0x200 }; /// @@ -1673,8 +1685,8 @@ namespace CecSharp PhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS; BaseDevice = (CecLogicalAddress)CEC_DEFAULT_BASE_DEVICE; HDMIPort = CEC_DEFAULT_HDMI_PORT; - ClientVersion = CecClientVersion::VersionPre1_5; - ServerVersion = CecServerVersion::VersionPre1_5; + ClientVersion = CecClientVersion::Version2_1_0; + ServerVersion = CecServerVersion::Version2_1_0; TvVendor = CecVendorId::Unknown; GetSettingsFromROM = false; diff --git a/src/LibCecTray/Properties/AssemblyInfo.cs b/src/LibCecTray/Properties/AssemblyInfo.cs index 3f09c27..adb816e 100644 --- a/src/LibCecTray/Properties/AssemblyInfo.cs +++ b/src/LibCecTray/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.5.0")] -[assembly: AssemblyFileVersion("2.0.5.0")] +[assembly: AssemblyVersion("2.1.0.0")] +[assembly: AssemblyFileVersion("2.1.0.0")] diff --git a/src/LibCecTray/controller/CECController.cs b/src/LibCecTray/controller/CECController.cs index 751330f..e82bce0 100644 --- a/src/LibCecTray/controller/CECController.cs +++ b/src/LibCecTray/controller/CECController.cs @@ -438,7 +438,7 @@ namespace LibCECTray.controller { if (_config == null) { - _config = new LibCECConfiguration { DeviceName = "CEC Tray", ClientVersion = CecClientVersion.Version2_0_5 }; + _config = new LibCECConfiguration { DeviceName = "CEC Tray", ClientVersion = CecClientVersion.Version2_1_0 }; _config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice; _config.SetCallbacks(this); diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h index 0c83298..55aaa33 100644 --- a/src/lib/CECTypeUtils.h +++ b/src/lib/CECTypeUtils.h @@ -569,6 +569,8 @@ namespace CEC return "2.0.4"; case CEC_CLIENT_VERSION_2_0_5: return "2.0.5"; + case CEC_CLIENT_VERSION_2_1_0: + return "2.1.0"; default: return "Unknown"; } @@ -624,6 +626,8 @@ namespace CEC return "2.0.4"; case CEC_SERVER_VERSION_2_0_5: return "2.0.5"; + case CEC_SERVER_VERSION_2_1_0: + return "2.1.0"; default: return "Unknown"; }