cec: added GetActiveDevices()/cec_get_active_devices(), IsActiveDevice()/cec_is_activ...
[deb_libcec.git] / src / testclient / main.cpp
index 458c73404b4750062329526ec6cf3582e74975b6..dbb62e70804825094853973f43425cc44d54139b 100644 (file)
  *     http://www.pulse-eight.net/
  */
 
-#include "../../include/CECExports.h"
-#include "../lib/util/threads.h"
-#include "../lib/util/misc.h"
-#include "../lib/util/StdString.h"
+#include <cec.h>
+
 #include <cstdio>
 #include <fcntl.h>
 #include <iostream>
+#include <fstream>
 #include <string>
+#include <sstream>
+#include "../lib/platform/threads.h"
+#include "../lib/util/StdString.h"
 
 using namespace CEC;
 using namespace std;
 
-#define CEC_TEST_CLIENT_VERSION 3
+#define CEC_TEST_CLIENT_VERSION 1
+
+#include <cecloader.h>
+
+int        g_cecLogLevel = CEC_LOG_ALL;
+ofstream   g_logOutput;
+bool       g_bShortLog = false;
+CStdString g_strPort;
+
+inline bool HexStrToInt(const std::string& data, uint8_t& value)
+{
+  int iTmp(0);
+  if (sscanf(data.c_str(), "%x", &iTmp) == 1)
+  {
+    if (iTmp > 256)
+      value = 255;
+         else if (iTmp < 0)
+      value = 0;
+    else
+      value = (uint8_t) iTmp;
+
+    return true;
+  }
+
+  return false;
+}
 
-void flush_log(ICECDevice *cecParser)
+//get the first word (separated by whitespace) from string data and place that in word
+//then remove that word from string data
+bool GetWord(string& data, string& word)
+{
+  stringstream datastream(data);
+  string end;
+
+  datastream >> word;
+  if (datastream.fail())
+  {
+    data.clear();
+    return false;
+  }
+
+  size_t pos = data.find(word) + word.length();
+
+  if (pos >= data.length())
+  {
+    data.clear();
+    return true;
+  }
+
+  data = data.substr(pos);
+
+  datastream.clear();
+  datastream.str(data);
+
+  datastream >> end;
+  if (datastream.fail())
+    data.clear();
+
+  return true;
+}
+
+void FlushLog(ICECAdapter *cecParser)
 {
   cec_log_message message;
   while (cecParser && cecParser->GetNextLogMessage(&message))
   {
-    switch (message.level)
+    if ((message.level & g_cecLogLevel) == message.level)
     {
-    case CEC_LOG_ERROR:
-      cout << "ERROR:   " << message.message.c_str() << endl;
-      break;
-    case CEC_LOG_WARNING:
-      cout << "WARNING: " << message.message.c_str() << endl;
-      break;
-    case CEC_LOG_NOTICE:
-      cout << "NOTICE:  " << message.message.c_str() << endl;
-      break;
-    case CEC_LOG_DEBUG:
-      cout << "DEBUG:   " << message.message.c_str() << endl;
-      break;
+      CStdString strLevel;
+      switch (message.level)
+      {
+      case CEC_LOG_ERROR:
+        strLevel = "ERROR:   ";
+        break;
+      case CEC_LOG_WARNING:
+        strLevel = "WARNING: ";
+        break;
+      case CEC_LOG_NOTICE:
+        strLevel = "NOTICE:  ";
+        break;
+      case CEC_LOG_TRAFFIC:
+        strLevel = "TRAFFIC: ";
+        break;
+      case CEC_LOG_DEBUG:
+        strLevel = "DEBUG:   ";
+        break;
+      default:
+        break;
+      }
+
+      CStdString strFullLog;
+      strFullLog.Format("%s[%16lld]\t%s", strLevel.c_str(), message.time, message.message);
+      cout << strFullLog.c_str() << endl;
+
+      if (g_logOutput.is_open())
+      {
+        if (g_bShortLog)
+          g_logOutput << message.message << endl;
+        else
+          g_logOutput << strFullLog.c_str() << endl;
+      }
     }
   }
 }
 
