repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release'
[deb_libcec.git]
/
src
/
lib
/
CECProcessor.cpp
diff --git
a/src/lib/CECProcessor.cpp
b/src/lib/CECProcessor.cpp
index 563f2aa13a1c4cba31bf74155219e3d5fe5721c3..f781b6fb58b94f99f970a8eb2248937f958aa1cc 100644
(file)
--- a/
src/lib/CECProcessor.cpp
+++ b/
src/lib/CECProcessor.cpp
@@
-251,7
+251,7
@@
bool CCECProcessor::Transmit(CCECAdapterMessage *output)
return bReturn;
else
{
return bReturn;
else
{
- output->condition.Wait(&output->mutex
, 1000
);
+ output->condition.Wait(&output->mutex);
if (output->state != ADAPTER_MESSAGE_STATE_SENT)
{
m_controller->AddLog(CEC_LOG_ERROR, "command was not sent");
if (output->state != ADAPTER_MESSAGE_STATE_SENT)
{
m_controller->AddLog(CEC_LOG_ERROR, "command was not sent");
@@
-394,6
+394,11
@@
void CCECProcessor::AddCommand(const cec_command &command)
m_controller->AddCommand(command);
}
m_controller->AddCommand(command);
}
+void CCECProcessor::AddKey(cec_keypress &key)
+{
+ m_controller->AddKey(key);
+}
+
void CCECProcessor::AddKey(void)
{
m_controller->AddKey();
void CCECProcessor::AddKey(void)
{
m_controller->AddKey();