From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Wed, 25 Apr 2012 13:27:44 +0000 (+0200)
Subject: cec: bump libCEC internal version number to 1.6.2. drop dupe libcec server version... 
X-Git-Tag: upstream/2.2.0~1^2~29^2^2~39
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=dcb4b95e147360fc37765b2b591a710f0b982534;p=deb_libcec.git

cec: bump libCEC internal version number to 1.6.2. drop dupe libcec server version assignment
---

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 32f9947..2c3bf13 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -59,7 +59,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, libcec_configuration *configur
 {
   CreateBusDevices();
   m_configuration.Clear();
-  m_configuration.serverVersion = CEC_SERVER_VERSION_1_6_1;
+  m_configuration.serverVersion = CEC_SERVER_VERSION_1_6_2;
   SetConfiguration(configuration);
 
   if (m_configuration.tvVendor != CEC_VENDOR_UNKNOWN)
@@ -77,7 +77,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con
     m_iLastTransmission(0)
 {
   m_configuration.Clear();
-  m_configuration.serverVersion    = CEC_SERVER_VERSION_1_6_1;
+  m_configuration.serverVersion    = CEC_SERVER_VERSION_1_6_2;
 
   // client version < 1.5.0
   m_configuration.clientVersion    = (uint32_t)CEC_CLIENT_VERSION_PRE_1_5;
@@ -194,8 +194,9 @@ bool CCECProcessor::OpenConnection(const char *strPort, uint16_t iBaudRate, uint
     if (iBuildDate > 0)
     {
       time_t buildTime = (time_t)iBuildDate;
-      strLog.AppendFormat(", firmware build date: %s +0000", asctime(gmtime(&buildTime)));
+      strLog.AppendFormat(", firmware build date: %s", asctime(gmtime(&buildTime)));
       strLog = strLog.Left(strLog.length() - 1); // strip \n added by asctime
+      strLog.append(" +0000");
     }
     CLibCEC::AddLog(CEC_LOG_NOTICE, strLog);
   }
diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index a59fae7..4812e39 100644
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -60,7 +60,6 @@ CLibCEC::CLibCEC(libcec_configuration *configuration) :
     m_callbacks(configuration->callbacks),
     m_cbParam(configuration->callbackParam)
 {
-  configuration->serverVersion = CEC_SERVER_VERSION_1_6_1;
   m_cec = new CCECProcessor(this, configuration);
 }