X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=c6082921bf1844c22b70f86f114f211bd3cf7c67;hb=a5a5f6f5437c662e7f8d8e52d32e5cddacc89784;hp=e594eaf16aa2b132e700ff4deceb92e87b8f2644;hpb=7e316a2f39ded0dfe46661cc4007f5c20c58da96;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index e594eaf..c608292 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include "../lib/platform/os.h" #include "../lib/implementations/CECCommandHandler.h" #include "../lib/platform/util/StdString.h" @@ -47,9 +48,9 @@ using namespace CEC; using namespace std; using namespace PLATFORM; -#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_1_8_1; +#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_CURRENT; -#include +#include "../../include/cecloader.h" ICECCallbacks g_callbacks; libcec_configuration g_config; @@ -128,7 +129,7 @@ bool GetWord(string& data, string& word) return true; } -int CecLogMessage(void *UNUSED(cbParam), const cec_log_message &message) +int CecLogMessage(void *UNUSED(cbParam), const cec_log_message message) { if ((message.level & g_cecLogLevel) == message.level) { @@ -170,17 +171,17 @@ int CecLogMessage(void *UNUSED(cbParam), const cec_log_message &message) return 0; } -int CecKeyPress(void *UNUSED(cbParam), const cec_keypress &UNUSED(key)) +int CecKeyPress(void *UNUSED(cbParam), const cec_keypress UNUSED(key)) { return 0; } -int CecCommand(void *UNUSED(cbParam), const cec_command &UNUSED(command)) +int CecCommand(void *UNUSED(cbParam), const cec_command UNUSED(command)) { return 0; } -int CecAlert(void *UNUSED(cbParam), const libcec_alert type, const libcec_parameter &UNUSED(param)) +int CecAlert(void *UNUSED(cbParam), const libcec_alert type, const libcec_parameter UNUSED(param)) { switch (type) { @@ -224,7 +225,12 @@ void ListDevices(ICECAdapter *parser) time_t buildTime = (time_t)config.iFirmwareBuildDate; strDeviceInfo.AppendFormat("firmware build date: %s", asctime(gmtime(&buildTime))); strDeviceInfo = strDeviceInfo.Left(strDeviceInfo.length() > 1 ? (unsigned)(strDeviceInfo.length() - 1) : 0); // strip \n added by asctime - strDeviceInfo.append(" +0000"); + strDeviceInfo.append(" +0000\n"); + } + + if (config.adapterType != ADAPTERTYPE_UNKNOWN) + { + strDeviceInfo.AppendFormat("type: %s\n", parser->ToString(config.adapterType)); } } strDeviceInfo.append("\n"); @@ -279,6 +285,7 @@ void ShowHelpConsole(void) "[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 << + "[is] mark the CEC adapter as inactive 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 << @@ -375,6 +382,10 @@ bool ProcessCommandTX(ICECAdapter *parser, const string &command, string &argume cec_command bytes; bytes.Clear(); + CStdString strArguments(arguments); + strArguments.Replace(':', ' '); + arguments = strArguments; + while (GetWord(arguments, strvalue) && HexStrToInt(strvalue, ivalue)) bytes.PushBack(ivalue); @@ -531,12 +542,31 @@ bool ProcessCommandAS(ICECAdapter *parser, const string &command, string & UNUSE if (command == "as") { parser->SetActiveSource(); + // wait for the source switch to finish for 15 seconds tops + if (g_bSingleCommand) + { + CTimeout timeout(15000); + bool bActiveSource(false); + while (timeout.TimeLeft() > 0 && !bActiveSource) + { + bActiveSource = parser->IsLibCECActiveSource(); + if (!bActiveSource) + CEvent::Sleep(100); + } + } return true; } return false; } +bool ProcessCommandIS(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) +{ + if (command == "is") + return parser->SetInactiveView(); + + return false; +} bool ProcessCommandPING(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) { @@ -649,7 +679,7 @@ bool ProcessCommandVEN(ICECAdapter *parser, const string &command, string &argum if (iDev >= 0 && iDev < 15) { uint64_t iVendor = parser->GetDeviceVendorId((cec_logical_address) iDev); - PrintToStdOut("vendor id: %06x", iVendor); + PrintToStdOut("vendor id: %06llx", iVendor); return true; } } @@ -840,18 +870,19 @@ bool ProcessCommandSCAN(ICECAdapter *parser, const string &command, string & UNU strLog.append("CEC bus information\n===================\n"); cec_logical_addresses addresses = parser->GetActiveDevices(); + cec_logical_address activeSource = parser->GetActiveSource(); for (uint8_t iPtr = 0; iPtr < 16; iPtr++) { if (addresses[iPtr]) { 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); + bool bActive = parser->IsActiveSource((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); + strAddr.Format("%x.%x.%x.%x", (iPhysicalAddress >> 12) & 0xF, (iPhysicalAddress >> 8) & 0xF, (iPhysicalAddress >> 4) & 0xF, iPhysicalAddress & 0xF); cec_menu_language lang; lang.device = CECDEVICE_UNKNOWN; parser->GetDeviceMenuLanguage((cec_logical_address)iPtr, &lang); @@ -869,7 +900,7 @@ bool ProcessCommandSCAN(ICECAdapter *parser, const string &command, string & UNU } } - cec_logical_address activeSource = parser->GetActiveSource(); + activeSource = parser->GetActiveSource(); strLog.AppendFormat("currently active source: %s (%d)", parser->ToString(activeSource), (int)activeSource); PrintToStdOut(strLog); @@ -897,6 +928,7 @@ bool ProcessConsoleCommand(ICECAdapter *parser, string &input) ProcessCommandP(parser, command, input) || ProcessCommandPA(parser, command, input) || ProcessCommandAS(parser, command, input) || + ProcessCommandIS(parser, command, input) || ProcessCommandOSD(parser, command, input) || ProcessCommandPING(parser, command, input) || ProcessCommandVOLUP(parser, command, input) || @@ -982,25 +1014,25 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) { if (!g_bSingleCommand) cout << "== using device type 'playback device'" << endl; - g_config.deviceTypes.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); + g_config.deviceTypes.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); } else if (!strcmp(argv[iArgPtr + 1], "r")) { if (!g_bSingleCommand) cout << "== using device type 'recording device'" << endl; - g_config.deviceTypes.add(CEC_DEVICE_TYPE_RECORDING_DEVICE); + g_config.deviceTypes.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE); } else if (!strcmp(argv[iArgPtr + 1], "t")) { if (!g_bSingleCommand) cout << "== using device type 'tuner'" << endl; - g_config.deviceTypes.add(CEC_DEVICE_TYPE_TUNER); + g_config.deviceTypes.Add(CEC_DEVICE_TYPE_TUNER); } else if (!strcmp(argv[iArgPtr + 1], "a")) { if (!g_bSingleCommand) cout << "== using device type 'audio system'" << endl; - g_config.deviceTypes.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM); + g_config.deviceTypes.Add(CEC_DEVICE_TYPE_AUDIO_SYSTEM); } else { @@ -1124,8 +1156,20 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) return bReturn; } +void sighandler(int iSignal) +{ + PrintToStdOut("signal caught: %d - exiting", iSignal); + g_bExit = true; +} + int main (int argc, char *argv[]) { + if (signal(SIGINT, sighandler) == SIG_ERR) + { + PrintToStdOut("can't register sighandler"); + return -1; + } + g_config.Clear(); g_callbacks.Clear(); snprintf(g_config.strDeviceName, 13, "CECTester"); @@ -1147,7 +1191,7 @@ int main (int argc, char *argv[]) { if (!g_bSingleCommand) cout << "No device type given. Using 'recording device'" << endl; - g_config.deviceTypes.add(CEC_DEVICE_TYPE_RECORDING_DEVICE); + g_config.deviceTypes.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE); } ICECAdapter *parser = LibCecInitialise(&g_config);