repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: added GetLibVersionMinor()/cec_get_lib_version_minor() and set the minor version...
[deb_libcec.git]
/
src
/
lib
/
CECProcessor.cpp
diff --git
a/src/lib/CECProcessor.cpp
b/src/lib/CECProcessor.cpp
index 0749e5375f00c0362d1dc9a93127f49b8cfe4976..c83bdc05486d158140313c5a602840f2e0188478 100644
(file)
--- a/
src/lib/CECProcessor.cpp
+++ b/
src/lib/CECProcessor.cpp
@@
-231,13
+231,17
@@
cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddres
bool CCECProcessor::Transmit(const cec_command &data)
{
bool CCECProcessor::Transmit(const cec_command &data)
{
+ bool bReturn(false);
LogOutput(data);
LogOutput(data);
- CCECAdapterMessagePtr output(new CCECAdapterMessage(data));
- return Transmit(output);
+ CCECAdapterMessage *output = new CCECAdapterMessage(data);
+ bReturn = Transmit(output);
+ delete output;
+
+ return bReturn;
}
}
-bool CCECProcessor::Transmit(CCECAdapterMessage
Ptr
output)
+bool CCECProcessor::Transmit(CCECAdapterMessage
*
output)
{
bool bReturn(false);
CLockObject lock(&m_mutex);
{
bool bReturn(false);
CLockObject lock(&m_mutex);
@@
-247,7
+251,7
@@
bool CCECProcessor::Transmit(CCECAdapterMessagePtr 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");
@@
-402,11
+406,12
@@
void CCECProcessor::AddLog(cec_log_level level, const CStdString &strMessage)
bool CCECProcessor::SetAckMask(uint16_t iMask)
{
bool CCECProcessor::SetAckMask(uint16_t iMask)
{
+ bool bReturn(false);
CStdString strLog;
strLog.Format("setting ackmask to %2x", iMask);
m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
CStdString strLog;
strLog.Format("setting ackmask to %2x", iMask);
m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
- CCECAdapterMessage
Ptr output(new CCECAdapterMessage)
;
+ CCECAdapterMessage
*output = new CCECAdapterMessage
;
output->push_back(MSGSTART);
output->push_escaped(MSGCODE_SET_ACK_MASK);
output->push_back(MSGSTART);
output->push_escaped(MSGCODE_SET_ACK_MASK);
@@
-414,11
+419,10
@@
bool CCECProcessor::SetAckMask(uint16_t iMask)
output->push_escaped((uint8_t)iMask);
output->push_back(MSGEND);
output->push_escaped((uint8_t)iMask);
output->push_back(MSGEND);
- if (!Transmit(output))
- {
+ if ((bReturn = Transmit(output)) == false)
m_controller->AddLog(CEC_LOG_ERROR, "could not set the ackmask");
m_controller->AddLog(CEC_LOG_ERROR, "could not set the ackmask");
- return false;
- }
- return true;
+ delete output;
+
+ return bReturn;
}
}