X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECPlaybackDevice.cpp;h=4969de58c4af45bc442a0953016c3638d1014a1d;hb=c8f0eef05f41c11d507a81cb648bf29c86f13686;hp=112ebf778513c45cc3a44bf008ea36ebf8f3f2d4;hpb=5606e90bb3c5a85ab8e29e639e8248581247699e;p=deb_libcec.git diff --git a/src/lib/devices/CECPlaybackDevice.cpp b/src/lib/devices/CECPlaybackDevice.cpp index 112ebf7..4969de5 100644 --- a/src/lib/devices/CECPlaybackDevice.cpp +++ b/src/lib/devices/CECPlaybackDevice.cpp @@ -54,7 +54,7 @@ cec_deck_info CCECPlaybackDevice::GetDeckStatus(void) void CCECPlaybackDevice::SetDeckStatus(cec_deck_info deckStatus) { - CLockObject lock(&m_writeMutex); + CLockObject lock(&m_mutex); if (m_deckStatus != deckStatus && m_deckStatus != CEC_DECK_INFO_OTHER_STATUS_LG) { CStdString strLog; @@ -73,7 +73,7 @@ cec_deck_control_mode CCECPlaybackDevice::GetDeckControlMode(void) void CCECPlaybackDevice::SetDeckControlMode(cec_deck_control_mode mode) { - CLockObject lock(&m_writeMutex); + CLockObject lock(&m_mutex); if (m_deckControlMode != mode) { CStdString strLog; @@ -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_mutex); + 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); }