cec: bump libCEC internal version number to 1.6.2. drop dupe libcec server version...
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 25 Apr 2012 13:27:44 +0000 (15:27 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 25 Apr 2012 13:27:44 +0000 (15:27 +0200)
src/lib/CECProcessor.cpp
src/lib/LibCEC.cpp

index 32f9947bf51fdca2c1c4598d89e152c284514c3f..2c3bf13b5562380bcc3a10291718b67814307233 100644 (file)
@@ -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);
   }
index a59fae711964c3e1b32fded66d0793470eb9d505..4812e39007726489ef19cbf94c46c929536603e9 100644 (file)
@@ -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);
 }