X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=cbdeddf7c8053714835f5427b40264353a9a8f12;hb=e9654a0e343790159462527352a50f584590d062;hp=256a484e47cb91e8da42a21dca9d04619e025cd5;hpb=547b390d1c90e922b7c2191393ba12ec388750ca;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index 256a484..cbdeddf 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -1,7 +1,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -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 @@ -57,18 +57,22 @@ 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) +inline void PrintToStdOut(const char *strFormat, ...) { - CLockObject lock(&g_outputMutex); - cout << strOut << endl; -} + CStdString strLog; -inline void PrintToStdOut(const CStdString &strOut) -{ - PrintToStdOut(strOut.c_str()); + va_list argList; + va_start(argList, strFormat); + strLog.FormatV(strFormat, argList); + va_end(argList); + + CLockObject lock(g_outputMutex); + cout << strLog << endl; } inline bool HexStrToInt(const std::string& data, uint8_t& value) @@ -151,7 +155,7 @@ int CecLogMessage(void *UNUSED(cbParam), const cec_log_message &message) CStdString strFullLog; strFullLog.Format("%s[%16lld]\t%s", strLevel.c_str(), message.time, message.message); - PrintToStdOut(strFullLog); + PrintToStdOut(strFullLog.c_str()); if (g_logOutput.is_open()) { @@ -186,28 +190,22 @@ void EnableCallbacks(ICECAdapter *adapter) void ListDevices(ICECAdapter *parser) { cec_adapter *devices = new cec_adapter[10]; - uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL); + int8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL); if (iDevicesFound <= 0) { PrintToStdOut("Found devices: NONE"); } else { - CStdString strLog; - strLog.Format("Found devices: %d", iDevicesFound); - 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); - PrintToStdOut(strDevice); - } + PrintToStdOut("Found devices: %d\n", iDevicesFound); + for (int8_t iDevicePtr = 0; iDevicePtr < iDevicesFound; iDevicePtr++) + PrintToStdOut("device: %d\npath: %s\ncom port: %s\n", iDevicePtr + 1, devices[iDevicePtr].path, devices[iDevicePtr].comm); } } void ShowHelpCommandLine(const char* strExec) { - CLockObject lock(&g_outputMutex); + CLockObject lock(g_outputMutex); cout << endl << strExec << " {-h|--help|-l|--list-devices|[COM PORT]}" << endl << endl << @@ -245,16 +243,14 @@ ICECAdapter *CreateParser(cec_device_type_list typeList) return NULL; } - CStdString strLog; - strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor()); - PrintToStdOut(strLog.c_str()); + PrintToStdOut("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor()); return parser; } void ShowHelpConsole(void) { - CLockObject lock(&g_outputMutex); + CLockObject lock(g_outputMutex); cout << endl << "================================================================================" << endl << "Available commands:" << endl << @@ -480,9 +476,7 @@ bool ProcessCommandVOLUP(ICECAdapter *parser, const string &command, string & UN { if (command == "volup") { - CStdString strLog; - strLog.Format("volume up: %2X", parser->VolumeUp()); - PrintToStdOut(strLog); + PrintToStdOut("volume up: %2X", parser->VolumeUp()); return true; } @@ -493,9 +487,7 @@ bool ProcessCommandVOLDOWN(ICECAdapter *parser, const string &command, string & { if (command == "voldown") { - CStdString strLog; - strLog.Format("volume down: %2X", parser->VolumeDown()); - PrintToStdOut(strLog); + PrintToStdOut("volume down: %2X", parser->VolumeDown()); return true; } @@ -506,9 +498,7 @@ bool ProcessCommandMUTE(ICECAdapter *parser, const string &command, string & UNU { if (command == "mute") { - CStdString strLog; - strLog.Format("mute: %2X", parser->MuteAudio()); - PrintToStdOut(strLog); + PrintToStdOut("mute: %2X", parser->MuteAudio()); return true; } @@ -534,7 +524,12 @@ bool ProcessCommandBL(ICECAdapter *parser, const string &command, string & UNUSE { if (command == "bl") { - parser->StartBootloader(); + if (parser->StartBootloader()) + { + PrintToStdOut("entered bootloader mode. exiting cec-client"); + g_bExit = true; + g_bHardExit = true; + } return true; } @@ -577,9 +572,7 @@ bool ProcessCommandVEN(ICECAdapter *parser, const string &command, string &argum if (iDev >= 0 && iDev < 15) { uint64_t iVendor = parser->GetDeviceVendorId((cec_logical_address) iDev); - CStdString strLog; - strLog.Format("vendor id: %06x", iVendor); - PrintToStdOut(strLog); + PrintToStdOut("vendor id: %06x", iVendor); return true; } } @@ -599,9 +592,7 @@ bool ProcessCommandVER(ICECAdapter *parser, const string &command, string &argum if (iDev >= 0 && iDev < 15) { cec_version iVersion = parser->GetDeviceCecVersion((cec_logical_address) iDev); - CStdString strLog; - strLog.Format("CEC version %s", parser->ToString(iVersion)); - PrintToStdOut(strLog); + PrintToStdOut("CEC version %s", parser->ToString(iVersion)); return true; } } @@ -621,9 +612,7 @@ bool ProcessCommandPOW(ICECAdapter *parser, const string &command, string &argum if (iDev >= 0 && iDev < 15) { cec_power_status iPower = parser->GetDevicePowerStatus((cec_logical_address) iDev); - CStdString strLog; - strLog.Format("power status: %s", parser->ToString(iPower)); - PrintToStdOut(strLog); + PrintToStdOut("power status: %s", parser->ToString(iPower)); return true; } } @@ -643,9 +632,7 @@ bool ProcessCommandNAME(ICECAdapter *parser, const string &command, string &argu if (iDev >= 0 && iDev < 15) { 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); + PrintToStdOut("OSD name of device %d is '%s'", iDev, name.name); } return true; } @@ -658,14 +645,12 @@ bool ProcessCommandLAD(ICECAdapter *parser, const string &command, string & UNUS { if (command == "lad") { - CStdString strLog; PrintToStdOut("listing active devices:"); cec_logical_addresses addresses = parser->GetActiveDevices(); for (uint8_t iPtr = 0; iPtr <= 11; iPtr++) if (addresses[iPtr]) { - strLog.Format("logical address %X", (int)iPtr); - PrintToStdOut(strLog); + PrintToStdOut("logical address %X", (int)iPtr); } return true; } @@ -682,11 +667,7 @@ bool ProcessCommandAD(ICECAdapter *parser, const string &command, string &argume { int iDev = atoi(strDev); if (iDev >= 0 && iDev < 15) - { - CStdString strLog; - strLog.Format("logical address %X is %s", iDev, (parser->IsActiveDevice((cec_logical_address)iDev) ? "active" : "not active")); - PrintToStdOut(strLog); - } + PrintToStdOut("logical address %X is %s", iDev, (parser->IsActiveDevice((cec_logical_address)iDev) ? "active" : "not active")); } } @@ -709,9 +690,8 @@ 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; - CStdString strLog; - strLog.Format("device %d is %s", type, (parser->IsActiveDeviceType(type) ? "active" : "not active")); - PrintToStdOut(strLog); + + PrintToStdOut("device %d is %s", type, (parser->IsActiveDeviceType(type) ? "active" : "not active")); return true; } } @@ -759,9 +739,8 @@ bool ProcessCommandLOG(ICECAdapter * UNUSED(parser), const string &command, stri if (iNewLevel >= CEC_LOG_ERROR && iNewLevel <= CEC_LOG_ALL) { g_cecLogLevel = iNewLevel; - CStdString strLog; - strLog.Format("log level changed to %s", strLevel.c_str()); - PrintToStdOut(strLog); + + PrintToStdOut("log level changed to %s", strLevel.c_str()); return true; } } @@ -1072,9 +1051,7 @@ int main (int argc, char *argv[]) if (!parser->Open(g_strPort.c_str())) { - CStdString strLog; - strLog.Format("unable to open the device on port %s"); - PrintToStdOut(strLog); + PrintToStdOut("unable to open the device on port %s", g_strPort.c_str()); UnloadLibCec(parser); return 1; } @@ -1089,26 +1066,25 @@ int main (int argc, char *argv[]) PrintToStdOut("waiting for input"); } - bool bContinue(true); - while (bContinue) + while (!g_bExit && !g_bHardExit) { 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()) 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();