X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=d9ad277d3e68cb4fd3deeab6fd5deafde0c81d8e;hb=95a73fa78b4524636db470491c1e3434b81df4c0;hp=3e67723328f4de77b2590caa794c6159566cc2c5;hpb=18203d17e6894d33725dac7553d981aee735e6be;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index 3e67723..d9ad277 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 << @@ -180,10 +180,13 @@ void show_help(const char* strExec) " -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 --port {int} The HDMI port to use as active source." << 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 << @@ -192,7 +195,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,46 +215,31 @@ ICECAdapter *create_parser(cec_device_type_list typeList) 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 << - "txn {bytes} transfer bytes but don't wait for transmission ACK." << endl << - "[tx 40 00 FF 11 22 33] sends bytes 0x40 0x00 0xFF 0x11 0x22 0x33" << endl << - endl << - "on {address} power on the device with the given logical address." << endl << - "[on 5] power on a connected audio system" << endl << - endl << - "standby {address} put the device with the given address in standby mode." << endl << - "[standby 0] powers off the TV" << endl << - 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 << - "[pa 10 00] physical address 1.0.0.0" << endl << - endl << - "osd {addr} {string} set OSD message on the specified device." << endl << - "[osd 0 Test Message] displays 'Test Message' on the TV" << endl << - endl << - "ver {addr} get the CEC version of the specified device." << endl << - "[ver 0] get the CEC version of the TV" << endl << - endl << - "ven {addr} get the vendor ID of the specified device." << endl << - "[ven 0] get the vendor ID of the TV" << endl << - endl << - "lang {addr} get the menu language of the specified device." << endl << - "[lang 0] get the menu language of the TV" << endl << - endl << - "pow {addr} get the power status of the specified device." << endl << - "[pow 0] get the power status of the TV" << endl << - endl << - "poll {addr} poll the specified device." << endl << - "[poll 0] sends a poll message to the TV" << 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 << + "[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 << @@ -266,10 +254,12 @@ void show_console_help(void) int main (int argc, char *argv[]) { + int8_t iHDMIPort(-1); cec_device_type_list typeList; typeList.clear(); int iArgPtr = 1; + bool bSingleCommand(false); while (iArgPtr < argc) { if (argc >= iArgPtr + 1) @@ -300,7 +290,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,22 +312,26 @@ int main (int argc, char *argv[]) { if (!strcmp(argv[iArgPtr + 1], "p")) { - cout << "== using device type 'playback device'" << endl; + 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; + 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; + 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; + if (!bSingleCommand) + cout << "== using device type 'audio system'" << endl; typeList.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM); } else @@ -350,20 +345,37 @@ 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 if (!strcmp(argv[iArgPtr], "-p") || + !strcmp(argv[iArgPtr], "--port")) + { + if (argc >= iArgPtr + 2) + { + iHDMIPort= atoi(argv[iArgPtr + 1]); + cout << "using HDMI port '" << iHDMIPort << "'" << endl; + ++iArgPtr; + } + ++iArgPtr; + } else { g_strPort = argv[iArgPtr++]; @@ -371,10 +383,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 'recording device'" << endl; + typeList.add(CEC_DEVICE_TYPE_RECORDING_DEVICE); } ICECAdapter *parser = LibCecInit("CECTester", typeList); @@ -387,57 +400,82 @@ 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; } } + if (iHDMIPort > 0) + { + parser->SetHDMIPort((uint8_t)iHDMIPort); + FlushLog(parser); + } + + cout << "scanning the CEC bus..." << endl; + 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); - flush_log(parser); + parser->PowerOnDevices(CECDEVICE_TV); + FlushLog(parser); - parser->SetActiveSource(); - flush_log(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; @@ -457,10 +495,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; @@ -517,6 +555,14 @@ int main (int argc, char *argv[]) parser->SetLogicalAddress((cec_logical_address) atoi(strvalue.c_str())); } } + else if (command == "p") + { + string strvalue; + if (GetWord(input, strvalue)) + { + parser->SetHDMIPort(atoi(strvalue.c_str())); + } + } else if (command == "pa") { string strB1, strB2; @@ -551,6 +597,24 @@ int main (int argc, char *argv[]) { parser->PingAdapter(); } + else if (command == "volup") + { + CStdString strLog; + strLog.Format("volume up: %2X", parser->VolumeUp()); + cout << strLog.c_str() << endl; + } + else if (command == "voldown") + { + CStdString strLog; + strLog.Format("volume up: %2X", parser->VolumeDown()); + cout << strLog.c_str() << endl; + } + else if (command == "mute") + { + CStdString strLog; + strLog.Format("mute: %2X", parser->MuteAudio()); + cout << strLog.c_str() << endl; + } else if (command == "mon") { CStdString strEnable; @@ -656,22 +720,57 @@ int main (int argc, char *argv[]) } } } + 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(); - 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 source" << endl; parser->SetActiveSource(); } else if (command == "h" || command == "help") { - show_console_help(); + ShowHelpConsole(); } else if (command == "q" || command == "quit") { @@ -694,12 +793,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())