bumped version numbers to 1.8.1, updated changelog

[deb_libcec.git] / src / cec-config / cec-config.cpp

diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index 7b203cb87c079b7663cb4c850009a9fcdfed2945..d7775e990718bb37ee4118b9e18b1f5aa7e965a6 100644 (file)
--- a/src/cec-config/cec-config.cpp
+++ b/src/cec-config/cec-config.cpp
@@ -30,7 +30,8 @@
  *     http://www.pulse-eight.net/
  */
 
-#include "../../include/cec.h"
+#include "../env.h"
+#include "../include/cec.h"
 
 #include <cstdio>
 #include <fcntl.h>
@@ -41,6 +42,7 @@
 #include "../lib/platform/threads/mutex.h"
 #include "../lib/platform/util/timeutils.h"
 #include "../lib/implementations/CECCommandHandler.h"
+#include "../lib/platform/util/StdString.h"
 
 using namespace CEC;
 using namespace std;
@@ -157,7 +159,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_1_6_2;
+  g_config.clientVersion      = (uint32_t)CEC_CLIENT_VERSION_1_8_1;
   g_callbacks.CBCecLogMessage = &CecLogMessage;
   g_callbacks.CBCecKeyPress   = &CecKeyPress;
   g_callbacks.CBCecCommand    = &CecCommand;
@@ -169,6 +171,9 @@ bool OpenConnection(cec_device_type type = CEC_DEVICE_TYPE_RECORDING_DEVICE)
   if (!g_parser)
     return false;
 
+  // init video on targets that need this
+  g_parser->InitVideoStandalone();
+
   CStdString strPort;
   cec_adapter devices[10];
   uint8_t iDevicesFound = g_parser->FindAdapters(devices, 10, NULL);
@@ -431,11 +436,11 @@ int main (int UNUSED(argc), char *UNUSED(argv[]))
     CStdString strWakeDevices;
     for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
       if (g_config.wakeDevices[iPtr])
-        strWakeDevices.AppendFormat(" %d" + iPtr);
+        strWakeDevices.AppendFormat(" %d", iPtr);
     CStdString strStandbyDevices;
     for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
       if (g_config.powerOffDevices[iPtr])
-        strStandbyDevices.AppendFormat(" %d" + iPtr);
+        strStandbyDevices.AppendFormat(" %d", iPtr);
 
     configOutput <<
         "<settings>\n" <<