repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed: cleaned up configure, trying to once again recombine AC_MSG_WARN into single...
[deb_libcec.git]
/
src
/
lib
/
implementations
/
ANCommandHandler.cpp
diff --git
a/src/lib/implementations/ANCommandHandler.cpp
b/src/lib/implementations/ANCommandHandler.cpp
index bf9dea52a25d982c027bc5345f06421f0094561a..f8a8ade3c421aa12d00f781b03978eb1706dc9ba 100644
(file)
--- a/
src/lib/implementations/ANCommandHandler.cpp
+++ b/
src/lib/implementations/ANCommandHandler.cpp
@@
-1,7
+1,7
@@
/*
* This file is part of the libCEC(R) library.
*
/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011
-2012
Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
@@
-33,6
+33,7
@@
#include "ANCommandHandler.h"
#include "../devices/CECBusDevice.h"
#include "../CECProcessor.h"
#include "ANCommandHandler.h"
#include "../devices/CECBusDevice.h"
#include "../CECProcessor.h"
+#include "../LibCEC.h"
using namespace CEC;
using namespace CEC;
@@
-45,7
+46,7
@@
CANCommandHandler::CANCommandHandler(CCECBusDevice *busDevice) :
bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
{
bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
{
- if (m_processor->Is
Started
() && command.parameters.size > 0)
+ if (m_processor->Is
Running
() && command.parameters.size > 0)
{
cec_keypress key;
key.duration = CEC_BUTTON_TIMEOUT;
{
cec_keypress key;
key.duration = CEC_BUTTON_TIMEOUT;
@@
-53,21
+54,17
@@
bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
switch (command.parameters[0])
{
switch (command.parameters[0])
{
- case CEC_AN_USER_CONTROL_CODE_RETURN:
- key.keycode = CEC_USER_CONTROL_CODE_EXIT;
+ case CEC_USER_CONTROL_CODE_AN_RETURN:
+ key.keycode = m_processor->GetClientVersion() >= CEC_CLIENT_VERSION_1_5_0 ?
+ CEC_USER_CONTROL_CODE_AN_RETURN :
+ CEC_USER_CONTROL_CODE_EXIT;
break;
default:
break;
}
if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN)
break;
default:
break;
}
if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN)
- {
- CStdString strLog;
- strLog.Format("key pressed: %1x", key.keycode);
- m_busDevice->AddLog(CEC_LOG_DEBUG, strLog);
-
- m_busDevice->GetProcessor()->AddKey(key);
- }
+ CLibCEC::AddKey(key);
}
return true;
}
return true;