repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed - CCECClient::IsLibCECActiveSource returns false now while the active source...
[deb_libcec.git]
/
src
/
testclient
/
main.cpp
diff --git
a/src/testclient/main.cpp
b/src/testclient/main.cpp
index f1687baa3b94cb989bd68c63461787a3181b7544..d170bfa44a791be7606384ef6f2bc8cbfb7d5c8b 100644
(file)
--- a/
src/testclient/main.cpp
+++ b/
src/testclient/main.cpp
@@
-48,7
+48,7
@@
using namespace CEC;
using namespace std;
using namespace PLATFORM;
using namespace std;
using namespace PLATFORM;
-#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_
1_9
_0;
+#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_
2_0
_0;
#include "../../include/cecloader.h"
#include "../../include/cecloader.h"
@@
-129,7
+129,7
@@
bool GetWord(string& data, string& word)
return true;
}
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)
{
{
if ((message.level & g_cecLogLevel) == message.level)
{
@@
-171,17
+171,17
@@
int CecLogMessage(void *UNUSED(cbParam), const cec_log_message &message)
return 0;
}
return 0;
}
-int CecKeyPress(void *UNUSED(cbParam), const cec_keypress
&
UNUSED(key))
+int CecKeyPress(void *UNUSED(cbParam), const cec_keypress UNUSED(key))
{
return 0;
}
{
return 0;
}
-int CecCommand(void *UNUSED(cbParam), const cec_command
&
UNUSED(command))
+int CecCommand(void *UNUSED(cbParam), const cec_command UNUSED(command))
{
return 0;
}
{
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)
{
{
switch (type)
{
@@
-857,7
+857,7
@@
bool ProcessCommandSCAN(ICECAdapter *parser, const string &command, string & UNU
cec_power_status power = parser->GetDevicePowerStatus((cec_logical_address)iPtr);
cec_osd_name osdName = parser->GetDeviceOSDName((cec_logical_address)iPtr);
CStdString strAddr;
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_menu_language lang;
lang.device = CECDEVICE_UNKNOWN;
parser->GetDeviceMenuLanguage((cec_logical_address)iPtr, &lang);
@@
-988,25
+988,25
@@
bool ProcessCommandLineArguments(int argc, char *argv[])
{
if (!g_bSingleCommand)
cout << "== using device type 'playback device'" << endl;
{
if (!g_bSingleCommand)
cout << "== using device type 'playback device'" << endl;
- g_config.deviceTypes.
a
dd(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+ g_config.deviceTypes.
A
dd(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
}
else if (!strcmp(argv[iArgPtr + 1], "r"))
{
if (!g_bSingleCommand)
cout << "== using device type 'recording device'" << endl;
}
else if (!strcmp(argv[iArgPtr + 1], "r"))
{
if (!g_bSingleCommand)
cout << "== using device type 'recording device'" << endl;
- g_config.deviceTypes.
a
dd(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+ g_config.deviceTypes.
A
dd(CEC_DEVICE_TYPE_RECORDING_DEVICE);
}
else if (!strcmp(argv[iArgPtr + 1], "t"))
{
if (!g_bSingleCommand)
cout << "== using device type 'tuner'" << endl;
}
else if (!strcmp(argv[iArgPtr + 1], "t"))
{
if (!g_bSingleCommand)
cout << "== using device type 'tuner'" << endl;
- g_config.deviceTypes.
a
dd(CEC_DEVICE_TYPE_TUNER);
+ g_config.deviceTypes.
A
dd(CEC_DEVICE_TYPE_TUNER);
}
else if (!strcmp(argv[iArgPtr + 1], "a"))
{
if (!g_bSingleCommand)
cout << "== using device type 'audio system'" << endl;
}
else if (!strcmp(argv[iArgPtr + 1], "a"))
{
if (!g_bSingleCommand)
cout << "== using device type 'audio system'" << endl;
- g_config.deviceTypes.
a
dd(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
+ g_config.deviceTypes.
A
dd(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
}
else
{
}
else
{
@@
-1165,7
+1165,7
@@
int main (int argc, char *argv[])
{
if (!g_bSingleCommand)
cout << "No device type given. Using 'recording device'" << endl;
{
if (!g_bSingleCommand)
cout << "No device type given. Using 'recording device'" << endl;
- g_config.deviceTypes.
a
dd(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+ g_config.deviceTypes.
A
dd(CEC_DEVICE_TYPE_RECORDING_DEVICE);
}
ICECAdapter *parser = LibCecInitialise(&g_config);
}
ICECAdapter *parser = LibCecInitialise(&g_config);