cec: updated changelog and bumped version numbers for 1.6.1

[deb_libcec.git] / src / testclient / main.cpp

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index c9a74d7b0364eac3162a9d7ca12fc09af97e0da2..0e7387487564a4779cd58cd4444f39f5a0befdeb 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -181,6 +181,7 @@ void EnableCallbacks(ICECAdapter *adapter)
   g_callbacks.CBCecKeyPress   = &CecKeyPress;
   g_callbacks.CBCecCommand    = &CecCommand;
   g_callbacks.CBCecConfigurationChanged = NULL;
+  g_callbacks.CBCecAlert      = NULL;
   adapter->EnableCallbacks(NULL, &g_callbacks);
 }
 
@@ -207,8 +208,8 @@ void ListDevices(ICECAdapter *parser)
         PrintToStdOut("WARNING: unable to open the device on port %s", devices[iDevicePtr].comm);
       else
         strDeviceInfo.AppendFormat("firmware version:   %d\n", config.iFirmwareVersion);
+      strDeviceInfo.append("\n");
     }
-
     PrintToStdOut(strDeviceInfo.c_str());
   }
 }
@@ -1023,7 +1024,12 @@ bool ProcessCommandLineArguments(int argc, char *argv[])
       {
         if (argc >= iArgPtr + 2)
         {
-          g_config.iHDMIPort = (int8_t)atoi(argv[iArgPtr + 1]);
+          uint8_t hdmiport = (int8_t)atoi(argv[iArgPtr + 1]);
+          if (hdmiport < 1)
+              hdmiport = 1;
+          if (hdmiport > 15)
+              hdmiport = 15;
+          g_config.iHDMIPort = hdmiport;
           cout << "using HDMI port '" << (int)g_config.iHDMIPort << "'" << endl;
           ++iArgPtr;
         }
@@ -1041,7 +1047,7 @@ bool ProcessCommandLineArguments(int argc, char *argv[])
       {
         if (argc >= iArgPtr + 2)
         {
-          snprintf(g_config.strDeviceName, 13, argv[iArgPtr + 1]);
+          snprintf(g_config.strDeviceName, 13, "%s", argv[iArgPtr + 1]);
           cout << "using osd name " << g_config.strDeviceName << endl;
           ++iArgPtr;
         }
@@ -1062,7 +1068,7 @@ int main (int argc, char *argv[])
   g_config.Clear();
   snprintf(g_config.strDeviceName, 13, "CECTester");
   g_config.callbackParam       = NULL;
-  g_config.clientVersion       = CEC_CLIENT_VERSION_1_5_0;
+  g_config.clientVersion       = CEC_CLIENT_VERSION_1_6_1;
   g_callbacks.CBCecLogMessage  = &CecLogMessage;
   g_callbacks.CBCecKeyPress    = &CecKeyPress;
   g_callbacks.CBCecCommand     = &CecCommand;