From e4a7396c0e39d6ea8f7b007774407cfd57766a21 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Wed, 18 Apr 2012 11:39:33 +0200 Subject: [PATCH] cec: updated changelog and bumped version numbers for 1.6.1 --- debian/changelog | 9 ++++++++ include/cectypes.h | 8 ++++--- project/cec-config.rc | Bin 3232 -> 3232 bytes project/libcec.rc | Bin 3202 -> 3202 bytes project/testclient.rc | Bin 3230 -> 3230 bytes src/CecSharpTester/CecSharpClient.cs | 2 +- src/CecSharpTester/Properties/AssemblyInfo.cs | 4 ++-- src/LibCecSharp/AssemblyInfo.cpp | 2 +- src/LibCecSharp/CecSharpTypes.h | 20 ++++++++++-------- src/cec-config-gui/Properties/AssemblyInfo.cs | 4 ++-- src/lib/CECProcessor.cpp | 8 +++++-- src/lib/LibCEC.cpp | 2 +- src/testclient/main.cpp | 2 +- 13 files changed, 39 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index d3b160e..a04a100 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libcec (1.6-2) unstable; urgency=low + + * fixed: + * fixed typo in CUSBCECAdapterCommands::RequestSettings() that prevented + the settings from being read. the settings were still written, but never + read when bGetSettingsFromROM = 1. + + -- Pulse-Eight Packaging Wed, 18 Apr 2012 11:30:00 +0100 + libcec (1.6-1) unstable; urgency=medium * changed/added: diff --git a/include/cectypes.h b/include/cectypes.h index 28c8d92..1fd6dfd 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -90,7 +90,7 @@ namespace CEC { #define CEC_MIN_LIB_VERSION 1 #define CEC_LIB_VERSION_MAJOR 1 -#define CEC_LIB_VERSION_MINOR 5 +#define CEC_LIB_VERSION_MINOR 6 typedef enum cec_abort_reason { @@ -994,7 +994,8 @@ typedef enum cec_client_version CEC_CLIENT_VERSION_1_5_1 = 0x1501, CEC_CLIENT_VERSION_1_5_2 = 0x1502, CEC_CLIENT_VERSION_1_5_3 = 0x1503, - CEC_CLIENT_VERSION_1_6_0 = 0x1600 + CEC_CLIENT_VERSION_1_6_0 = 0x1600, + CEC_CLIENT_VERSION_1_6_1 = 0x1601 } cec_client_version; typedef enum cec_server_version @@ -1004,7 +1005,8 @@ typedef enum cec_server_version CEC_SERVER_VERSION_1_5_1 = 0x1501, CEC_SERVER_VERSION_1_5_2 = 0x1502, CEC_SERVER_VERSION_1_5_3 = 0x1503, - CEC_SERVER_VERSION_1_6_0 = 0x1600 + CEC_SERVER_VERSION_1_6_0 = 0x1600, + CEC_SERVER_VERSION_1_6_1 = 0x1601 } cec_server_version; typedef struct libcec_configuration diff --git a/project/cec-config.rc b/project/cec-config.rc index cc3fb1333f8b18d5d2ade9a6e46fad6e45f4aca7..0b0f33b5c99e21b386b95a62572ae7c6a3db2bb7 100644 GIT binary patch delta 48 zcmZ1=xj=G*A2XxjWPfHuM#IgG%-lfE=3X{WCT2qhy~*;dl9O3Dg(k1#h2y<=nsawp5PN=|;pA+-4! H#~fw=X8#U$ delta 52 zcmZpYY?9pI$INIj*`L{v(O`2Uvp6%W0fQcc!Q_SPx|>h2y<=nsawp5PN=|;pA+-4! H#~fw=W_}KG diff --git a/project/testclient.rc b/project/testclient.rc index d4bfa3b625bbc8a883001b6e3d17bfb326b0b5af..b8821e380cbed6042133fdaf9436b3a5b25ca458 100644 GIT binary patch delta 50 zcmbOyIZtwfA2XxjWPfHuM#IgG%!16!h75X>sA7B;Re1uJa2_~@l1IIdM07v=^ A@&Et; delta 50 zcmbOyIZtwfA2XxDWPfHuMuW|b%!16!1`K+WsA7B;Re1uJa2_~@l1IIdM07rui A?f?J) diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs index 442c282..2163823 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.Version1_5_0; + Config.ClientVersion = CecClientVersion.Version1_6_1; Config.SetCallbacks(this); LogLevel = (int)CecLogLevel.All; diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs index bc11567..439ae4c 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("1.6.0.0")] -[assembly: AssemblyFileVersion("1.6.0.0")] +[assembly: AssemblyVersion("1.6.1.0")] +[assembly: AssemblyFileVersion("1.6.1.0")] diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp index d70e9d0..6af9947 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("1.6.0.0")]; +[assembly:AssemblyVersionAttribute("1.6.1.0")]; [assembly:ComVisible(false)]; [assembly:CLSCompliantAttribute(true)]; diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h index cc888c7..d618925 100644 --- a/src/LibCecSharp/CecSharpTypes.h +++ b/src/LibCecSharp/CecSharpTypes.h @@ -350,20 +350,22 @@ namespace CecSharp { VersionPre1_5 = 0, Version1_5_0 = 0x1500, - Version1_5_1 = 0x1501, - Version1_5_2 = 0x1502, - Version1_5_3 = 0x1503, - Version1_6_0 = 0x1600 + Version1_5_1 = 0x1501, + Version1_5_2 = 0x1502, + Version1_5_3 = 0x1503, + Version1_6_0 = 0x1600, + Version1_6_1 = 0x1601 }; - public enum class CecServerVersion + public enum class CecServerVersion { VersionPre1_5 = 0, Version1_5_0 = 0x1500, - Version1_5_1 = 0x1501, - Version1_5_2 = 0x1502, - Version1_5_3 = 0x1503, - Version1_6_0 = 0x1600 + Version1_5_1 = 0x1501, + Version1_5_2 = 0x1502, + Version1_5_3 = 0x1503, + Version1_6_0 = 0x1600, + Version1_6_1 = 0x1601 }; public ref class CecAdapter diff --git a/src/cec-config-gui/Properties/AssemblyInfo.cs b/src/cec-config-gui/Properties/AssemblyInfo.cs index 829c847..26a9fb3 100644 --- a/src/cec-config-gui/Properties/AssemblyInfo.cs +++ b/src/cec-config-gui/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("1.6.0.0")] -[assembly: AssemblyFileVersion("1.6.0.0")] +[assembly: AssemblyVersion("1.6.1.0")] +[assembly: AssemblyFileVersion("1.6.1.0")] diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index c7d586e..cf42233 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -59,7 +59,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, libcec_configuration *configur { CreateBusDevices(); m_configuration.Clear(); - m_configuration.serverVersion = CEC_SERVER_VERSION_1_6_0; + m_configuration.serverVersion = CEC_SERVER_VERSION_1_6_1; SetConfiguration(configuration); if (m_configuration.tvVendor != CEC_VENDOR_UNKNOWN) @@ -77,7 +77,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con m_iLastTransmission(0) { m_configuration.Clear(); - m_configuration.serverVersion = CEC_SERVER_VERSION_1_6_0; + m_configuration.serverVersion = CEC_SERVER_VERSION_1_6_1; // client version < 1.5.0 m_configuration.clientVersion = (uint32_t)CEC_CLIENT_VERSION_PRE_1_5; @@ -1414,6 +1414,8 @@ const char *CCECProcessor::ToString(const cec_client_version version) return "1.5.3"; case CEC_CLIENT_VERSION_1_6_0: return "1.6.0"; + case CEC_CLIENT_VERSION_1_6_1: + return "1.6.1"; default: return "Unknown"; } @@ -1435,6 +1437,8 @@ const char *CCECProcessor::ToString(const cec_server_version version) return "1.5.3"; case CEC_SERVER_VERSION_1_6_0: return "1.6.0"; + case CEC_SERVER_VERSION_1_6_1: + return "1.6.1"; default: return "Unknown"; } diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp index 3230e68..20c670d 100644 --- a/src/lib/LibCEC.cpp +++ b/src/lib/LibCEC.cpp @@ -60,7 +60,7 @@ CLibCEC::CLibCEC(libcec_configuration *configuration) : m_callbacks(configuration->callbacks), m_cbParam(configuration->callbackParam) { - configuration->serverVersion = CEC_SERVER_VERSION_1_6_0; + configuration->serverVersion = CEC_SERVER_VERSION_1_6_1; m_cec = new CCECProcessor(this, configuration); } diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index c47017d..0e73874 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -1068,7 +1068,7 @@ int main (int argc, char *argv[]) g_config.Clear(); snprintf(g_config.strDeviceName, 13, "CECTester"); g_config.callbackParam = NULL; - g_config.clientVersion = CEC_CLIENT_VERSION_1_6_0; + g_config.clientVersion = CEC_CLIENT_VERSION_1_6_1; g_callbacks.CBCecLogMessage = &CecLogMessage; g_callbacks.CBCecKeyPress = &CecKeyPress; g_callbacks.CBCecCommand = &CecCommand; -- 2.34.1