using namespace std;
using namespace PLATFORM;
+#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_1_7_1;
+
#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;
{
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;
}
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;
}
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_3;
+ g_config.clientVersion = CEC_CONFIG_VERSION;
g_config.bActivateSource = 0;
g_callbacks.CBCecLogMessage = &CecLogMessage;
g_callbacks.CBCecKeyPress = &CecKeyPress;
if (!ProcessCommandLineArguments(argc, argv))
return 0;
+ if (g_cecLogLevel == -1)
+ g_cecLogLevel = g_cecDefaultLogLevel;
+
if (g_config.deviceTypes.IsEmpty())
{
if (!g_bSingleCommand)