* http://www.pulse-eight.net/
*/
-#include "../../include/cec.h"
+#include "../env.h"
+#include "../include/cec.h"
#include <cstdio>
#include <fcntl.h>
#include <fstream>
#include <string>
#include <sstream>
+#include <signal.h>
#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_7_1;
+#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_2_0_3;
-#include <cecloader.h>
+#include "../../include/cecloader.h"
ICECCallbacks g_callbacks;
libcec_configuration g_config;
return true;
}
-int CecLogMessage(void *UNUSED(cbParam), const cec_log_message &message)
+int CecLogMessage(void *UNUSED(cbParam), const cec_log_message message)
{
if ((message.level & g_cecLogLevel) == message.level)
{
return 0;
}
-int CecKeyPress(void *UNUSED(cbParam), const cec_keypress &UNUSED(key))
+int CecKeyPress(void *UNUSED(cbParam), const cec_keypress UNUSED(key))
{
return 0;
}
-int CecCommand(void *UNUSED(cbParam), const cec_command &UNUSED(command))
+int CecCommand(void *UNUSED(cbParam), const cec_command UNUSED(command))
{
return 0;
}
-int CecAlert(void *UNUSED(cbParam), const libcec_alert type, const libcec_parameter &UNUSED(param))
+int CecAlert(void *UNUSED(cbParam), const libcec_alert type, const libcec_parameter UNUSED(param))
{
switch (type)
{
{
time_t buildTime = (time_t)config.iFirmwareBuildDate;
strDeviceInfo.AppendFormat("firmware build date: %s", asctime(gmtime(&buildTime)));
- strDeviceInfo = strDeviceInfo.Left((int)strDeviceInfo.length() - 1); // strip \n added by asctime
- strDeviceInfo.append(" +0000");
+ 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");
" 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 <<
cec_command bytes;
bytes.Clear();
+ CStdString strArguments(arguments);
+ strArguments.Replace(':', ' ');
+ arguments = strArguments;
+
while (GetWord(arguments, strvalue) && HexStrToInt(strvalue, ivalue))
bytes.PushBack(ivalue);
if (command == "as")
{
parser->SetActiveSource();
+ // wait for the source switch to finish for 15 seconds tops
+ if (g_bSingleCommand)
+ {
+ CTimeout timeout(15000);
+ bool bActiveSource(false);
+ while (timeout.TimeLeft() > 0 && !bActiveSource)
+ {
+ bActiveSource = parser->IsLibCECActiveSource();
+ if (!bActiveSource)
+ CEvent::Sleep(100);
+ }
+ }
return true;
}
if (iDev >= 0 && iDev < 15)
{
uint64_t iVendor = parser->GetDeviceVendorId((cec_logical_address) iDev);
- PrintToStdOut("vendor id: %06x", iVendor);
+ PrintToStdOut("vendor id: %06llx", iVendor);
return true;
}
}
strLog.append("CEC bus information\n===================\n");
cec_logical_addresses addresses = parser->GetActiveDevices();
+ cec_logical_address activeSource = parser->GetActiveSource();
for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
{
if (addresses[iPtr])
{
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);
+ bool bActive = parser->IsActiveSource((cec_logical_address)iPtr);
cec_version iCecVersion = parser->GetDeviceCecVersion((cec_logical_address)iPtr);
cec_power_status power = parser->GetDevicePowerStatus((cec_logical_address)iPtr);
cec_osd_name osdName = parser->GetDeviceOSDName((cec_logical_address)iPtr);
CStdString strAddr;
- strAddr.Format("%04x", iPhysicalAddress);
+ strAddr.Format("%x.%x.%x.%x", (iPhysicalAddress >> 12) & 0xF, (iPhysicalAddress >> 8) & 0xF, (iPhysicalAddress >> 4) & 0xF, iPhysicalAddress & 0xF);
cec_menu_language lang;
lang.device = CECDEVICE_UNKNOWN;
parser->GetDeviceMenuLanguage((cec_logical_address)iPtr, &lang);
}
}
- cec_logical_address activeSource = parser->GetActiveSource();
+ activeSource = parser->GetActiveSource();
strLog.AppendFormat("currently active source: %s (%d)", parser->ToString(activeSource), (int)activeSource);
PrintToStdOut(strLog);
{
if (!g_bSingleCommand)
cout << "== using device type 'playback device'" << endl;
- g_config.deviceTypes.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_config.deviceTypes.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_config.deviceTypes.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_config.deviceTypes.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
+ g_config.deviceTypes.Add(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
}
else
{
}
++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"))
{
return bReturn;
}
+void sighandler(int iSignal)
+{
+ PrintToStdOut("signal caught: %d - exiting", iSignal);
+ g_bExit = true;
+}
+
int main (int argc, char *argv[])
{
+ if (signal(SIGINT, sighandler) == SIG_ERR)
+ {
+ PrintToStdOut("can't register sighandler");
+ return -1;
+ }
+
g_config.Clear();
g_callbacks.Clear();
snprintf(g_config.strDeviceName, 13, "CECTester");
{
if (!g_bSingleCommand)
cout << "No device type given. Using 'recording device'" << endl;
- g_config.deviceTypes.add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+ g_config.deviceTypes.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
}
ICECAdapter *parser = LibCecInitialise(&g_config);
return 1;
}
+ // init video on targets that need this
+ parser->InitVideoStandalone();
+
if (!g_bSingleCommand)
{
CStdString strLog;
repositories / deb_libcec.git / blobdiff