repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: include the ack timeout in the cec_command struct
[deb_libcec.git]
/
src
/
lib
/
CECProcessor.cpp
diff --git
a/src/lib/CECProcessor.cpp
b/src/lib/CECProcessor.cpp
index 1bc4c597854ad6475dc6557a67429445fa5a1813..f7634512e3b6d10636023bb68019f956aba4b033 100644
(file)
--- a/
src/lib/CECProcessor.cpp
+++ b/
src/lib/CECProcessor.cpp
@@
-187,7
+187,7
@@
bool CCECProcessor::SwitchMonitoring(bool bEnable)
return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
}
return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
}
-bool CCECProcessor::Transmit(const cec_command &data
, bool bWaitForAck /* = true */
)
+bool CCECProcessor::Transmit(const cec_command &data)
{
bool bReturn(false);
LogOutput(data);
{
bool bReturn(false);
LogOutput(data);
@@
-210,10
+210,10
@@
bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true
}
}
}
}
- if (
bWaitForAck
)
+ if (
data.ack_timeout > 0
)
{
bool bError(false);
{
bool bError(false);
- if ((bReturn = WaitForAck(&bError, output->size(),
1000
)) == false)
+ if ((bReturn = WaitForAck(&bError, output->size(),
data.ack_timeout
)) == false)
m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
}
else
m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
}
else