From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Thu, 26 Apr 2012 12:50:41 +0000 (+0200)
Subject: cec: fixed serverVersion assignment that went out of scope in CECInitialise()
X-Git-Tag: upstream/2.2.0~1^2~29^2^2~15
X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=f250c7a4be817d96f7849e53232a5de32419c4e4

cec: fixed serverVersion assignment that went out of scope in CECInitialise()
---

diff --git a/include/cec.h b/include/cec.h
index f656bb8..fada217 100644
--- a/include/cec.h
+++ b/include/cec.h
@@ -36,6 +36,8 @@
 
 #include "cectypes.h"
 
+#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_1_6_2
+
 namespace CEC
 {
   class ICECAdapter
diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 1c92bb1..51fb764 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -61,7 +61,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, libcec_configuration *configur
 {
   CreateBusDevices();
   m_configuration.Clear();
-  m_configuration.serverVersion = CEC_SERVER_VERSION_1_6_2;
+  m_configuration.serverVersion = LIBCEC_VERSION_CURRENT;
   SetConfiguration(configuration);
 
   if (m_configuration.tvVendor != CEC_VENDOR_UNKNOWN)
@@ -79,7 +79,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con
     m_iLastTransmission(0)
 {
   m_configuration.Clear();
-  m_configuration.serverVersion    = CEC_SERVER_VERSION_1_6_2;
+  m_configuration.serverVersion    = LIBCEC_VERSION_CURRENT;
 
   // client version < 1.5.0
   m_configuration.clientVersion    = (uint32_t)CEC_CLIENT_VERSION_PRE_1_5;
diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 608375f..46decfb 100644
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -540,6 +540,7 @@ void * CECInitialise(libcec_configuration *configuration)
 {
   CLibCEC *lib = new CLibCEC(configuration);
   CLibCEC::SetInstance(lib);
+  configuration->serverVersion = LIBCEC_VERSION_CURRENT;
   return static_cast< void* > (lib);
 }