X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=4b13f3a78311d6af929064213b347f14774c5fb8;hb=d0a712a65c05b4bf7bf25eafb8b4c999b6888a42;hp=7837c12a6a970554a7b569a52e069a78065fd426;hpb=90ea9066b2b0d23b3c05e7267bfab4f2a1d4a6e2;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index 7837c12..4b13f3a 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -38,12 +38,12 @@ #include #include #include -#include "../lib/platform/threads.h" -#include "../lib/util/StdString.h" +#include "../lib/platform/os.h" #include "../lib/implementations/CECCommandHandler.h" using namespace CEC; using namespace std; +using namespace PLATFORM; #define CEC_TEST_CLIENT_VERSION 1 @@ -53,10 +53,25 @@ int g_cecLogLevel(CEC_LOG_ALL); ofstream g_logOutput; bool g_bShortLog(false); CStdString g_strPort; -int8_t g_iHDMIPort(-1); +uint8_t g_iHDMIPort(CEC_DEFAULT_HDMI_PORT); +cec_logical_address g_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE); cec_device_type_list g_typeList; bool g_bSingleCommand(false); +bool g_bExit(false); +bool g_bHardExit(false); +CMutex g_outputMutex; +ICECCallbacks g_callbacks; +inline void PrintToStdOut(const char *strOut) +{ + CLockObject lock(g_outputMutex); + cout << strOut << endl; +} + +inline void PrintToStdOut(const CStdString &strOut) +{ + PrintToStdOut(strOut.c_str()); +} inline bool HexStrToInt(const std::string& data, uint8_t& value) { @@ -110,48 +125,64 @@ bool GetWord(string& data, string& word) return true; } -void FlushLog(ICECAdapter *cecParser) +int CecLogMessage(void *UNUSED(cbParam), const cec_log_message &message) { - cec_log_message message; - while (cecParser && cecParser->GetNextLogMessage(&message)) + if ((message.level & g_cecLogLevel) == message.level) { - if ((message.level & g_cecLogLevel) == message.level) + CStdString strLevel; + switch (message.level) { - 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; - } + 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; + CStdString strFullLog; + strFullLog.Format("%s[%16lld]\t%s", strLevel.c_str(), message.time, message.message); + PrintToStdOut(strFullLog); - if (g_logOutput.is_open()) - { - if (g_bShortLog) - g_logOutput << message.message << endl; - else - g_logOutput << strFullLog.c_str() << endl; - } + if (g_logOutput.is_open()) + { + if (g_bShortLog) + g_logOutput << message.message << endl; + else + g_logOutput << strFullLog.c_str() << endl; } } + + return 0; +} + +int CecKeyPress(void *UNUSED(cbParam), const cec_keypress &UNUSED(key)) +{ + return 0; +} + +int CecCommand(void *UNUSED(cbParam), const cec_command &UNUSED(command)) +{ + return 0; +} + +void EnableCallbacks(ICECAdapter *adapter) +{ + g_callbacks.CBCecLogMessage = &CecLogMessage; + g_callbacks.CBCecKeyPress = &CecKeyPress; + g_callbacks.CBCecCommand = &CecCommand; + adapter->EnableCallbacks(NULL, &g_callbacks); } void ListDevices(ICECAdapter *parser) @@ -160,24 +191,25 @@ void ListDevices(ICECAdapter *parser) uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL); if (iDevicesFound <= 0) { - cout << "Found devices: NONE" << endl; + PrintToStdOut("Found devices: NONE"); } else { CStdString strLog; strLog.Format("Found devices: %d", iDevicesFound); - cout << strLog.c_str() << endl; + PrintToStdOut(strLog); for (unsigned int iDevicePtr = 0; iDevicePtr < iDevicesFound; iDevicePtr++) { CStdString strDevice; strDevice.Format("device: %d\npath: %s\ncom port: %s", iDevicePtr + 1, devices[iDevicePtr].path, devices[iDevicePtr].comm); - cout << endl << strDevice.c_str() << endl; + PrintToStdOut(strDevice); } } } void ShowHelpCommandLine(const char* strExec) { + CLockObject lock(g_outputMutex); cout << endl << strExec << " {-h|--help|-l|--list-devices|[COM PORT]}" << endl << endl << @@ -186,6 +218,8 @@ void ShowHelpCommandLine(const char* strExec) " -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 << + " -b --base {int} The logical address of the device to with this " << endl << + " adapter is connected." << 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 << @@ -206,22 +240,23 @@ ICECAdapter *CreateParser(cec_device_type_list typeList) if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION) { #ifdef __WINDOWS__ - cout << "Cannot load libcec.dll" << endl; + PrintToStdOut("Cannot load libcec.dll"); #else - cout << "Cannot load libcec.so" << endl; + PrintToStdOut("Cannot load libcec.so"); #endif return NULL; } CStdString strLog; strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor()); - cout << strLog.c_str() << endl; + PrintToStdOut(strLog.c_str()); return parser; } void ShowHelpConsole(void) { + CLockObject lock(g_outputMutex); cout << endl << "================================================================================" << endl << "Available commands:" << endl << @@ -233,6 +268,7 @@ void ShowHelpConsole(void) "[la] {logical address} change the logical address of the CEC adapter." << endl << "[p] {device} {port} change the HDMI port number of the CEC adapter." << endl << "[pa] {physical address} change the physical address of the CEC adapter." << endl << + "[as] make the CEC adapter the active source." << 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 << @@ -295,7 +331,7 @@ bool ProcessCommandON(ICECAdapter *parser, const string &command, string &argume } else { - cout << "invalid destination" << endl; + PrintToStdOut("invalid destination"); } } @@ -315,7 +351,7 @@ bool ProcessCommandSTANDBY(ICECAdapter *parser, const string &command, string &a } else { - cout << "invalid destination" << endl; + PrintToStdOut("invalid destination"); } } @@ -331,14 +367,14 @@ bool ProcessCommandPOLL(ICECAdapter *parser, const string &command, string &argu if (GetWord(arguments, strValue) && HexStrToInt(strValue, iValue) && iValue <= 0xF) { if (parser->PollDevice((cec_logical_address) iValue)) - cout << "POLL message sent" << endl; + PrintToStdOut("POLL message sent"); else - cout << "POLL message not sent" << endl; + PrintToStdOut("POLL message not sent"); return true; } else { - cout << "invalid destination" << endl; + PrintToStdOut("invalid destination"); } } @@ -419,7 +455,19 @@ bool ProcessCommandOSD(ICECAdapter *parser, const string &command, string &argum return false; } -bool ProcessCommandPING(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandAS(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) +{ + if (command == "as") + { + parser->SetActiveView(); + return true; + } + + return false; +} + + +bool ProcessCommandPING(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) { if (command == "ping") { @@ -430,39 +478,39 @@ bool ProcessCommandPING(ICECAdapter *parser, const string &command, string &argu return false; } -bool ProcessCommandVOLUP(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandVOLUP(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) { if (command == "volup") { CStdString strLog; strLog.Format("volume up: %2X", parser->VolumeUp()); - cout << strLog.c_str() << endl; + PrintToStdOut(strLog); return true; } return false; } -bool ProcessCommandVOLDOWN(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandVOLDOWN(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) { if (command == "voldown") { CStdString strLog; - strLog.Format("volume up: %2X", parser->VolumeDown()); - cout << strLog.c_str() << endl; + strLog.Format("volume down: %2X", parser->VolumeDown()); + PrintToStdOut(strLog); return true; } return false; } -bool ProcessCommandMUTE(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandMUTE(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) { if (command == "mute") { CStdString strLog; strLog.Format("mute: %2X", parser->MuteAudio()); - cout << strLog.c_str() << endl; + PrintToStdOut(strLog); return true; } @@ -484,11 +532,16 @@ bool ProcessCommandMON(ICECAdapter *parser, const string &command, string &argum return false; } -bool ProcessCommandBL(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandBL(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) { if (command == "bl") { - parser->StartBootloader(); + if (parser->StartBootloader()) + { + PrintToStdOut("entered bootloader mode. exiting cec-client"); + g_bExit = true; + g_bHardExit = true; + } return true; } @@ -511,7 +564,7 @@ bool ProcessCommandLANG(ICECAdapter *parser, const string &command, string &argu strLog.Format("menu language '%s'", language.language); else strLog = "failed!"; - cout << strLog.c_str() << endl; + PrintToStdOut(strLog); return true; } } @@ -533,7 +586,7 @@ bool ProcessCommandVEN(ICECAdapter *parser, const string &command, string &argum uint64_t iVendor = parser->GetDeviceVendorId((cec_logical_address) iDev); CStdString strLog; strLog.Format("vendor id: %06x", iVendor); - cout << strLog.c_str() << endl; + PrintToStdOut(strLog); return true; } } @@ -553,7 +606,9 @@ bool ProcessCommandVER(ICECAdapter *parser, const string &command, string &argum if (iDev >= 0 && iDev < 15) { cec_version iVersion = parser->GetDeviceCecVersion((cec_logical_address) iDev); - cout << "CEC version " << parser->ToString(iVersion) << endl; + CStdString strLog; + strLog.Format("CEC version %s", parser->ToString(iVersion)); + PrintToStdOut(strLog); return true; } } @@ -573,8 +628,9 @@ bool ProcessCommandPOW(ICECAdapter *parser, const string &command, string &argum if (iDev >= 0 && iDev < 15) { cec_power_status iPower = parser->GetDevicePowerStatus((cec_logical_address) iDev); - cout << "power status: " << parser->ToString(iPower) << endl; - + CStdString strLog; + strLog.Format("power status: %s", parser->ToString(iPower)); + PrintToStdOut(strLog); return true; } } @@ -593,8 +649,10 @@ bool ProcessCommandNAME(ICECAdapter *parser, const string &command, string &argu 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; + cec_osd_name name = parser->GetDeviceOSDName((cec_logical_address)iDev); + CStdString strLog; + strLog.Format("OSD name of device %d is '%s'", iDev, name.name); + PrintToStdOut(strLog); } return true; } @@ -603,15 +661,19 @@ bool ProcessCommandNAME(ICECAdapter *parser, const string &command, string &argu return false; } -bool ProcessCommandLAD(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandLAD(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) { if (command == "lad") { - cout << "listing active devices:" << endl; + CStdString strLog; + PrintToStdOut("listing active devices:"); cec_logical_addresses addresses = parser->GetActiveDevices(); for (uint8_t iPtr = 0; iPtr <= 11; iPtr++) if (addresses[iPtr]) - cout << "logical address " << (int)iPtr << endl; + { + strLog.Format("logical address %X", (int)iPtr); + PrintToStdOut(strLog); + } return true; } @@ -627,7 +689,11 @@ bool ProcessCommandAD(ICECAdapter *parser, const string &command, string &argume { int iDev = atoi(strDev); if (iDev >= 0 && iDev < 15) - cout << "logical address " << iDev << " is " << (parser->IsActiveDevice((cec_logical_address)iDev) ? "active" : "not active") << endl; + { + CStdString strLog; + strLog.Format("logical address %X is %s", iDev, (parser->IsActiveDevice((cec_logical_address)iDev) ? "active" : "not active")); + PrintToStdOut(strLog); + } } } @@ -650,7 +716,9 @@ bool ProcessCommandAT(ICECAdapter *parser, const string &command, string &argume 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; + CStdString strLog; + strLog.Format("device %d is %s", type, (parser->IsActiveDeviceType(type) ? "active" : "not active")); + PrintToStdOut(strLog); return true; } } @@ -658,19 +726,17 @@ bool ProcessCommandAT(ICECAdapter *parser, const string &command, string &argume return false; } -bool ProcessCommandR(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandR(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) { if (command == "r") { - cout << "closing the connection" << endl; + PrintToStdOut("closing the connection"); parser->Close(); - FlushLog(parser); - cout << "opening a new connection" << endl; + PrintToStdOut("opening a new connection"); parser->Open(g_strPort.c_str()); - FlushLog(parser); - cout << "setting active source" << endl; + PrintToStdOut("setting active source"); parser->SetActiveSource(); return true; } @@ -678,7 +744,7 @@ bool ProcessCommandR(ICECAdapter *parser, const string &command, string &argumen return false; } -bool ProcessCommandH(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandH(ICECAdapter * UNUSED(parser), const string &command, string & UNUSED(arguments)) { if (command == "h" || command == "help") { @@ -689,7 +755,7 @@ bool ProcessCommandH(ICECAdapter *parser, const string &command, string &argumen return false; } -bool ProcessCommandLOG(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandLOG(ICECAdapter * UNUSED(parser), const string &command, string &arguments) { if (command == "log") { @@ -700,7 +766,9 @@ bool ProcessCommandLOG(ICECAdapter *parser, const string &command, string &argum if (iNewLevel >= CEC_LOG_ERROR && iNewLevel <= CEC_LOG_ALL) { g_cecLogLevel = iNewLevel; - cout << "log level changed to " << strLevel.c_str() << endl; + CStdString strLog; + strLog.Format("log level changed to %s", strLevel.c_str()); + PrintToStdOut(strLog); return true; } } @@ -709,33 +777,41 @@ bool ProcessCommandLOG(ICECAdapter *parser, const string &command, string &argum return false; } -bool ProcessCommandSCAN(ICECAdapter *parser, const string &command, string &arguments) +bool ProcessCommandSCAN(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) { if (command == "scan") { - cout << "CEC bus information" << endl; - cout << "===================" << endl; + PrintToStdOut("CEC bus information"); + PrintToStdOut("==================="); cec_logical_addresses addresses = parser->GetActiveDevices(); for (uint8_t iPtr = 0; iPtr < 16; iPtr++) { if (addresses[iPtr]) { - 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); + CStdString strLog; + uint64_t iVendorId = parser->GetDeviceVendorId((cec_logical_address)iPtr); + bool bActive = parser->IsActiveSource((cec_logical_address)iPtr); + uint16_t iPhysicalAddress = parser->GetDevicePhysicalAddress((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->GetDeviceOSDName((cec_logical_address)iPtr); + CStdString strAddr; + strAddr.Format("%04x", iPhysicalAddress); 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; + strLog.AppendFormat("device #%X: %s\n", (int)iPtr, parser->ToString((cec_logical_address)iPtr)); + strLog.AppendFormat("address: %s\n", strAddr.c_str()); + strLog.AppendFormat("active source: %s\n", (bActive ? "yes" : "no")); + strLog.AppendFormat("vendor: %s\n", parser->ToString((cec_vendor_id)iVendorId)); + strLog.AppendFormat("osd string: %s\n", osdName.name); + strLog.AppendFormat("CEC version: %s\n", parser->ToString(iCecVersion)); + strLog.AppendFormat("power status: %s\n", parser->ToString(power)); if ((uint8_t)lang.device == iPtr) - cout << "language: " << lang.language << endl; - cout << endl; + strLog.AppendFormat("language: %s\n", lang.language); + strLog.append("\n"); + PrintToStdOut(strLog); } } return true; @@ -761,6 +837,7 @@ bool ProcessConsoleCommand(ICECAdapter *parser, string &input) ProcessCommandLA(parser, command, input) || ProcessCommandP(parser, command, input) || ProcessCommandPA(parser, command, input) || + ProcessCommandAS(parser, command, input) || ProcessCommandOSD(parser, command, input) || ProcessCommandPING(parser, command, input) || ProcessCommandVOLUP(parser, command, input) || @@ -789,7 +866,7 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) { bool bReturn(true); int iArgPtr = 1; - while (iArgPtr < argc) + while (iArgPtr < argc && bReturn) { if (argc >= iArgPtr + 1) { @@ -879,6 +956,7 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) { ListDevices(parser); UnloadLibCec(parser); + parser = NULL; } bReturn = false; } @@ -894,13 +972,24 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) ShowHelpCommandLine(argv[0]); return 0; } + else if (!strcmp(argv[iArgPtr], "-b") || + !strcmp(argv[iArgPtr], "--base")) + { + if (argc >= iArgPtr + 2) + { + g_iBaseDevice = (cec_logical_address)atoi(argv[iArgPtr + 1]); + cout << "using base device '" << (int)g_iBaseDevice << "'" << endl; + ++iArgPtr; + } + ++iArgPtr; + } else if (!strcmp(argv[iArgPtr], "-p") || !strcmp(argv[iArgPtr], "--port")) { if (argc >= iArgPtr + 2) { g_iHDMIPort = (int8_t)atoi(argv[iArgPtr + 1]); - cout << "using HDMI port '" << g_iHDMIPort << "'" << endl; + cout << "using HDMI port '" << (int)g_iHDMIPort << "'" << endl; ++iArgPtr; } ++iArgPtr; @@ -937,6 +1026,10 @@ int main (int argc, char *argv[]) #else cout << "Cannot load libcec.so" << endl; #endif + + if (parser) + UnloadLibCec(parser); + return 1; } @@ -979,66 +1072,52 @@ int main (int argc, char *argv[]) } } - if (g_iHDMIPort > 0) - { - parser->SetHDMIPort((cec_logical_address)CEC_DEFAULT_BASE_DEVICE, (uint8_t)g_iHDMIPort); - FlushLog(parser); - } + EnableCallbacks(parser); - cout << "scanning the CEC bus..." << endl; + parser->SetHDMIPort(g_iBaseDevice, g_iHDMIPort); + PrintToStdOut("opening a connection to the CEC adapter..."); if (!parser->Open(g_strPort.c_str())) { - cout << "unable to open the device on port " << g_strPort << endl; - FlushLog(parser); + CStdString strLog; + strLog.Format("unable to open the device on port %s", g_strPort.c_str()); + PrintToStdOut(strLog); UnloadLibCec(parser); return 1; } if (!g_bSingleCommand) { - FlushLog(parser); - cout << "cec device opened" << endl; + PrintToStdOut("cec device opened"); parser->PowerOnDevices(CECDEVICE_TV); - FlushLog(parser); - parser->SetActiveSource(); - FlushLog(parser); - cout << "waiting for input" << endl; + PrintToStdOut("waiting for input"); } - bool bContinue(true); - while (bContinue) + while (!g_bExit && !g_bHardExit) { - FlushLog(parser); - - /* just ignore the command buffer and clear it */ - cec_command dummy; - while (parser && parser->GetNextCommand(&dummy)) {} - string input; getline(cin, input); cin.clear(); - if (ProcessConsoleCommand(parser, input) && !g_bSingleCommand) + if (ProcessConsoleCommand(parser, input) && !g_bSingleCommand && !g_bExit && !g_bHardExit) { if (!input.empty()) - cout << "waiting for input" << endl; + PrintToStdOut("waiting for input"); } else - bContinue = false; + g_bExit = true; - if (bContinue) + if (!g_bExit && !g_bHardExit) CCondition::Sleep(50); } - if (!g_bSingleCommand) + if (!g_bSingleCommand && !g_bHardExit) parser->StandbyDevices(CECDEVICE_BROADCAST); parser->Close(); - FlushLog(parser); UnloadLibCec(parser); if (g_logOutput.is_open())