From 1664420dd2cd46c9daafeb541c45d055d176bcdc Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Wed, 5 Sep 2012 17:05:08 +0200 Subject: [PATCH] bump version numbers to 1.9.0 --- configure.ac | 2 +- include/cec.h | 2 +- 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 | 8 ++++++-- src/cec-config-gui/CecConfigGUI.cs | 2 +- src/cec-config-gui/Properties/AssemblyInfo.cs | 4 ++-- src/cec-config/cec-config.cpp | 2 +- src/lib/CECTypeUtils.h | 4 ++++ src/testclient/main.cpp | 2 +- 15 files changed, 26 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index ae1b5a5..0d09d42 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([libcec], [1:8:0], [http://libcec.pulse-eight.com/]) +AC_INIT([libcec], [1:9:0], [http://libcec.pulse-eight.com/]) AC_CONFIG_HEADERS([config.h]) AH_TOP([#pragma once]) diff --git a/include/cec.h b/include/cec.h index 12f35b2..f5e7590 100644 --- a/include/cec.h +++ b/include/cec.h @@ -36,7 +36,7 @@ #include "cectypes.h" -#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_1_8_2 +#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_1_9_0 namespace CEC { diff --git a/include/cectypes.h b/include/cectypes.h index 515c552..291190c 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -120,7 +120,7 @@ namespace CEC { #define CEC_MIN_LIB_VERSION 1 #define CEC_LIB_VERSION_MAJOR 1 #define CEC_LIB_VERSION_MAJOR_STR "1" -#define CEC_LIB_VERSION_MINOR 8 +#define CEC_LIB_VERSION_MINOR 9 typedef enum cec_abort_reason { @@ -1194,7 +1194,8 @@ typedef enum cec_client_version CEC_CLIENT_VERSION_1_7_2 = 0x1702, CEC_CLIENT_VERSION_1_8_0 = 0x1800, CEC_CLIENT_VERSION_1_8_1 = 0x1801, - CEC_CLIENT_VERSION_1_8_2 = 0x1802 + CEC_CLIENT_VERSION_1_8_2 = 0x1802, + CEC_CLIENT_VERSION_1_9_0 = 0x1900 } cec_client_version; typedef enum cec_server_version @@ -1213,7 +1214,8 @@ typedef enum cec_server_version CEC_SERVER_VERSION_1_7_2 = 0x1702, CEC_SERVER_VERSION_1_8_0 = 0x1800, CEC_SERVER_VERSION_1_8_1 = 0x1801, - CEC_SERVER_VERSION_1_8_2 = 0x1802 + CEC_SERVER_VERSION_1_8_2 = 0x1802, + CEC_SERVER_VERSION_1_9_0 = 0x1900 } cec_server_version; typedef struct libcec_configuration diff --git a/project/cec-config.rc b/project/cec-config.rc index 93552147730f07000451dd895b4e3bc0c5b50d2d..794082517e725c368e0775be77d891de7be39725 100644 GIT binary patch delta 64 zcmZ1=xj=G*7c;9RgARkiWPfH|2y1gAGdoC7kHKJbFPke9JDAC!H(8!laxx32(ByTT LT$}kgCouy6vP%si delta 64 zcmZ1=xj=G*7c;8`gARk?WPfH|2y1gAGdoC7kHK(rFPke9JDAC!H(8!laxx32(ByTT LT$}kgCouy6vO5hS diff --git a/project/libcec.rc b/project/libcec.rc index 05e40fe31ef9c30d5372107d28f53e0159c9968b..7b488df50750ddabfc055c8d25f3895293552703 100644 GIT binary patch delta 68 zcmZpYY?9pI#ms8Spu=D=*`HY#!rI)(EX>Sl$)Lwz0K$_Ovg>X>#rBGk9V#?go>g-4 NGY+B6&p75V0|5Bl5DEYQ delta 68 zcmZpYY?9pI#ms8Kpu=D|*`HY#!rI)(EX>Sl!Jx-r2*d`H7qaVaKE?KmksT^DS)NsL O@-q&h&CfXIFarSi%@7Iz diff --git a/project/testclient.rc b/project/testclient.rc index 8d5a34be7089d9cc62ff08fc277b04e49e4f1d37..c227b7ee4dbeb2394564b646f19f930bd3591900 100644 GIT binary patch delta 66 zcmbOyIZtwf7c;9RgARkiWPfH|2y1gAGcPl{C4(M=0fXLTc~;5E2Ux{6A7SHRLKfWo Ifnyyr0N5}Nh5!Hn delta 66 zcmbOyIZtwf7c;8`gARk?WPfH|2y1gAGcPl{1%n=gA%oszc~;5E2Ux{6A7SHRLKfWo Ifnyyr0N5Z7h5!Hn diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs index 0d58134..dca7ce0 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_8_1; + Config.ClientVersion = CecClientVersion.Version1_9_0; Config.SetCallbacks(this); LogLevel = (int)CecLogLevel.All; diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs index 7161761..53d167c 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.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.9.0.0")] +[assembly: AssemblyFileVersion("1.9.0.0")] diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp index 8cfa0ad..9f633ca 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.8.1.0")]; +[assembly:AssemblyVersionAttribute("1.9.0.0")]; [assembly:ComVisible(false)]; [assembly:CLSCompliantAttribute(true)]; diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h index 7b02c0d..52c0b20 100644 --- a/src/LibCecSharp/CecSharpTypes.h +++ b/src/LibCecSharp/CecSharpTypes.h @@ -371,7 +371,9 @@ namespace CecSharp Version1_7_1 = 0x1701, Version1_7_2 = 0x1702, Version1_8_0 = 0x1800, - Version1_8_1 = 0x1801 + Version1_8_1 = 0x1801, + Version1_8_2 = 0x1802, + Version1_9_0 = 0x1900 }; public enum class CecServerVersion @@ -389,7 +391,9 @@ namespace CecSharp Version1_7_1 = 0x1701, Version1_7_2 = 0x1702, Version1_8_0 = 0x1800, - Version1_8_1 = 0x1801 + Version1_8_1 = 0x1801, + Version1_8_2 = 0x1802, + Version1_9_0 = 0x1900 }; public ref class CecAdapter diff --git a/src/cec-config-gui/CecConfigGUI.cs b/src/cec-config-gui/CecConfigGUI.cs index 7521b09..0e83c6a 100644 --- a/src/cec-config-gui/CecConfigGUI.cs +++ b/src/cec-config-gui/CecConfigGUI.cs @@ -28,7 +28,7 @@ namespace CecConfigGui Config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice; Config.DeviceName = "CEC Config"; Config.GetSettingsFromROM = true; - Config.ClientVersion = CecClientVersion.Version1_8_1; + Config.ClientVersion = CecClientVersion.Version1_9_0; Callbacks = new CecCallbackWrapper(this); Config.SetCallbacks(Callbacks); LoadXMLConfiguration(ref Config); diff --git a/src/cec-config-gui/Properties/AssemblyInfo.cs b/src/cec-config-gui/Properties/AssemblyInfo.cs index 91c1763..891de3e 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.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.9.0.0")] +[assembly: AssemblyFileVersion("1.9.0.0")] diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp index d7775e9..a3d2b77 100644 --- a/src/cec-config/cec-config.cpp +++ b/src/cec-config/cec-config.cpp @@ -159,7 +159,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_1_8_1; + g_config.clientVersion = (uint32_t)CEC_CLIENT_VERSION_1_9_0; 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 ac9e7d6..a791634 100644 --- a/src/lib/CECTypeUtils.h +++ b/src/lib/CECTypeUtils.h @@ -549,6 +549,8 @@ namespace CEC return "1.8.1"; case CEC_CLIENT_VERSION_1_8_2: return "1.8.2"; + case CEC_CLIENT_VERSION_1_9_0: + return "1.9.0"; default: return "Unknown"; } @@ -588,6 +590,8 @@ namespace CEC return "1.8.1"; case CEC_SERVER_VERSION_1_8_2: return "1.8.2"; + case CEC_SERVER_VERSION_1_9_0: + return "1.9.0"; default: return "Unknown"; } diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index e47c24b..84133a9 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -47,7 +47,7 @@ using namespace CEC; using namespace std; using namespace PLATFORM; -#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_1_8_2; +#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_1_9_0; #include "../../include/cecloader.h" -- 2.34.1