X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=2e35dce4e5e32491a4a20d7191c79b0fb48aa68b;hb=0e1971485665b684b77f620dcd39c1b88a0300b3;hp=f16bcbf0404eb8baaacec0cef18662af921530a5;hpb=f8513317a5f4bb2d9d0843193c3c98eca19f8e8a;p=deb_libcec.git

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index f16bcbf..2e35dce 100644
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -105,7 +105,7 @@ bool GetWord(string& data, string& word)
   return true;
 }
 
-void flush_log(ICECAdapter *cecParser)
+void FlushLog(ICECAdapter *cecParser)
 {
   cec_log_message message;
   while (cecParser && cecParser->GetNextLogMessage(&message))
@@ -149,7 +149,7 @@ void flush_log(ICECAdapter *cecParser)
   }
 }
 
-void list_devices(ICECAdapter *parser)
+void ListDevices(ICECAdapter *parser)
 {
   cec_adapter *devices = new cec_adapter[10];
   uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL);
@@ -171,7 +171,7 @@ void list_devices(ICECAdapter *parser)
   }
 }
 
-void show_help(const char* strExec)
+void ShowHelpCommandLine(const char* strExec)
 {
   cout << endl <<
       strExec << " {-h|--help|-l|--list-devices|[COM PORT]}" << endl <<
@@ -184,6 +184,8 @@ void show_help(const char* strExec)
       "  -sf --short-log-file {file} Writes all libCEC log message without timestamps" << endl <<
       "                              and log levels to a file." << endl <<
       "  -d --log-level {level}      Sets the log level. See cectypes.h for values." << endl <<
+      "  -s --single-command         Execute a single command and exit. Does not power" << endl <<
+      "                              on devices on startup and power them off on exit." << endl <<
       "  [COM PORT]                  The com port to connect to. If no COM" << endl <<
       "                              port is given, the client tries to connect to the" << endl <<
       "                              first device that is detected." << endl <<
@@ -192,7 +194,7 @@ void show_help(const char* strExec)
       "available commands" << endl;
 }
 
-ICECAdapter *create_parser(cec_device_type_list typeList)
+ICECAdapter *CreateParser(cec_device_type_list typeList)
 {
   ICECAdapter *parser = LibCecInit("CECTester", typeList);
   if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION)
@@ -212,7 +214,7 @@ ICECAdapter *create_parser(cec_device_type_list typeList)
   return parser;
 }
 