-void list_devices(ICECDevice *parser)
+void ListDevices(ICECAdapter *parser)
 {
-  cout << "Found devices: ";
-  vector<cec_device> devices;
-  int iDevicesFound = parser->FindDevices(devices);
+  cec_adapter *devices = new cec_adapter[10];
+  uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL);
   if (iDevicesFound <= 0)
   {
-#ifdef __WINDOWS__
-    cout << "Not supported yet, sorry!" << endl;
-#else
-    cout << "NONE" << endl;
-#endif
+    cout << "Found devices: NONE" << endl;
   }
   else
   {
-    cout << devices.size() << endl;
-    for (unsigned int iDevicePtr = 0; iDevicePtr < devices.size(); iDevicePtr++)
+    CStdString strLog;
+    strLog.Format("Found devices: %d", iDevicesFound);
+    cout << strLog.c_str() << endl;
+    for (unsigned int iDevicePtr = 0; iDevicePtr < iDevicesFound; iDevicePtr++)
     {
       CStdString strDevice;
-      strDevice.Format("device:        %d\npath:          %s\ncom port:      %s", iDevicePtr, devices[iDevicePtr].path.c_str(), devices[0].comm.c_str());
+      strDevice.Format("device:        %d\npath:          %s\ncom port:      %s", iDevicePtr + 1, devices[iDevicePtr].path, devices[iDevicePtr].comm);
       cout << endl << strDevice.c_str() << endl;
     }
   }
 }
 
-void show_help(const char* strExec)
+void ShowHelpCommandLine(const char* strExec)
 {
   cout << endl <<
       strExec << " {-h|--help|-l|--list-devices|[COM PORT]}" << endl <<
       endl <<
       "parameters:" << endl <<
-      "\t-h --help            Shows this help text" << endl <<
-      "\t-l --list-devices    List all devices on this system" << endl <<
-      "\t[COM PORT]           The com port to connect to. If no COM port is given, the client tries to connect to the first device that is detected" << endl <<
+      "  -h --help                   Shows this help text" << endl <<
+      "  -l --list-devices           List all devices on this system" << endl <<
+      "  -t --type {p|r|t|a}         The device type to use. More than one is possible." << endl <<
+      "  -p --physical {hex-address} The physical address to use for the primary logical device." << endl <<
+      "  -f --log-file {file}        Writes all libCEC log message to a file" << endl <<
+      "  -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 <<
       endl <<
-      "Type 'h' or 'help' and press enter after starting the client to display all available commands" << endl;
+      "Type 'h' or 'help' and press enter after starting the client to display all " << endl <<
+      "available commands" << endl;
+}
+
+ICECAdapter *CreateParser(cec_device_type_list typeList)
+{
+  ICECAdapter *parser = LibCecInit("CECTester", typeList);
+  if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION)
+  {
+  #ifdef __WINDOWS__
+    cout << "Cannot load libcec.dll" << endl;
+  #else
+    cout << "Cannot load libcec.so" << endl;
+  #endif
+    return NULL;
+  }
+
+  CStdString strLog;
+  strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor());
+  cout << strLog.c_str() << endl;
+
+  return parser;
 }
 
