cec: forgot to rename a call in the previous commit

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

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index e293f80b9c9225eca99039eb8e0f211f898615e0..0a7a9be9874326691bbb2ea07142d78daee3963e 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -221,22 +221,26 @@ void ShowHelpConsole(void)
   "================================================================================" << endl <<
   "Available commands:" << endl <<
   endl <<
-  "tx {bytes}                transfer bytes over the CEC line." << 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 <<
-  "p {port number}           change the HDMI port number of the CEC adapter." << 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 <<
+  "[tx] {bytes}              transfer bytes over the CEC line." << 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 <<
+  "[p] {port number}         change the HDMI port number of the CEC adapter." << 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 <<
+  "[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 <<
+  "[at] {type}               checks whether the specified device type is active." << endl <<
+  "[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 <<
   "[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 <<
@@ -367,7 +371,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;
         }
@@ -557,7 +561,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")
@@ -596,15 +600,21 @@ int main (int argc, char *argv[])
         }
         else if (command == "volup")
         {
-          parser->VolumeUp();
+          CStdString strLog;
+          strLog.Format("volume up: %2X", parser->VolumeUp());
+          cout << strLog.c_str() << endl;
         }
         else if (command == "voldown")
         {
-          parser->VolumeDown();
+          CStdString strLog;
+          strLog.Format("volume up: %2X", parser->VolumeDown());
+          cout << strLog.c_str() << endl;
         }
         else if (command == "mute")
         {
-          parser->MuteAudio();
+          CStdString strLog;
+          strLog.Format("mute: %2X", parser->MuteAudio());
+          cout << strLog.c_str() << endl;
         }
         else if (command == "mon")
         {
@@ -711,11 +721,24 @@ 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 " << iPtr << endl;
         }