repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: cleanups, documentation and some fixes for the last commits
[deb_libcec.git]
/
src
/
lib
/
implementations
/
ANCommandHandler.cpp
diff --git
a/src/lib/implementations/ANCommandHandler.cpp
b/src/lib/implementations/ANCommandHandler.cpp
index 182f0acc76444d10769062f8413cac767b3f5cad..ed4218ea96e36a9553ccf45a7beb97f3118ae6ee 100644
(file)
--- a/
src/lib/implementations/ANCommandHandler.cpp
+++ b/
src/lib/implementations/ANCommandHandler.cpp
@@
-34,9
+34,13
@@
#include "../devices/CECBusDevice.h"
#include "../CECProcessor.h"
#include "../LibCEC.h"
#include "../devices/CECBusDevice.h"
#include "../CECProcessor.h"
#include "../LibCEC.h"
+#include "../CECClient.h"
using namespace CEC;
using namespace CEC;
+#define LIB_CEC m_busDevice->GetProcessor()->GetLib()
+#define ToString(p) LIB_CEC->ToString(p)
+
CANCommandHandler::CANCommandHandler(CCECBusDevice *busDevice) :
CCECCommandHandler(busDevice)
{
CANCommandHandler::CANCommandHandler(CCECBusDevice *busDevice) :
CCECCommandHandler(busDevice)
{
@@
-48,6
+52,8
@@
bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
{
if (m_processor->IsRunning() && command.parameters.size > 0)
{
{
if (m_processor->IsRunning() && command.parameters.size > 0)
{
+ CCECClient *client = m_processor->GetClient(command.destination);
+
cec_keypress key;
key.duration = CEC_BUTTON_TIMEOUT;
key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
cec_keypress key;
key.duration = CEC_BUTTON_TIMEOUT;
key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
@@
-55,7
+61,7
@@
bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
switch (command.parameters[0])
{
case CEC_USER_CONTROL_CODE_AN_RETURN:
switch (command.parameters[0])
{
case CEC_USER_CONTROL_CODE_AN_RETURN:
- key.keycode =
m_processor
->GetClientVersion() >= CEC_CLIENT_VERSION_1_5_0 ?
+ key.keycode =
client && client
->GetClientVersion() >= CEC_CLIENT_VERSION_1_5_0 ?
CEC_USER_CONTROL_CODE_AN_RETURN :
CEC_USER_CONTROL_CODE_EXIT;
break;
CEC_USER_CONTROL_CODE_AN_RETURN :
CEC_USER_CONTROL_CODE_EXIT;
break;
@@
-66,8
+72,8
@@
bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
break;
}
break;
}
- if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN)
-
CLibCEC::
AddKey(key);
+ if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN
&& client
)
+
client->
AddKey(key);
}
return true;
}
return true;
@@
-76,7
+82,7
@@
bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
bool CANCommandHandler::HandleCommand(const cec_command &command)
{
bool bHandled(false);
bool CANCommandHandler::HandleCommand(const cec_command &command)
{
bool bHandled(false);
- if (m_
busDevice->MyLogicalAddressContains
(command.destination))
+ if (m_
processor->IsHandledByLibCEC
(command.destination))
{
switch(command.opcode)
{
{
switch(command.opcode)
{