-void show_console_help(void)
+void ShowHelpConsole(void)
 {
   cout << endl <<
   "================================================================================" << endl <<
   "Available commands:" << endl <<
   endl <<
   "tx {bytes}                transfer bytes over the CEC line." << endl <<
-  "[tx 40 00 FF 11 22 33]    sends bytes 0x40 0x00 0xFF 0x11 0x22 0x33" << endl <<
-  endl <<
-  "am {ackmack}              change the ackmask of the CEC adapter." << endl <<
-  "[am 10]                   ackmask 0x10 (logical address 4)" << endl <<
-  endl <<
+  "txn {bytes}               transfer bytes but don't wait for transmission ACK." << endl <<
+  "on {address}              power on the device with the given logical address." << endl <<
+  "standby {address}         put the device with the given address in standby mode." << endl <<
   "la {logical_address}      change the logical address of the CEC adapter." << endl <<
-  "[la 4]                    logical address 4" << endl <<
-  endl <<
+  "pa {physical_address}     change the physical address of the CEC adapter." << endl <<
+  "osd {addr} {string}       set OSD message on the specified device." << endl <<
+  "ver {addr}                get the CEC version of the specified device." << endl <<
+  "ven {addr}                get the vendor ID of the specified device." << endl <<
+  "lang {addr}               get the menu language of the specified device." << endl <<
+  "pow {addr}                get the power status of the specified device." << endl <<
+  "poll {addr}               poll the specified device." << endl <<
+  "lad                       lists active devices on the bus" << endl <<
+  "ad {addr}                 checks whether the specified device is active." << endl <<
+  "at {type}                 checks whether the specified device type is active." << endl <<
+  "[mon] {1|0}               enable or disable CEC bus monitoring." << endl <<
+  "[log] {1 - 31}            change the log level. see cectypes.h for values." << endl <<
   "[ping]                    send a ping command to the CEC adapter." << endl <<
-  "[bl]                      to let the adapter enter the bootloader, to upgrade the flash rom." << endl <<
+  "[bl]                      to let the adapter enter the bootloader, to upgrade" << endl <<
+  "                          the flash rom." << endl <<
+  "[r]                       reconnect to the CEC adapter." << endl <<
   "[h] or [help]             show this help." << endl <<
-  "[q] or [quit]             to quit the CEC test client and switch off all connected CEC devices." << endl <<
+  "[q] or [quit]             to quit the CEC test client and switch off all" << endl <<
+  "                          connected CEC devices." << endl <<
   "================================================================================" << endl;
 }
 
 int main (int argc, char *argv[])
 {
-  ICECDevice *parser = LoadLibCec("CEC Tester");
-  if (!parser && parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION)
+  int16_t iPhysicalAddress = -1;
+  cec_device_type_list typeList;
+  typeList.clear();
+
+  int iArgPtr = 1;
+  bool bSingleCommand(false);
+  while (iArgPtr < argc)
   {
-    cout << "Unable to create parser. Is libcec.dll present?" << endl;
-    return 1;
+    if (argc >= iArgPtr + 1)
+    {
+      if (!strcmp(argv[iArgPtr], "-f") ||
+          !strcmp(argv[iArgPtr], "--log-file") ||
+          !strcmp(argv[iArgPtr], "-sf") ||
+          !strcmp(argv[iArgPtr], "--short-log-file"))
+      {
+        if (argc >= iArgPtr + 2)
+        {
+          g_logOutput.open(argv[iArgPtr + 1]);
+          g_bShortLog = (!strcmp(argv[iArgPtr], "-sf") || !strcmp(argv[iArgPtr], "--short-log-file"));
+          iArgPtr += 2;
+        }
+        else
+        {
+          cout << "== skipped log-file parameter: no file given ==" << endl;
+          ++iArgPtr;
+        }
+      }
+      else if (!strcmp(argv[iArgPtr], "-d") ||
+          !strcmp(argv[iArgPtr], "--log-level"))
+      {
+        if (argc >= iArgPtr + 2)
+        {
+          int iNewLevel = atoi(argv[iArgPtr + 1]);
+          if (iNewLevel >= CEC_LOG_ERROR && iNewLevel <= CEC_LOG_ALL)
+          {
+            g_cecLogLevel = iNewLevel;
+            if (!bSingleCommand)
+              cout << "log level set to " << argv[iArgPtr + 1] << endl;
+          }
+          else
+          {
+            cout << "== skipped log-level parameter: invalid level '" << argv[iArgPtr + 1] << "' ==" << endl;
+          }
+          iArgPtr += 2;
+        }
+        else
+        {
+          cout << "== skipped log-level parameter: no level given ==" << endl;
+          ++iArgPtr;
+        }
+      }
+      else if (!strcmp(argv[iArgPtr], "-t") ||
+               !strcmp(argv[iArgPtr], "--type"))
+      {
+        if (argc >= iArgPtr + 2)
+        {
+          if (!strcmp(argv[iArgPtr + 1], "p"))
+          {
+            if (!bSingleCommand)
+              cout << "== using device type 'playback device'" << endl;
+            typeList.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+          }
+          else if (!strcmp(argv[iArgPtr + 1], "r"))
+          {
+            if (!bSingleCommand)
+              cout << "== using device type 'recording device'" << endl;
+            typeList.add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+          }
+          else if (!strcmp(argv[iArgPtr + 1], "t"))
+          {
+            if (!bSingleCommand)
+              cout << "== using device type 'tuner'" << endl;
+            typeList.add(CEC_DEVICE_TYPE_TUNER);
+          }
+          else if (!strcmp(argv[iArgPtr + 1], "a"))
+          {
+            if (!bSingleCommand)
+              cout << "== using device type 'audio system'" << endl;
+            typeList.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
+          }
+          else
+          {
+            cout << "== skipped invalid device type '" << argv[iArgPtr + 1] << "'" << endl;
+          }
+          ++iArgPtr;
+        }
+        ++iArgPtr;
+      }
+      else if (!strcmp(argv[iArgPtr], "--list-devices") ||
+               !strcmp(argv[iArgPtr], "-l"))
+      {
+        ICECAdapter *parser = CreateParser(typeList);
+        if (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"))
+      {
+        ShowHelpCommandLine(argv[0]);
+        return 0;
+      }
+      else if (!strcmp(argv[iArgPtr], "-p") ||
+               !strcmp(argv[iArgPtr], "--physical"))
+      {
+        if (argc >= iArgPtr + 2)
+        {
+          if (sscanf(argv[iArgPtr + 1], "%x", &iPhysicalAddress))
+            cout << "using physical address '" << std::hex << iPhysicalAddress << "'" << endl;
+          else
+            cout << "== skipped physical address parameter: invalid physical address '" << argv[iArgPtr + 1] << "' ==" << endl;
+          ++iArgPtr;
+        }
+        ++iArgPtr;
+      }
+      else
+      {
+        g_strPort = argv[iArgPtr++];
+      }
+    }
   }
-  CStdString strLog;
-  strLog.Format("CEC Parser created - libcec version %d", parser->GetLibVersion());
-  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);
+  if (typeList.IsEmpty())
+  {
+    if (!bSingleCommand)
+      cout << "No device type given. Using 'recording device'" << endl;
+    typeList.add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+  }
+
+  ICECAdapter *parser = LibCecInit("CECTester", typeList);
+  if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION)
+  {
+#ifdef __WINDOWS__
+    cout << "Cannot load libcec.dll" << endl;
+#else
+    cout << "Cannot load libcec.so" << endl;
 #endif
+    return 1;
+  }
+
+  if (!bSingleCommand)
+  {
+    CStdString strLog;
+    strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor());
+    cout << strLog.c_str() << endl;
 
-  string strPort;
-  if (argc < 2)
+    //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: ";
-    vector<cec_device> devices;
-    int iDevicesFound = parser->FindDevices(devices);
+    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;
-      strPort = devices[0].comm;
+      if (!bSingleCommand)
+      {
+        cout << endl << " path:     " << devices[0].path << endl <<
+            " com port: " << devices[0].comm << endl << endl;
+      }
+      g_strPort = devices[0].comm;
     }
   }
