* http://www.pulse-eight.net/
*/
-#include "../../include/cec.h"
+#include "../env.h"
+#include "../include/cec.h"
#include <cstdio>
#include <fcntl.h>
#include <sstream>
#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;
-#include <cecloader.h>
+#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_1_9_0;
+
+#include "../../include/cecloader.h"
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;
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\n");
+ }
+
+ if (config.adapterType != ADAPTERTYPE_UNKNOWN)
+ {
+ strDeviceInfo.AppendFormat("type: %s\n", parser->ToString(config.adapterType));
+ }
+ }
strDeviceInfo.append("\n");
}
PrintToStdOut(strDeviceInfo.c_str());
" -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 <<
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;
}
{
if (command == "as")
{
- parser->SetActiveView();
+ parser->SetActiveSource();
return true;
}
{
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;
}
{
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);
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;
}
}
++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)
{
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;
}
}
++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++];
int main (int argc, char *argv[])
{
g_config.Clear();
+ g_callbacks.Clear();
snprintf(g_config.strDeviceName, 13, "CECTester");
- g_config.clientVersion = CEC_CLIENT_VERSION_1_6_2;
+ g_config.clientVersion = CEC_CONFIG_VERSION;
+ g_config.bActivateSource = 0;
g_callbacks.CBCecLogMessage = &CecLogMessage;
g_callbacks.CBCecKeyPress = &CecKeyPress;
g_callbacks.CBCecCommand = &CecCommand;
if (!ProcessCommandLineArguments(argc, argv))
return 0;
+ if (g_cecLogLevel == -1)
+ g_cecLogLevel = g_cecDefaultLogLevel;
+
if (g_config.deviceTypes.IsEmpty())
{
if (!g_bSingleCommand)
return 1;
}
+ // init video on targets that need this
+ parser->InitVideoStandalone();
+
if (!g_bSingleCommand)
{
CStdString strLog;
repositories / deb_libcec.git / blobdiff