added CEC_CLIENT_VERSION_CURRENT and CEC_SERVER_VERSION_CURRENT. closes #88
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 14 Nov 2012 16:01:17 +0000 (17:01 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 14 Nov 2012 16:01:38 +0000 (17:01 +0100)
include/cec.h
include/cectypes.h
src/cec-config/cec-config.cpp
src/testclient/main.cpp

index 7d14a47366d74cbdecb3f213164df6e3a2ecd7eb..c68bba81487dbccc85a9c32f749087e7a71f4622 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "cectypes.h"
 
-#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_2_0_3
+#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_CURRENT
 
 namespace CEC
 {
index 48d1ab8f7b840a5c41b965235903acf43b18f53b..a690dc71000e9929509b85ea331a05b2832cfcdd 100644 (file)
@@ -1377,6 +1377,7 @@ typedef enum cec_client_version
   CEC_CLIENT_VERSION_2_0_1   = 0x2001,
   CEC_CLIENT_VERSION_2_0_2   = 0x2002,
   CEC_CLIENT_VERSION_2_0_3   = 0x2003,
+  CEC_CLIENT_VERSION_CURRENT = 0x2003
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1402,6 +1403,7 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_2_0_1   = 0x2001,
   CEC_SERVER_VERSION_2_0_2   = 0x2002,
   CEC_SERVER_VERSION_2_0_3   = 0x2003,
+  CEC_SERVER_VERSION_CURRENT = 0x2003
 } cec_server_version;
 
 struct libcec_configuration
index a7cae9c3a2c3501e4dd4ea99277bcb1886520db6..da0f125b2df9dba99e8d848b08ed3d8e2bca7877 100644 (file)
@@ -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_2;
+  g_config.clientVersion      = (uint32_t)CEC_CLIENT_VERSION_CURRENT;
   g_callbacks.CBCecLogMessage = &CecLogMessage;
   g_callbacks.CBCecKeyPress   = &CecKeyPress;
   g_callbacks.CBCecCommand    = &CecCommand;
index bb6e133b8417c22eefa331f62a92d1e5ccb42a1b..372706189f11e25b3fcd548ddc4142a1cf2e1821 100644 (file)
@@ -48,7 +48,7 @@ using namespace CEC;
 using namespace std;
 using namespace PLATFORM;
 
-#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_2_0_3;
+#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_CURRENT;
 
 #include "../../include/cecloader.h"