-  else if (!strcmp(argv[1], "--list-devices") || !strcmp(argv[1], "-l"))
-  {
-    list_devices(parser);
-    UnloadLibCec(parser);
-    return 0;
-  }
-  else if (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h"))
-  {
-    show_help(argv[0]);
-    return 0;
-  }
-  else
-  {
-    strPort = argv[1];
-  }
 
-  if (!parser->Open(strPort.c_str()))
+  if (!parser->Open(g_strPort.c_str()))
   {
-    cout << "unable to open the device on port " << strPort << endl;
-    flush_log(parser);
+    cout << "unable to open the device on port " << g_strPort << endl;
+    FlushLog(parser);
     UnloadLibCec(parser);
     return 1;
   }
 
-  cout << "cec device opened" << endl;
-  usleep(CEC_SETTLE_DOWN_TIME);
+  if (!bSingleCommand)
+  {
+    cout << "cec device opened" << endl;
 
-  parser->PowerOnDevices(CECDEVICE_TV);
-  flush_log(parser);
+    if (-1 != iPhysicalAddress)
+    {
+      parser->SetPhysicalAddress(iPhysicalAddress);
+      FlushLog(parser);
+    }
 
-  parser->SetActiveView();
-  flush_log(parser);
+    parser->PowerOnDevices(CECDEVICE_TV);
+    FlushLog(parser);
+
+    parser->SetActiveSource();
+    FlushLog(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;
+    while (parser && parser->GetNextCommand(&dummy)) {}
 
     string input;
     getline(cin, input);
@@ -213,23 +486,61 @@ int main (int argc, char *argv[])
       string command;
       if (GetWord(input, command))
       {
-        if (command == "tx")
+        if (command == "tx" || command == "txn")
         {
           string strvalue;
-          int    ivalue;
-          vector<uint8_t> bytes;
+          uint8_t ivalue;
+          cec_command bytes;
+          bytes.Clear();
+
           while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue))
-          bytes.push_back(ivalue);
+            bytes.PushBack(ivalue);
+
+          if (command == "txn")
+            bytes.transmit_timeout = 0;
 
           parser->Transmit(bytes);
         }
-        else if (command == "am")
+        else if (command == "on")
         {
-          string strvalue;
-          int    ackmask;
-          if (GetWord(input, strvalue) && HexStrToInt(strvalue, ackmask))
+          string strValue;
+          uint8_t iValue = 0;
+          if (GetWord(input, strValue) && HexStrToInt(strValue, iValue) && iValue <= 0xF)
+          {
+            parser->PowerOnDevices((cec_logical_address) iValue);
+          }
+          else
+          {
+            cout << "invalid destination" << endl;
+          }
+        }
+        else if (command == "standby")
+        {
+          string strValue;
+          uint8_t iValue = 0;
+          if (GetWord(input, strValue) && HexStrToInt(strValue, iValue) && iValue <= 0xF)
+          {
+            parser->StandbyDevices((cec_logical_address) iValue);
+          }
+          else
+          {
+            cout << "invalid destination" << endl;
+          }
+        }
+        else if (command == "poll")
+        {
+          string strValue;
+          uint8_t iValue = 0;
+          if (GetWord(input, strValue) && HexStrToInt(strValue, iValue) && iValue <= 0xF)
+          {
+            if (parser->PollDevice((cec_logical_address) iValue))
+              cout << "POLL message sent" << endl;
+            else
+              cout << "POLL message not sent" << endl;
+          }
+          else
           {
-            parser->SetAckMask(ackmask);
+            cout << "invalid destination" << endl;
           }
         }
         else if (command == "la")
@@ -240,32 +551,232 @@ int main (int argc, char *argv[])
             parser->SetLogicalAddress((cec_logical_address) atoi(strvalue.c_str()));
           }
         }
