cec: refactor CEC read/write. keep a single lock for all writes, not one per device

[deb_libcec.git] / src / lib / devices / CECPlaybackDevice.cpp

diff --git a/src/lib/devices/CECPlaybackDevice.cpp b/src/lib/devices/CECPlaybackDevice.cpp
index 112ebf778513c45cc3a44bf008ea36ebf8f3f2d4..4c90b9fa470c734e7e617aad2cf97363b6693300 100644 (file)
--- a/src/lib/devices/CECPlaybackDevice.cpp
+++ b/src/lib/devices/CECPlaybackDevice.cpp
@@ -86,14 +86,14 @@ void CCECPlaybackDevice::SetDeckControlMode(cec_deck_control_mode mode)
 
 bool CCECPlaybackDevice::TransmitDeckStatus(cec_logical_address dest)
 {
-  CLockObject lock(&m_writeMutex);
-  CStdString strLog;
-  strLog.Format("<< %s (%X) -> %s (%X): deck status '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_deckStatus));
-  AddLog(CEC_LOG_NOTICE, strLog);
-
-  cec_command command;
-  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_DECK_STATUS);
-  command.PushBack((uint8_t)m_deckStatus);
+  cec_deck_info state;
+  {
+    CLockObject lock(&m_writeMutex);
+    CStdString strLog;
+    strLog.Format("<< %s (%X) -> %s (%X): deck status '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_deckStatus));
+    AddLog(CEC_LOG_NOTICE, strLog);
+    state = m_deckStatus;
+  }
 
-  return m_processor->Transmit(command);
+  return m_handler->TransmitDeckStatus(m_iLogicalAddress, dest, state);
 }