-void show_console_help(void)
+void ShowHelpConsole(void)
 {
   cout << endl <<
   "================================================================================" << endl <<
@@ -267,9 +269,10 @@ void show_console_help(void)
 int main (int argc, char *argv[])
 {
   cec_device_type_list typeList;
-  typeList.clear();
+  typeList.Clear();
 
   int iArgPtr = 1;
+  bool bSingleCommand(false);
   while (iArgPtr < argc)
   {
     if (argc >= iArgPtr + 1)
@@ -300,7 +303,8 @@ int main (int argc, char *argv[])
           if (iNewLevel >= CEC_LOG_ERROR && iNewLevel <= CEC_LOG_ALL)
           {
             g_cecLogLevel = iNewLevel;
-            cout << "log level set to " << argv[iArgPtr + 1] << endl;
+            if (!bSingleCommand)
+              cout << "log level set to " << argv[iArgPtr + 1] << endl;
           }
           else
           {
@@ -321,23 +325,27 @@ int main (int argc, char *argv[])
         {
           if (!strcmp(argv[iArgPtr + 1], "p"))
           {
-            cout << "== using device type 'playback device'" << endl;
-            typeList.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+            if (!bSingleCommand)
+              cout << "== using device type 'playback device'" << endl;
+            typeList.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
           }
           else if (!strcmp(argv[iArgPtr + 1], "r"))
           {
-            cout << "== using device type 'recording device'" << endl;
-            typeList.add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+            if (!bSingleCommand)
+              cout << "== using device type 'recording device'" << endl;
+            typeList.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
           }
           else if (!strcmp(argv[iArgPtr + 1], "t"))
           {
-            cout << "== using device type 'tuner'" << endl;
-            typeList.add(CEC_DEVICE_TYPE_TUNER);
+            if (!bSingleCommand)
+              cout << "== using device type 'tuner'" << endl;
+            typeList.Add(CEC_DEVICE_TYPE_TUNER);
           }
           else if (!strcmp(argv[iArgPtr + 1], "a"))
           {
-            cout << "== using device type 'audio system'" << endl;
-            typeList.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
+            if (!bSingleCommand)
+              cout << "== using device type 'audio system'" << endl;
+            typeList.Add(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
           }
           else
           {
@@ -350,18 +358,24 @@ int main (int argc, char *argv[])
       else if (!strcmp(argv[iArgPtr], "--list-devices") ||
                !strcmp(argv[iArgPtr], "-l"))
       {
-        ICECAdapter *parser = create_parser(typeList);
+        ICECAdapter *parser = CreateParser(typeList);
         if (parser)
         {
-          list_devices(parser);
+          ListDevices(parser);
           UnloadLibCec(parser);
         }
         return 0;
       }
+      else if (!strcmp(argv[iArgPtr], "--single-command") ||
+          !strcmp(argv[iArgPtr], "-s"))
+      {
+        bSingleCommand = true;
+        ++iArgPtr;
+      }
       else if (!strcmp(argv[iArgPtr], "--help") ||
                !strcmp(argv[iArgPtr], "-h"))
       {
-        show_help(argv[0]);
+        ShowHelpCommandLine(argv[0]);
         return 0;
       }
       else
@@ -371,10 +385,11 @@ int main (int argc, char *argv[])
     }
   }
 
-  if (typeList.empty())
+  if (typeList.IsEmpty())
   {
-    cout << "No device type given. Using 'playback device'" << endl;
-    typeList.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+    if (!bSingleCommand)
+      cout << "No device type given. Using 'playback device'" << endl;
+    typeList.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
   }
 
   ICECAdapter *parser = LibCecInit("CECTester", typeList);
@@ -387,32 +402,42 @@ int main (int argc, char *argv[])
 #endif
     return 1;
   }
-  CStdString strLog;
-  strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor());
-  cout << strLog.c_str() << endl;
 
-  //make stdin non-blocking
-#ifndef __WINDOWS__
-  int flags = fcntl(0, F_GETFL, 0);
-  flags |= O_NONBLOCK;
-  fcntl(0, F_SETFL, flags);
-#endif
+  if (!bSingleCommand)
+  {
+    CStdString strLog;
+    strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor());
+    cout << strLog.c_str() << endl;
+
+    //make stdin non-blocking
+  #ifndef __WINDOWS__
+    int flags = fcntl(0, F_GETFL, 0);
+    flags |= O_NONBLOCK;
+    fcntl(0, F_SETFL, flags);
+  #endif
+  }
 
   if (g_strPort.IsEmpty())
   {
-    cout << "no serial port given. trying autodetect: ";
+    if (!bSingleCommand)
+      cout << "no serial port given. trying autodetect: ";
     cec_adapter devices[10];
     uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL);
     if (iDevicesFound <= 0)
     {
+      if (bSingleCommand)
+        cout << "autodetect ";
       cout << "FAILED" << endl;
       UnloadLibCec(parser);
       return 1;
     }
     else
     {
-      cout << endl << " path:     " << devices[0].path << endl <<
-          " com port: " << devices[0].comm << endl << endl;
+      if (!bSingleCommand)
+      {
+        cout << endl << " path:     " << devices[0].path << endl <<
+            " com port: " << devices[0].comm << endl << endl;
+      }
       g_strPort = devices[0].comm;
     }
   }
@@ -420,24 +445,31 @@ int main (int argc, char *argv[])
   if (!parser->Open(g_strPort.c_str()))
   {
     cout << "unable to open the device on port " << g_strPort << endl;
-    flush_log(parser);
+    FlushLog(parser);
     UnloadLibCec(parser);
     return 1;
   }
 
-  cout << "cec device opened" << endl;
+  if (!bSingleCommand)
+  {
+    cout << "cec device opened" << endl;
+
+    parser->PowerOnDevices(CECDEVICE_TV);
+    FlushLog(parser);
 
-  parser->PowerOnDevices(CECDEVICE_TV);
-  flush_log(parser);
+    parser->SetActiveSource();
+    FlushLog(parser);
 
-  parser->SetActiveView();
-  flush_log(parser);
+    cout << "waiting for input" << endl;
+  }
 
   bool bContinue(true);
-  cout << "waiting for input" << endl;
   while (bContinue)
   {
-    flush_log(parser);
+    if (bSingleCommand)
+      bContinue = false;
+
+    FlushLog(parser);
 
     /* just ignore the command buffer and clear it */
     cec_command dummy;
@@ -457,10 +489,10 @@ int main (int argc, char *argv[])
           string strvalue;
           uint8_t ivalue;
           cec_command bytes;
-          bytes.clear();
+          bytes.Clear();
 
           while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue))
-            bytes.push_back(ivalue);
+            bytes.PushBack(ivalue);
 
           if (command == "txn")
             bytes.transmit_timeout = 0;
@@ -660,18 +692,18 @@ int main (int argc, char *argv[])
         {
           cout << "closing the connection" << endl;
           parser->Close();
-          flush_log(parser);
+          FlushLog(parser);
 
           cout << "opening a new connection" << endl;
           parser->Open(g_strPort.c_str());
-          flush_log(parser);
+          FlushLog(parser);
 
-          cout << "setting active view" << endl;
-          parser->SetActiveView();
+          cout << "setting active source" << endl;
+          parser->SetActiveSource();
         }
         else if (command == "h" || command == "help")
         {
-          show_console_help();
+          ShowHelpConsole();
         }
         else if (command == "q" || command == "quit")
         {
@@ -694,12 +726,16 @@ int main (int argc, char *argv[])
       if (bContinue)
         cout << "waiting for input" << endl;
     }
-    CCondition::Sleep(50);
+
+    if (bContinue)
+      CCondition::Sleep(50);
   }
 
-  parser->StandbyDevices(CECDEVICE_BROADCAST);
+  if (!bSingleCommand)
+    parser->StandbyDevices(CECDEVICE_BROADCAST);
+
   parser->Close();
-  flush_log(parser);
+  FlushLog(parser);
   UnloadLibCec(parser);
 
   if (g_logOutput.is_open())