X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=97bdcc608d79aea1db5a36e9e30ff51fb2445750;hb=2b44051cbfa70deafc30d9767323214debbc1a75;hp=c9a74d7b0364eac3162a9d7ca12fc09af97e0da2;hpb=f80cd2082cb6b36e56e00d42c0f2fc104565f7e5;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index c9a74d7..97bdcc6 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -30,7 +30,8 @@ * http://www.pulse-eight.net/ */ -#include "../../include/cec.h" +#include "../env.h" +#include "../include/cec.h" #include #include @@ -40,16 +41,20 @@ #include #include "../lib/platform/os.h" #include "../lib/implementations/CECCommandHandler.h" +#include "../lib/platform/util/StdString.h" using namespace CEC; using namespace std; using namespace PLATFORM; +#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_1_8_0; + #include ICECCallbacks g_callbacks; libcec_configuration g_config; -int g_cecLogLevel(CEC_LOG_ALL); +int g_cecLogLevel(-1); +int g_cecDefaultLogLevel(CEC_LOG_ALL); ofstream g_logOutput; bool g_bShortLog(false); CStdString g_strPort; @@ -175,13 +180,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; - g_callbacks.CBCecConfigurationChanged = NULL; - 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) @@ -199,16 +209,26 @@ void ListDevices(ICECAdapter *parser) for (int8_t iDevicePtr = 0; iDevicePtr < iDevicesFound; iDevicePtr++) { - strDeviceInfo.AppendFormat("device: %d\ncom port: %s\n", iDevicePtr + 1, 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.AppendFormat("firmware version: %d\n", config.iFirmwareVersion); + if (config.iFirmwareBuildDate != CEC_FW_BUILD_UNKNOWN) + { + 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("\n"); + } PrintToStdOut(strDeviceInfo.c_str()); } } @@ -234,6 +254,8 @@ void ShowHelpCommandLine(const char* strExec) " -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 << + " -m --monitor Start a monitor-only client." << endl << + " -i --info Shows information about how libCEC was compiled." << 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 << @@ -317,7 +339,7 @@ bool ProcessCommandSP(ICECAdapter *parser, const string &command, string &argume if (GetWord(arguments, strAddress)) { sscanf(strAddress.c_str(), "%x", &iAddress); - if (iAddress >= 0 && iAddress <= 0xFFFF) + if (iAddress >= 0 && iAddress <= CEC_INVALID_PHYSICAL_ADDRESS) parser->SetStreamPath((uint16_t)iAddress); return true; } @@ -508,7 +530,7 @@ bool ProcessCommandAS(ICECAdapter *parser, const string &command, string & UNUSE { if (command == "as") { - parser->SetActiveView(); + parser->SetActiveSource(); return true; } @@ -758,14 +780,19 @@ bool ProcessCommandR(ICECAdapter *parser, const string &command, string & UNUSED { if (command == "r") { + bool bReactivate = parser->IsLibCECActiveSource(); + PrintToStdOut("closing the connection"); parser->Close(); PrintToStdOut("opening a new connection"); parser->Open(g_strPort.c_str()); - PrintToStdOut("setting active source"); - parser->SetActiveSource(); + if (bReactivate) + { + PrintToStdOut("setting active source"); + parser->SetActiveSource(); + } return true; } @@ -808,14 +835,15 @@ bool ProcessCommandSCAN(ICECAdapter *parser, const string &command, string & UNU { if (command == "scan") { - PrintToStdOut("CEC bus information"); - PrintToStdOut("==================="); + CStdString strLog; + PrintToStdOut("requesting CEC bus information ..."); + + strLog.append("CEC bus information\n===================\n"); cec_logical_addresses addresses = parser->GetActiveDevices(); for (uint8_t iPtr = 0; iPtr < 16; iPtr++) { if (addresses[iPtr]) { - CStdString strLog; 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); @@ -837,10 +865,14 @@ bool ProcessCommandSCAN(ICECAdapter *parser, const string &command, string & UNU strLog.AppendFormat("power status: %s\n", parser->ToString(power)); if ((uint8_t)lang.device == iPtr) strLog.AppendFormat("language: %s\n", lang.language); - strLog.append("\n"); - PrintToStdOut(strLog); + strLog.append("\n\n"); } } + + cec_logical_address activeSource = parser->GetActiveSource(); + strLog.AppendFormat("currently active source: %s (%d)", parser->ToString(activeSource), (int)activeSource); + + PrintToStdOut(strLog); return true; } @@ -978,9 +1010,29 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) } ++iArgPtr; } + else if (!strcmp(argv[iArgPtr], "--info") || + !strcmp(argv[iArgPtr], "-i")) + { + if (g_cecLogLevel == -1) + g_cecLogLevel = CEC_LOG_WARNING + CEC_LOG_ERROR; + ICECAdapter *parser = LibCecInitialise(&g_config); + if (parser) + { + CStdString strMessage; + strMessage.Format("libCEC version: %s", parser->ToString((cec_server_version)g_config.serverVersion)); + if (g_config.serverVersion >= CEC_SERVER_VERSION_1_7_2) + strMessage.AppendFormat(", %s", parser->GetLibInfo()); + PrintToStdOut(strMessage.c_str()); + UnloadLibCec(parser); + parser = NULL; + } + bReturn = false; + } else if (!strcmp(argv[iArgPtr], "--list-devices") || !strcmp(argv[iArgPtr], "-l")) { + if (g_cecLogLevel == -1) + g_cecLogLevel = CEC_LOG_WARNING + CEC_LOG_ERROR; ICECAdapter *parser = LibCecInitialise(&g_config); if (parser) { @@ -1004,6 +1056,9 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) else if (!strcmp(argv[iArgPtr], "--help") || !strcmp(argv[iArgPtr], "-h")) { + if (g_cecLogLevel == -1) + g_cecLogLevel = CEC_LOG_WARNING + CEC_LOG_ERROR; + ShowHelpCommandLine(argv[0]); return 0; } @@ -1023,7 +1078,12 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) { if (argc >= iArgPtr + 2) { - g_config.iHDMIPort = (int8_t)atoi(argv[iArgPtr + 1]); + 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; } @@ -1041,12 +1101,19 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) { if (argc >= iArgPtr + 2) { - snprintf(g_config.strDeviceName, 13, argv[iArgPtr + 1]); + snprintf(g_config.strDeviceName, 13, "%s", argv[iArgPtr + 1]); cout << "using osd name " << g_config.strDeviceName << endl; ++iArgPtr; } ++iArgPtr; } + else if (!strcmp(argv[iArgPtr], "-m") || + !strcmp(argv[iArgPtr], "--monitor")) + { + cout << "starting a monitor-only client. use 'mon 0' to switch to normal mode" << endl; + g_config.bMonitorOnly = 1; + ++iArgPtr; + } else { g_strPort = argv[iArgPtr++]; @@ -1060,17 +1127,22 @@ bool ProcessCommandLineArguments(int argc, char *argv[]) int main (int argc, char *argv[]) { g_config.Clear(); + g_callbacks.Clear(); snprintf(g_config.strDeviceName, 13, "CECTester"); - g_config.callbackParam = NULL; - g_config.clientVersion = CEC_CLIENT_VERSION_1_5_0; + g_config.clientVersion = CEC_CONFIG_VERSION; + g_config.bActivateSource = 0; 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_cecLogLevel == -1) + g_cecLogLevel = g_cecDefaultLogLevel; + if (g_config.deviceTypes.IsEmpty()) { if (!g_bSingleCommand) @@ -1093,6 +1165,9 @@ int main (int argc, char *argv[]) return 1; } + // init video on targets that need this + parser->InitVideoStandalone(); + if (!g_bSingleCommand) { CStdString strLog;