X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=69309bc7dfc078592691e4b99acb035dcca1097a;hb=3b2bd169c03f74ccca35d9e211bbbc1308c33675;hp=499a8a10be6fd1ccda2f287fe9372d217608bf68;hpb=102120cb9d6b3c723ed44b22ae1c97cb160e0bcc;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index 499a8a1..69309bc 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. @@ -30,7 +30,7 @@ * http://www.pulse-eight.net/ */ -#include +#include "../../include/cec.h" #include #include @@ -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,22 +180,23 @@ 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); } 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 { - PrintToStdOut("Found devices: %d", iDevicesFound); - for (unsigned int iDevicePtr = 0; iDevicePtr < iDevicesFound; iDevicePtr++) - PrintToStdOut("device: %d\npath: %s\ncom port: %s", iDevicePtr + 1, devices[iDevicePtr].path, devices[iDevicePtr].comm); + 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); } } @@ -230,24 +227,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); @@ -273,9 +252,12 @@ void ShowHelpConsole(void) "[lad] lists active devices on the bus" << endl << "[ad] {addr} checks whether the specified device is active." << endl << "[at] {type} checks whether the specified device type is active." << endl << + "[sp] {addr} makes the specified physical address active." << endl << + "[spl] {addr} makes the specified logical address active." << endl << "[volup] send a volume up command to the amp if present" << endl << "[voldown] send a volume down command to the amp if present" << endl << "[mute] send a mute/unmute command to the amp if present" << endl << + "[self] show the list of addresses controlled by libCEC" << endl << "[scan] scan the CEC bus and display device info" << endl << "[mon] {1|0} enable or disable CEC bus monitoring." << endl << "[log] {1 - 31} change the log level. see cectypes.h for values." << endl << @@ -289,6 +271,64 @@ void ShowHelpConsole(void) "================================================================================" << endl; } +bool ProcessCommandSELF(ICECAdapter *parser, const string &command, string & UNUSED(arguments)) +{ + if (command == "self") + { + cec_logical_addresses addr = parser->GetLogicalAddresses(); + CStdString strOut = "Addresses controlled by libCEC: "; + bool bFirst(true); + for (uint8_t iPtr = 0; iPtr <= 15; iPtr++) + { + if (addr[iPtr]) + { + strOut.AppendFormat((bFirst ? "%d%s" : ", %d%s"), iPtr, parser->IsActiveSource((cec_logical_address)iPtr) ? "*" : ""); + bFirst = false; + } + } + PrintToStdOut(strOut.c_str()); + return true; + } + + return false; +} + +bool ProcessCommandSP(ICECAdapter *parser, const string &command, string &arguments) +{ + if (command == "sp") + { + string strAddress; + int iAddress; + if (GetWord(arguments, strAddress)) + { + sscanf(strAddress.c_str(), "%x", &iAddress); + if (iAddress >= 0 && iAddress <= 0xFFFF) + parser->SetStreamPath((uint16_t)iAddress); + return true; + } + } + + return false; +} + +bool ProcessCommandSPL(ICECAdapter *parser, const string &command, string &arguments) +{ + if (command == "spl") + { + string strAddress; + cec_logical_address iAddress; + if (GetWord(arguments, strAddress)) + { + iAddress = (cec_logical_address)atoi(strAddress.c_str()); + if (iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) + parser->SetStreamPath(iAddress); + return true; + } + } + + return false; +} + bool ProcessCommandTX(ICECAdapter *parser, const string &command, string &arguments) { if (command == "tx" || command == "txn") @@ -828,7 +868,10 @@ bool ProcessConsoleCommand(ICECAdapter *parser, string &input) ProcessCommandR(parser, command, input) || ProcessCommandH(parser, command, input) || ProcessCommandLOG(parser, command, input) || - ProcessCommandSCAN(parser, command, input); + ProcessCommandSCAN(parser, command, input) || + ProcessCommandSP(parser, command, input) || + ProcessCommandSPL(parser, command, input) || + ProcessCommandSELF(parser, command, input); } } return true; @@ -892,25 +935,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 { @@ -923,7 +966,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); @@ -949,8 +992,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; @@ -960,8 +1003,8 @@ 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; @@ -978,20 +1021,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; @@ -1008,7 +1058,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 @@ -1044,9 +1094,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())) @@ -1057,14 +1104,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) { @@ -1081,12 +1121,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);