X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FCECCommandHandler.cpp;h=561819f3f47d77401c5c00b6fea3f172eafb13e8;hb=8cd01ab8b94037e0a86c266b3ddc45a350a22103;hp=9f9c882336e6ebcd16046600255fe880169a8058;hpb=1344fd1a7e86aa1bbc8b1e78eed6be8cd59c4b3b;p=deb_libcec.git diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp index 9f9c882..561819f 100644 --- a/src/lib/implementations/CECCommandHandler.cpp +++ b/src/lib/implementations/CECCommandHandler.cpp @@ -57,8 +57,6 @@ CCECCommandHandler::CCECCommandHandler(CCECBusDevice *busDevice) : CCECCommandHandler::~CCECCommandHandler(void) { - CLockObject lock(m_processor->m_transmitMutex); - CLockObject receiveLock(m_receiveMutex); m_condition.Broadcast(); } @@ -341,6 +339,7 @@ bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command) { device->SetActiveSource(); return device->TransmitPhysicalAddress() && + device->TransmitImageViewOn() && device->TransmitActiveSource(); } } @@ -508,6 +507,7 @@ bool CCECCommandHandler::HandleSetStreamPath(const cec_command &command) if (device && m_busDevice->MyLogicalAddressContains(device->GetLogicalAddress())) { device->SetActiveSource(); + device->TransmitImageViewOn(); device->TransmitActiveSource(); device->SetMenuState(CEC_MENU_STATE_ACTIVATED); @@ -607,6 +607,7 @@ bool CCECCommandHandler::HandleUserControlPressed(const cec_command &command) if (device->MyLogicalAddressContains(device->GetLogicalAddress())) { device->SetActiveSource(); + device->TransmitImageViewOn(); device->TransmitActiveSource(); if (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || @@ -962,8 +963,8 @@ bool CCECCommandHandler::Transmit(cec_command &command, bool bExpectResponse /* CLibCEC::AddLog(CEC_LOG_DEBUG, "command transmitted"); if (bExpectResponse) bReturn = m_condition.Wait(m_receiveMutex, m_bRcvSignal, m_iTransmitWait); - if (bReturn) - m_bRcvSignal = false; + m_bRcvSignal = false; + CLibCEC::AddLog(CEC_LOG_DEBUG, bReturn ? "expected response received" : "expected response not received"); } } }