+        else if (command == "pa")
+        {
+          string strB1, strB2;
+          uint8_t iB1, iB2;
+          if (GetWord(input, strB1) && HexStrToInt(strB1, iB1) &&
+              GetWord(input, strB2) && HexStrToInt(strB2, iB2))
+          {
+            uint16_t iPhysicalAddress = ((uint16_t)iB1 << 8) + iB2;
+            parser->SetPhysicalAddress(iPhysicalAddress);
+          }
+        }
+        else if (command == "osd")
+        {
+          bool bFirstWord(false);
+          string strAddr, strMessage, strWord;
+          uint8_t iAddr;
+          if (GetWord(input, strAddr) && HexStrToInt(strAddr, iAddr) && iAddr < 0xF)
+          {
+            while (GetWord(input, strWord))
+            {
+              if (bFirstWord)
+              {
+                bFirstWord = false;
+                strMessage.append(" ");
+              }
+              strMessage.append(strWord);
+            }
+            parser->SetOSDString((cec_logical_address) iAddr, CEC_DISPLAY_CONTROL_DISPLAY_FOR_DEFAULT_TIME, strMessage.c_str());
+          }
+        }
         else if (command == "ping")
         {
-          parser->Ping();
+          parser->PingAdapter();
+        }
+        else if (command == "mon")
+        {
+          CStdString strEnable;
+          if (GetWord(input, strEnable) && (strEnable.Equals("0") || strEnable.Equals("1")))
+          {
+            parser->SwitchMonitoring(strEnable.Equals("1"));
+          }
         }
         else if (command == "bl")
         {
           parser->StartBootloader();
         }
