X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=1642ef1f7968c0faf0d870bbaf85f5839726f424;hb=ce37a9b17b1eee6488f6d3cdba534d5da71c3ea4;hp=d4c0ed9e7a1e6406c7d98799a84101f39554fc1f;hpb=f3b6afa4b5b7637741592ce4535e34e04e68cb6a;p=deb_libcec.git

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index d4c0ed9..1642ef1 100644
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -180,7 +180,6 @@ void EnableCallbacks(ICECAdapter *adapter)
   g_callbacks.CBCecLogMessage = &CecLogMessage;
   g_callbacks.CBCecKeyPress   = &CecKeyPress;
   g_callbacks.CBCecCommand    = &CecCommand;
-  g_callbacks.CBCecConfigurationChanged = NULL;
   adapter->EnableCallbacks(NULL, &g_callbacks);
 }
 
@@ -1023,7 +1022,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 +1045,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 +1066,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;