From d484304464eec5e35c35589e797e27cdd871b959 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Wed, 14 Nov 2012 17:01:17 +0100 Subject: [PATCH] added CEC_CLIENT_VERSION_CURRENT and CEC_SERVER_VERSION_CURRENT. closes #88 --- include/cec.h | 2 +- include/cectypes.h | 2 ++ src/cec-config/cec-config.cpp | 2 +- src/testclient/main.cpp | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/cec.h b/include/cec.h index 7d14a47..c68bba8 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_3 +#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_CURRENT namespace CEC { diff --git a/include/cectypes.h b/include/cectypes.h index 48d1ab8..a690dc7 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -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 diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp index a7cae9c..da0f125 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_2; + g_config.clientVersion = (uint32_t)CEC_CLIENT_VERSION_CURRENT; g_callbacks.CBCecLogMessage = &CecLogMessage; g_callbacks.CBCecKeyPress = &CecKeyPress; g_callbacks.CBCecCommand = &CecCommand; diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index bb6e133..3727061 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_3; +#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_CURRENT; #include "../../include/cecloader.h" -- 2.34.1