+        else if (command == "lang")
+        {
+          CStdString strDev;
+          if (GetWord(input, strDev))
+          {
+            int iDev = atoi(strDev);
+            if (iDev >= 0 && iDev < 15)
+            {
+              CStdString strLog;
+              cec_menu_language language;
+              if (parser->GetDeviceMenuLanguage((cec_logical_address) iDev, &language))
+                strLog.Format("menu language '%s'", language.language);
+              else
+                strLog = "failed!";
+              cout << strLog.c_str() << endl;
+            }
+          }
+        }
+        else if (command == "ven")
+        {
+          CStdString strDev;
+          if (GetWord(input, strDev))
+          {
+            int iDev = atoi(strDev);
+            if (iDev >= 0 && iDev < 15)
+            {
+              uint64_t iVendor = parser->GetDeviceVendorId((cec_logical_address) iDev);
+              CStdString strLog;
+              strLog.Format("vendor id: %06x", iVendor);
+              cout << strLog.c_str() << endl;
+            }
+          }
+        }
+        else if (command == "ver")
+        {
+          CStdString strDev;
+          if (GetWord(input, strDev))
+          {
+            int iDev = atoi(strDev);
+            if (iDev >= 0 && iDev < 15)
+            {
+              cec_version iVersion = parser->GetDeviceCecVersion((cec_logical_address) iDev);
+              switch (iVersion)
+              {
+              case CEC_VERSION_1_2:
+                cout << "CEC version 1.2" << endl;
+                break;
+              case CEC_VERSION_1_2A:
+                cout << "CEC version 1.2a" << endl;
+                break;
+              case CEC_VERSION_1_3:
+                cout << "CEC version 1.3" << endl;
+                break;
+              case CEC_VERSION_1_3A:
+                cout << "CEC version 1.3a" << endl;
+                break;
+              default:
+                cout << "unknown CEC version" << endl;
+                break;
+              }
+            }
+          }
+        }
+        else if (command == "pow")
+        {
+          CStdString strDev;
+          if (GetWord(input, strDev))
+          {
+            int iDev = atoi(strDev);
+            if (iDev >= 0 && iDev < 15)
+            {
+              cec_power_status iPower = parser->GetDevicePowerStatus((cec_logical_address) iDev);
+              switch (iPower)
+              {
+              case CEC_POWER_STATUS_ON:
+                cout << "powered on" << endl;
+                break;
+              case CEC_POWER_STATUS_IN_TRANSITION_ON_TO_STANDBY:
+                cout << "on -> standby" << endl;
+                break;
+              case CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON:
+                cout << "standby -> on" << endl;
+                break;
+              case CEC_POWER_STATUS_STANDBY:
+                cout << "standby" << endl;
+                break;
+              default:
+                cout << "unknown power status" << endl;
+                break;
+              }
+            }
+          }
+        }
+        else if (command == "lad")
+        {
+          cout << "listing active devices:" << endl;
+          cec_logical_addresses addresses = parser->GetActiveDevices();
+          for (unsigned iPtr = 0; iPtr < 16; iPtr++)
+            if (addresses[iPtr])
+              cout << "logical address " << iPtr << endl;
+        }
+        else if (command == "ad")
+        {
+          CStdString strDev;
+          if (GetWord(input, strDev))
+          {
+            int iDev = atoi(strDev);
+            if (iDev >= 0 && iDev < 15)
+              cout << "logical address " << iDev << " is " << (parser->IsActiveDevice((cec_logical_address)iDev) ? "active" : "not active") << endl;
+          }
+        }
+        else if (command == "at")
+        {
+          CStdString strType;
+          if (GetWord(input, strType))
+          {
+            cec_device_type type = CEC_DEVICE_TYPE_TV;
+            if (strType.Equals("a"))
+              type = CEC_DEVICE_TYPE_AUDIO_SYSTEM;
+            else if (strType.Equals("p"))
+              type = CEC_DEVICE_TYPE_PLAYBACK_DEVICE;
+            else if (strType.Equals("r"))
+              type = CEC_DEVICE_TYPE_RECORDING_DEVICE;
+            else if (strType.Equals("t"))
+              type = CEC_DEVICE_TYPE_TUNER;
+            cout << "device " << type << " is " << (parser->IsActiveDeviceType(type) ? "active" : "not active") << endl;
+          }
+        }
+        else if (command == "r")
+        {
+          cout << "closing the connection" << endl;
+          parser->Close();
+          FlushLog(parser);
+
+          cout << "opening a new connection" << endl;
+          parser->Open(g_strPort.c_str());
+          FlushLog(parser);
+
+          cout << "setting active source" << endl;
+          parser->SetActiveSource();
+        }
         else if (command == "h" || command == "help")
         {
-          show_console_help();
+          ShowHelpConsole();
         }
         else if (command == "q" || command == "quit")
         {
           bContinue = false;
         }
+        else if (command == "log")
+        {
+          CStdString strLevel;
+          if (GetWord(input, strLevel))
+          {
+            int iNewLevel = atoi(strLevel);
+            if (iNewLevel >= CEC_LOG_ERROR && iNewLevel <= CEC_LOG_ALL)
+            {
+              g_cecLogLevel = iNewLevel;
+              cout << "log level changed to " << strLevel.c_str() << endl;
+            }
+          }
+        }
       }
       if (bContinue)
         cout << "waiting for input" << endl;
     }
-    CCondition::Sleep(50);
+
+    if (bContinue)
+      CCondition::Sleep(50);
   }
 
-  parser->PowerOffDevices(CECDEVICE_BROADCAST);
+  if (!bSingleCommand)
+    parser->StandbyDevices(CECDEVICE_BROADCAST);
+
   parser->Close();
-  flush_log(parser);
+  FlushLog(parser);
   UnloadLibCec(parser);
+
+  if (g_logOutput.is_open())
+    g_logOutput.close();
+
   return 0;
 }