From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 17 Feb 2012 11:30:23 +0000 (+0100)
Subject: cec: don't transmit in CCECProcessor while keeping the mutex locked. don't set the... 
X-Git-Tag: upstream/2.2.0~1^2~35^2~10
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=7cf8ba15c0010b7b71db5ed213c39a435742d512;p=deb_libcec.git

cec: don't transmit in CCECProcessor while keeping the mutex locked. don't set the device state to not present when no acked was received, because that can have other causes
---

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index afe87a9..d1e5b27 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -864,7 +864,7 @@ bool CCECProcessor::Transmit(const cec_command &data)
     return false;
   }
 
-  cec_adapter_message_state retVal(ADAPTER_MESSAGE_STATE_UNKNOWN);
+  uint8_t iMaxTries(0);
   {
     CLockObject lock(m_mutex);
     LogOutput(data);
@@ -874,16 +874,11 @@ bool CCECProcessor::Transmit(const cec_command &data)
       CLibCEC::AddLog(CEC_LOG_ERROR, "cannot transmit command: connection closed");
       return false;
     }
-    uint8_t iMaxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1;
-    retVal = m_communication->Write(data, iMaxTries, m_iLineTimeout, m_iRetryLineTimeout);
+    iMaxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1;
   }
 
-  /* set to "not present" on failed ack */
-  if (retVal == ADAPTER_MESSAGE_STATE_SENT_NOT_ACKED &&
-      data.destination != CECDEVICE_BROADCAST)
-    m_busDevices[data.destination]->SetDeviceStatus(CEC_DEVICE_STATUS_NOT_PRESENT);
-
-  return retVal == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+  return m_communication->Write(data, iMaxTries, m_iLineTimeout, m_iRetryLineTimeout)
+      == ADAPTER_MESSAGE_STATE_SENT_ACKED;
 }
 
 void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)