X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=04635ad38cad370eda7028c21b6f4b79bb28c502;hb=0b71487197ed7281dda06f53ecaf846f1fd7e942;hp=b0492866449751f28d4a456a0c49fd344c74c67f;hpb=4c9b9776fafa21f6c4195068fff5ce60b5827572;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index b049286..04635ad 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -45,22 +45,18 @@ using namespace CEC; using namespace std; using namespace PLATFORM; -#define CEC_TEST_CLIENT_VERSION 1 - #include +ICECCallbacks g_callbacks; +libcec_configuration g_config; int g_cecLogLevel(CEC_LOG_ALL); ofstream g_logOutput; bool g_bShortLog(false); CStdString g_strPort; -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 *strFormat, ...) { @@ -179,12 +175,18 @@ int CecCommand(void *UNUSED(cbParam), const cec_command &UNUSED(command)) return 0; } -void EnableCallbacks(ICECAdapter *adapter) +int CecAlert(void *UNUSED(cbParam), const libcec_alert type, const libcec_parameter &UNUSED(param)) { - g_callbacks.CBCecLogMessage = &CecLogMessage; - g_callbacks.CBCecKeyPress = &CecKeyPress; - g_callbacks.CBCecCommand = &CecCommand; - adapter->EnableCallbacks(NULL, &g_callbacks); + switch (type) + { + case CEC_ALERT_CONNECTION_LOST: + PrintToStdOut("Connection lost - exiting\n"); + g_bExit = true; + break; + default: + break; + } + return 0; } void ListDevices(ICECAdapter *parser) @@ -197,9 +199,22 @@ void ListDevices(ICECAdapter *parser) } else { - PrintToStdOut("Found devices: %d\n", iDevicesFound); + CStdString strDeviceInfo; + strDeviceInfo.Format("Found devices: %d\n\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); + { + strDeviceInfo.AppendFormat("device: %d\ncom port: %s\n", iDevicePtr + 1, devices[iDevicePtr].comm); + libcec_configuration config; + config.Clear(); + + if (!parser->GetDeviceInformation(devices[iDevicePtr].comm, &config)) + PrintToStdOut("WARNING: unable to open the device on port %s", devices[iDevicePtr].comm); + else + strDeviceInfo.AppendFormat("firmware version: %d\n", config.iFirmwareVersion); + strDeviceInfo.append("\n"); + } + PrintToStdOut(strDeviceInfo.c_str()); } } @@ -217,11 +232,13 @@ void ShowHelpCommandLine(const char* strExec) " -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 << + " -r --rom Read persisted settings from the EEPROM" << 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 << + " -o --osd-name {osd name} Use a custom osd name." << 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 << @@ -230,24 +247,6 @@ void ShowHelpCommandLine(const char* strExec) "available commands" << endl; } -ICECAdapter *CreateParser(cec_device_type_list typeList) -{ - ICECAdapter *parser = LibCecInit("CECTester", typeList); - if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION) - { - #ifdef __WINDOWS__ - PrintToStdOut("Cannot load libcec.dll"); - #else - PrintToStdOut("Cannot load libcec.so"); - #endif - return NULL; - } - - PrintToStdOut("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor()); - - return parser; -} - void ShowHelpConsole(void) { CLockObject lock(g_outputMutex); @@ -956,25 +955,25 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) { if (!g_bSingleCommand) cout << "== using device type 'playback device'" << endl; - g_typeList.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_typeList.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_typeList.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_typeList.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM); + g_config.deviceTypes.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM); } else { @@ -987,7 +986,7 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) else if (!strcmp(argv[iArgPtr], "--list-devices") || !strcmp(argv[iArgPtr], "-l")) { - ICECAdapter *parser = CreateParser(g_typeList); + ICECAdapter *parser = LibCecInitialise(&g_config); if (parser) { ListDevices(parser); @@ -996,6 +995,11 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) } bReturn = false; } + else if (!strcmp(argv[iArgPtr], "--bootloader")) + { + LibCecBootloader(); + bReturn = false; + } else if (!strcmp(argv[iArgPtr], "--single-command") || !strcmp(argv[iArgPtr], "-s")) { @@ -1013,8 +1017,8 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) { if (argc >= iArgPtr + 2) { - g_iBaseDevice = (cec_logical_address)atoi(argv[iArgPtr + 1]); - cout << "using base device '" << (int)g_iBaseDevice << "'" << endl; + g_config.baseDevice = (cec_logical_address)atoi(argv[iArgPtr + 1]); + cout << "using base device '" << (int)g_config.baseDevice << "'" << endl; ++iArgPtr; } ++iArgPtr; @@ -1024,8 +1028,31 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) { if (argc >= iArgPtr + 2) { - g_iHDMIPort = (int8_t)atoi(argv[iArgPtr + 1]); - cout << "using HDMI port '" << (int)g_iHDMIPort << "'" << endl; + uint8_t hdmiport = (int8_t)atoi(argv[iArgPtr + 1]); + if (hdmiport < 1) + hdmiport = 1; + if (hdmiport > 15) + hdmiport = 15; + g_config.iHDMIPort = hdmiport; + cout << "using HDMI port '" << (int)g_config.iHDMIPort << "'" << endl; + ++iArgPtr; + } + ++iArgPtr; + } + else if (!strcmp(argv[iArgPtr], "-r") || + !strcmp(argv[iArgPtr], "--rom")) + { + cout << "using settings from EEPROM" << endl; + g_config.bGetSettingsFromROM = 1; + ++iArgPtr; + } + else if (!strcmp(argv[iArgPtr], "-o") || + !strcmp(argv[iArgPtr], "--osd-name")) + { + if (argc >= iArgPtr + 2) + { + snprintf(g_config.strDeviceName, 13, "%s", argv[iArgPtr + 1]); + cout << "using osd name " << g_config.strDeviceName << endl; ++iArgPtr; } ++iArgPtr; @@ -1042,20 +1069,28 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) int main (int argc, char *argv[]) { - g_typeList.clear(); + g_config.Clear(); + snprintf(g_config.strDeviceName, 13, "CECTester"); + g_config.callbackParam = NULL; + g_config.clientVersion = CEC_CLIENT_VERSION_1_6_1; + g_callbacks.CBCecLogMessage = &CecLogMessage; + g_callbacks.CBCecKeyPress = &CecKeyPress; + g_callbacks.CBCecCommand = &CecCommand; + g_callbacks.CBCecAlert = &CecAlert; + g_config.callbacks = &g_callbacks; if (!ProcessCommandLineArguments(argc, argv)) return 0; - if (g_typeList.IsEmpty()) + if (g_config.deviceTypes.IsEmpty()) { if (!g_bSingleCommand) cout << "No device type given. Using 'recording device'" << endl; - g_typeList.add(CEC_DEVICE_TYPE_RECORDING_DEVICE); + g_config.deviceTypes.add(CEC_DEVICE_TYPE_RECORDING_DEVICE); } - ICECAdapter *parser = LibCecInit("CECTester", g_typeList); - if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION) + ICECAdapter *parser = LibCecInitialise(&g_config); + if (!parser) { #ifdef __WINDOWS__ cout << "Cannot load libcec.dll" << endl; @@ -1072,7 +1107,7 @@ int main (int argc, char *argv[]) if (!g_bSingleCommand) { CStdString strLog; - strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor()); + strLog.Format("CEC Parser created - libCEC version %s", parser->ToString((cec_server_version)g_config.serverVersion)); cout << strLog.c_str() << endl; //make stdin non-blocking @@ -1108,9 +1143,6 @@ int main (int argc, char *argv[]) } } - EnableCallbacks(parser); - - parser->SetHDMIPort(g_iBaseDevice, g_iHDMIPort); PrintToStdOut("opening a connection to the CEC adapter..."); if (!parser->Open(g_strPort.c_str())) @@ -1121,14 +1153,7 @@ int main (int argc, char *argv[]) } if (!g_bSingleCommand) - { - PrintToStdOut("cec device opened"); - - parser->PowerOnDevices(CECDEVICE_TV); - parser->SetActiveSource(); - PrintToStdOut("waiting for input"); - } while (!g_bExit && !g_bHardExit) { @@ -1145,12 +1170,9 @@ int main (int argc, char *argv[]) g_bExit = true; if (!g_bExit && !g_bHardExit) - CCondition::Sleep(50); + CEvent::Sleep(50); } - if (!g_bSingleCommand && !g_bHardExit) - parser->StandbyDevices(CECDEVICE_BROADCAST); - parser->Close(); UnloadLibCec(parser);