cec: added 'scan' command to cec-client, that displays info about devices on the...

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

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index d9ad277d3e68cb4fd3deeab6fd5deafde0c81d8e..cc3b2299dccd566cf0f186468cf09eebae94555d 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -40,6 +40,7 @@
 #include <sstream>
 #include "../lib/platform/threads.h"
 #include "../lib/util/StdString.h"
+#include "../lib/implementations/CECCommandHandler.h"
 
 using namespace CEC;
 using namespace std;
@@ -233,6 +234,7 @@ void ShowHelpConsole(void)
   "[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 <<
+  "[name] {addr}             get the OSD name 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 <<
@@ -240,6 +242,7 @@ void ShowHelpConsole(void)
   "[volup]                   send a volume up command to the amp if present" << endl <<
   "[voldown]                 send a volume down command to the amp if present" << endl <<
   "[mute]                    send a mute/unmute command to the amp if present" << endl <<
+  "[scan]                    scan the CEC bus and display device info" << 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 <<
@@ -370,7 +373,7 @@ int main (int argc, char *argv[])
       {
         if (argc >= iArgPtr + 2)
         {
-          iHDMIPort= atoi(argv[iArgPtr + 1]);
+          iHDMIPort = (int8_t)atoi(argv[iArgPtr + 1]);
           cout << "using HDMI port '" << iHDMIPort << "'" << endl;
           ++iArgPtr;
         }
@@ -560,7 +563,7 @@ int main (int argc, char *argv[])
           string strvalue;
           if (GetWord(input, strvalue))
           {
-            parser->SetHDMIPort(atoi(strvalue.c_str()));
+            parser->SetHDMIPort((uint8_t)atoi(strvalue.c_str()));
           }
         }
         else if (command == "pa")
@@ -720,13 +723,52 @@ int main (int argc, char *argv[])
             }
           }
         }
+        else if (command == "name")
+        {
+          CStdString strDev;
+          if (GetWord(input, strDev))
+          {
+            int iDev = atoi(strDev);
+            if (iDev >= 0 && iDev < 15)
+            {
+              cec_osd_name name = parser->GetOSDName((cec_logical_address)iDev);
+              cout << "OSD name of device " << iDev << " is '" << name.name << "'" << endl;
+            }
+          }
+        }
         else if (command == "lad")
         {
           cout << "listing active devices:" << endl;
           cec_logical_addresses addresses = parser->GetActiveDevices();
-          for (unsigned iPtr = 0; iPtr < 16; iPtr++)
+          for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
+            if (addresses[iPtr])
+              cout << "logical address " << (int)iPtr << endl;
+        }
+        else if (command == "scan")
+        {
+          cout << "CEC bus information" << endl;
+          cout << "===================" << endl;
+          cec_logical_addresses addresses = parser->GetActiveDevices();
+          for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
             if (addresses[iPtr])
-              cout << "logical address " << iPtr << endl;
+            {
+              uint64_t iVendorId      = parser->GetDeviceVendorId((cec_logical_address)iPtr);
+              cec_version iCecVersion = parser->GetDeviceCecVersion((cec_logical_address)iPtr);
+              cec_power_status power  = parser->GetDevicePowerStatus((cec_logical_address)iPtr);
+              cec_osd_name osdName    = parser->GetOSDName((cec_logical_address)iPtr);
+              cec_menu_language lang;
+              lang.device = CECDEVICE_UNKNOWN;
+              parser->GetDeviceMenuLanguage((cec_logical_address)iPtr, &lang);
+
+              cout << "device #" << (int)iPtr << ": " << parser->ToString((cec_logical_address)iPtr) << endl;
+              cout << "vendor:       " << parser->ToString((cec_vendor_id)iVendorId) << endl;
+              cout << "osd string:   " << osdName.name << endl;
+              cout << "CEC version:  " << parser->ToString(iCecVersion) << endl;
+              cout << "power status: " << parser->ToString(power) << endl;
+              if ((uint8_t)lang.device == iPtr)
+                cout << "language:     " << lang.language << endl;
+              cout << endl;
+            }
         }
         else if (command == "ad")
         {