repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: MSGCODE_TIMEOUT_ERROR is a response to a transmission
[deb_libcec.git]
/
src
/
lib
/
CECClient.cpp
diff --git
a/src/lib/CECClient.cpp
b/src/lib/CECClient.cpp
index 24f196f49287008800a01c1b88f76ff4d0463259..6fe35d6d87bdbb298b3ebbed4608af38b3374807 100644
(file)
--- a/
src/lib/CECClient.cpp
+++ b/
src/lib/CECClient.cpp
@@
-33,6
+33,7
@@
#include "CECClient.h"
#include "CECProcessor.h"
#include "LibCEC.h"
#include "CECClient.h"
#include "CECProcessor.h"
#include "LibCEC.h"
+#include "CECTypeUtils.h"
#include "devices/CECPlaybackDevice.h"
#include "devices/CECAudioSystem.h"
#include "devices/CECTV.h"
#include "devices/CECPlaybackDevice.h"
#include "devices/CECAudioSystem.h"
#include "devices/CECTV.h"
@@
-41,7
+42,7
@@
using namespace CEC;
using namespace PLATFORM;
#define LIB_CEC m_processor->GetLib()
using namespace PLATFORM;
#define LIB_CEC m_processor->GetLib()
-#define ToString(x)
LIB_CEC->
ToString(x)
+#define ToString(x)
CCECTypeUtils::
ToString(x)
CCECClient::CCECClient(CCECProcessor *processor, const libcec_configuration &configuration) :
m_processor(processor),
CCECClient::CCECClient(CCECProcessor *processor, const libcec_configuration &configuration) :
m_processor(processor),
@@
-678,21
+679,19
@@
uint8_t CCECClient::SendMuteAudio(void)
bool CCECClient::SendKeypress(const cec_logical_address iDestination, const cec_user_control_code key, bool bWait /* = true */)
{
bool CCECClient::SendKeypress(const cec_logical_address iDestination, const cec_user_control_code key, bool bWait /* = true */)
{
- CCECBusDevice *device = GetPrimaryDevice();
CCECBusDevice *dest = m_processor->GetDevice(iDestination);
CCECBusDevice *dest = m_processor->GetDevice(iDestination);
- return de
vice && de
st ?
- de
vice
->TransmitKeypress(GetPrimaryLogicalAdddress(), key, bWait) :
+ return dest ?
+ de
st
->TransmitKeypress(GetPrimaryLogicalAdddress(), key, bWait) :
false;
}
bool CCECClient::SendKeyRelease(const cec_logical_address iDestination, bool bWait /* = true */)
{
false;
}
bool CCECClient::SendKeyRelease(const cec_logical_address iDestination, bool bWait /* = true */)
{
- CCECBusDevice *device = GetPrimaryDevice();
CCECBusDevice *dest = m_processor->GetDevice(iDestination);
CCECBusDevice *dest = m_processor->GetDevice(iDestination);
- return de
vice && de
st ?
- de
vice
->TransmitKeyRelease(GetPrimaryLogicalAdddress(), bWait) :
+ return dest ?
+ de
st
->TransmitKeyRelease(GetPrimaryLogicalAdddress(), bWait) :
false;
}
false;
}