X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=964cf68384b1d224a881466164ffb09a38186b5e;hb=9ff1aa8068f4d4b0db936cfa6c69674a8c520ad6;hp=b0492866449751f28d4a456a0c49fd344c74c67f;hpb=4c9b9776fafa21f6c4195068fff5ce60b5827572;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index b049286..964cf68 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, ...) { @@ -184,6 +180,7 @@ void EnableCallbacks(ICECAdapter *adapter) g_callbacks.CBCecLogMessage = &CecLogMessage; g_callbacks.CBCecKeyPress = &CecKeyPress; g_callbacks.CBCecCommand = &CecCommand; + g_callbacks.CBCecConfigurationChanged = NULL; adapter->EnableCallbacks(NULL, &g_callbacks); } @@ -217,6 +214,7 @@ 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 << @@ -230,24 +228,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 +936,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 +967,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 +976,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 +998,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,12 +1009,19 @@ 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; + g_config.iHDMIPort = (int8_t)atoi(argv[iArgPtr + 1]); + 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 { g_strPort = argv[iArgPtr++]; @@ -1042,20 +1034,27 @@ 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_5_0; + g_callbacks.CBCecLogMessage = &CecLogMessage; + g_callbacks.CBCecKeyPress = &CecKeyPress; + g_callbacks.CBCecCommand = &CecCommand; + 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 +1071,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 +1107,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 +1117,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 +1134,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);