From 784a6a797b71aafabbcbcb666b2e42ee02e13010 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Mon, 15 Oct 2012 13:52:37 +0200 Subject: [PATCH] bumped version and updated changelog --- ChangeLog | 12 ++++++++++++ debian/changelog | 12 ++++++++++++ include/cec.h | 2 +- include/cectypes.h | 2 ++ project/cec-config.rc | Bin 3232 -> 3232 bytes project/libCEC.nsi | 2 +- 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 | 12 ++++++++++-- src/LibCecTray/Properties/AssemblyInfo.cs | 4 ++-- src/LibCecTray/controller/CECController.cs | 2 +- src/cec-config/cec-config.cpp | 2 +- src/lib/CECTypeUtils.h | 8 ++++++-- src/testclient/main.cpp | 2 +- 17 files changed, 53 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index ccb10d2..983d006 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +libcec (2.0.2-2) unstable; urgency=medium + + * fixed: + * updating the device status after a poll was broken and could reset the + status of devices that were marked as handled by libCEC to 'not + present' + * don't keep spamming the bus with a vendor command when an active source + switch is pending for panasonic, but only send it when needed + * reset CVLCommandHandler::m_bCapabilitiesSent when the TV goes to standby + + -- Pulse-Eight Packaging Mon, 15 Oct 2012 13:52:00 +0100 + libcec (2.0.2-1) unstable; urgency=low * changed/added: diff --git a/debian/changelog b/debian/changelog index ccb10d2..983d006 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libcec (2.0.2-2) unstable; urgency=medium + + * fixed: + * updating the device status after a poll was broken and could reset the + status of devices that were marked as handled by libCEC to 'not + present' + * don't keep spamming the bus with a vendor command when an active source + switch is pending for panasonic, but only send it when needed + * reset CVLCommandHandler::m_bCapabilitiesSent when the TV goes to standby + + -- Pulse-Eight Packaging Mon, 15 Oct 2012 13:52:00 +0100 + libcec (2.0.2-1) unstable; urgency=low * changed/added: diff --git a/include/cec.h b/include/cec.h index d10f433..ba12a87 100644 --- a/include/cec.h +++ b/include/cec.h @@ -36,7 +36,7 @@ #include "cectypes.h" -#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_2_0_1 +#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_2_0_2 namespace CEC { diff --git a/include/cectypes.h b/include/cectypes.h index f68007b..6b7f73c 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -1375,6 +1375,7 @@ typedef enum cec_client_version CEC_CLIENT_VERSION_1_99_0 = 0x1990, CEC_CLIENT_VERSION_2_0_0 = 0x2000, CEC_CLIENT_VERSION_2_0_1 = 0x2001, + CEC_CLIENT_VERSION_2_0_2 = 0x2002, } cec_client_version; typedef enum cec_server_version @@ -1398,6 +1399,7 @@ typedef enum cec_server_version CEC_SERVER_VERSION_1_99_0 = 0x1990, CEC_SERVER_VERSION_2_0_0 = 0x2000, CEC_SERVER_VERSION_2_0_1 = 0x2001, + CEC_SERVER_VERSION_2_0_2 = 0x2002, } cec_server_version; struct libcec_configuration diff --git a/project/cec-config.rc b/project/cec-config.rc index bc1299da66e7e33e3d1a4130ad1735bddef5d756..7a9da22b6c09b69028e223b21d4a2bc581028c0a 100644 GIT binary patch delta 48 zcmZ1=xj=G*A2XxTWPfHuMx)J*%-lfE=3X{WCT1fBy~*;dl9O3Dg(k1#h2y<=nsawp5PN=|;pA+-4! H#~fw=XMhfR delta 52 zcmZpYY?9pI$INIr*`L{v(QtDkvp6%WA%h-+!Q_SPx|>h2y<=nsawp5PN=|;pA+-4! H#~fw=X8#U$ diff --git a/project/testclient.rc b/project/testclient.rc index 1d6382b69816b2092cbb7248fbed00136a96c25c..abb8ee4b4e592f709bed20989f032dc76a324f85 100644 GIT binary patch delta 50 zcmbOyIZtwfA2XxTWPfHuMx)J*%!16!MhtqBsA7B;Re1uJa2_~@l1IIdM07!8R A_5c6? delta 50 zcmbOyIZtwfA2XxjWPfHuM#IgG%!16!h75X>sA7B;Re1uJa2_~@l1IIdM07v=^ A@&Et; diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs index 37b04e9..cd9b0e9 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_0; + Config.ClientVersion = CecClientVersion.Version2_0_2; Config.SetCallbacks(this); LogLevel = (int)CecLogLevel.All; diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs index 799111d..23128fc 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.1.0")] -[assembly: AssemblyFileVersion("2.0.1.0")] +[assembly: AssemblyVersion("2.0.2.0")] +[assembly: AssemblyFileVersion("2.0.2.0")] diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp index bb64ab4..fe944b5 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.1.0")]; +[assembly:AssemblyVersionAttribute("2.0.2.0")]; [assembly:ComVisible(false)]; [assembly:CLSCompliantAttribute(true)]; diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h index 908b3fc..e183be3 100644 --- a/src/LibCecSharp/CecSharpTypes.h +++ b/src/LibCecSharp/CecSharpTypes.h @@ -1167,7 +1167,11 @@ namespace CecSharp /// /// v2.0.1 /// - Version2_0_1 = 0x2001 + Version2_0_1 = 0x2001, + /// + /// v2.0.2 + /// + Version2_0_2 = 0x2002 }; /// @@ -1250,7 +1254,11 @@ namespace CecSharp /// /// v2.0.1 /// - Version2_0_1 = 0x2001 + Version2_0_1 = 0x2001, + /// + /// v2.0.2 + /// + Version2_0_2 = 0x2002 }; /// diff --git a/src/LibCecTray/Properties/AssemblyInfo.cs b/src/LibCecTray/Properties/AssemblyInfo.cs index 80c33c6..aad28dd 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.1.0")] -[assembly: AssemblyFileVersion("2.0.1.0")] +[assembly: AssemblyVersion("2.0.2.0")] +[assembly: AssemblyFileVersion("2.0.2.0")] diff --git a/src/LibCecTray/controller/CECController.cs b/src/LibCecTray/controller/CECController.cs index f81cd94..ebce4ba 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_0 }; + _config = new LibCECConfiguration { DeviceName = "CEC Tray", ClientVersion = CecClientVersion.Version2_0_2 }; _config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice; _config.SetCallbacks(this); diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp index 380adee..a7cae9c 100644 --- a/src/cec-config/cec-config.cpp +++ b/src/cec-config/cec-config.cpp @@ -160,7 +160,7 @@ bool OpenConnection(cec_device_type type = CEC_DEVICE_TYPE_RECORDING_DEVICE) g_config.Clear(); snprintf(g_config.strDeviceName, 13, "CEC-config"); g_config.callbackParam = NULL; - g_config.clientVersion = (uint32_t)CEC_CLIENT_VERSION_2_0_0; + g_config.clientVersion = (uint32_t)CEC_CLIENT_VERSION_2_0_2; g_callbacks.CBCecLogMessage = &CecLogMessage; g_callbacks.CBCecKeyPress = &CecKeyPress; g_callbacks.CBCecCommand = &CecCommand; diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h index 5d34b46..21a651d 100644 --- a/src/lib/CECTypeUtils.h +++ b/src/lib/CECTypeUtils.h @@ -559,6 +559,8 @@ namespace CEC return "2.0.0"; case CEC_CLIENT_VERSION_2_0_1: return "2.0.1"; + case CEC_CLIENT_VERSION_2_0_2: + return "2.0.2"; default: return "Unknown"; } @@ -602,10 +604,12 @@ namespace CEC return "1.9.0"; case CEC_SERVER_VERSION_1_99_0: return "2.0.0-pre"; - case CEC_CLIENT_VERSION_2_0_0: + case CEC_SERVER_VERSION_2_0_0: return "2.0.0"; - case CEC_CLIENT_VERSION_2_0_1: + case CEC_SERVER_VERSION_2_0_1: return "2.0.1"; + case CEC_SERVER_VERSION_2_0_2: + return "2.0.2"; default: return "Unknown"; } diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index 24ddde5..2050ee9 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -48,7 +48,7 @@ using namespace CEC; using namespace std; using namespace PLATFORM; -#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_2_0_1; +#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_2_0_2; #include "../../include/cecloader.h" -- 2.34.1