X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FSLCommandHandler.cpp;h=b9103ec5f59da75a037aee61f68a68c9986bde46;hb=b32ffd87ed707124e700477e8b2a10f6132de2c8;hp=c9d51ba297de5e4b7a9e50007756c2487e2034dc;hpb=415e9bad3a53bd27ab64550f741042adeccb68f0;p=deb_libcec.git diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp index c9d51ba..b9103ec 100644 --- a/src/lib/implementations/SLCommandHandler.cpp +++ b/src/lib/implementations/SLCommandHandler.cpp @@ -68,9 +68,8 @@ CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) : primary->ReplaceHandler(false); } - /* LG TVs don't always reply to CEC version requests, so just set it to 1.3a */ - if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV) - m_busDevice->SetCecVersion(CEC_VERSION_1_3A); + /* LG devices don't always reply to CEC version requests, so just set it to 1.3a */ + m_busDevice->SetCecVersion(CEC_VERSION_1_3A); /* LG devices always return "korean" as language */ cec_menu_language lang; @@ -102,21 +101,22 @@ bool CSLCommandHandler::InitHandler(void) bool CSLCommandHandler::ActivateSource(void) { - if (!SLInitialised()) + if (!m_processor->GetPrimaryDevice()->IsActiveSource()) { - CLibCEC::AddLog(CEC_LOG_NOTICE, "not activating the source until SL has been initialised"); + CLibCEC::AddLog(CEC_LOG_NOTICE, "not activating the source because we're not marked as active"); return true; } { CLockObject lock(m_SLMutex); - if (m_bActiveSourceSent) - return true; m_bActiveSourceSent = true; } CCECBusDevice *primary = m_processor->GetPrimaryDevice(); primary->SetActiveSource(); + primary->SetPowerStatus(CEC_POWER_STATUS_ON); + primary->TransmitPowerState(CECDEVICE_TV); + primary->TransmitImageViewOn(); primary->TransmitActiveSource(); return true; } @@ -126,14 +126,22 @@ bool CSLCommandHandler::HandleActiveSource(const cec_command &command) if (command.parameters.size == 2) { uint16_t iAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]); - if (iAddress != m_busDevice->GetPhysicalAddress(false)) + CCECBusDevice *primary = m_processor->GetPrimaryDevice(); + bool bSendPowerOffState(iAddress != primary->GetPhysicalAddress() && primary->IsActiveSource()); + + m_processor->SetActiveSource(iAddress); + if (bSendPowerOffState) { - ResetSLState(); + { + CLockObject lock(m_SLMutex); + m_bActiveSourceSent = false; + } + primary->TransmitPowerState(CECDEVICE_TV); } - return m_processor->SetActiveSource(iAddress); } return true; + } bool CSLCommandHandler::HandleDeviceVendorId(const cec_command &command) @@ -149,18 +157,6 @@ bool CSLCommandHandler::HandleDeviceVendorId(const cec_command &command) return true; } -bool CSLCommandHandler::HandleGivePhysicalAddress(const cec_command &command) -{ - if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination)) - { - CCECBusDevice *device = GetDevice(command.destination); - if (device) - return device->TransmitPhysicalAddress(); // only the physical address, don't send image view on - } - - return false; -} - bool CSLCommandHandler::HandleVendorCommand(const cec_command &command) { if (!m_busDevice->MyLogicalAddressContains(command.destination)) @@ -207,7 +203,7 @@ void CSLCommandHandler::TransmitVendorCommand0205(const cec_logical_address iSou response.PushBack(SL_COMMAND_UNKNOWN_02); response.PushBack(SL_COMMAND_TYPE_HDDRECORDER); - Transmit(response, false); + Transmit(response); } void CSLCommandHandler::HandleVendorCommandPowerOn(const cec_command &command) @@ -219,13 +215,18 @@ void CSLCommandHandler::HandleVendorCommandPowerOn(const cec_command &command) if (device) { SetSLInitialised(); - - device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); //XXX + device->SetActiveSource(); + device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); device->TransmitPowerState(command.initiator); - device->SetPowerStatus(CEC_POWER_STATUS_ON); - device->SetActiveSource(); - TransmitImageViewOn(device->GetLogicalAddress(), command.initiator); + CEvent::Sleep(2000); + device->SetPowerStatus(CEC_POWER_STATUS_ON); + device->TransmitPowerState(command.initiator); + device->TransmitPhysicalAddress(); + { + CLockObject lock(m_SLMutex); + m_bActiveSourceSent = false; + } } } void CSLCommandHandler::HandleVendorCommandPowerOnStatus(const cec_command &command) @@ -253,7 +254,7 @@ void CSLCommandHandler::TransmitVendorCommandSetDeviceMode(const cec_logical_add cec_command::Format(response, iSource, iDestination, CEC_OPCODE_VENDOR_COMMAND); response.PushBack(SL_COMMAND_SET_DEVICE_MODE); response.PushBack((uint8_t)type); - Transmit(response, false); + Transmit(response); } bool CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command) @@ -265,16 +266,16 @@ bool CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command) { if (command.parameters.size > 0) { + ((CCECPlaybackDevice *) device)->SetDeckStatus(!device->IsActiveSource() ? CEC_DECK_INFO_OTHER_STATUS : CEC_DECK_INFO_OTHER_STATUS_LG); if (command.parameters[0] == CEC_STATUS_REQUEST_ON) { - ((CCECPlaybackDevice *) device)->SetDeckStatus(CEC_DECK_INFO_STOP); - return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator) && - device->TransmitImageViewOn() && - device->TransmitPhysicalAddress(); + bool bReturn = ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator); + if (!ActiveSourceSent()) + ActivateSource(); + return bReturn; } else if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE) { - ((CCECPlaybackDevice *) device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG); return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator); } } @@ -307,7 +308,7 @@ bool CSLCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command) else if (m_resetPowerState.IsSet() && m_resetPowerState.TimeLeft() > 0) { /* TODO assume that we've bugged out. the return button no longer works after this */ - CLibCEC::AddLog(CEC_LOG_NOTICE, "LG seems to have bugged out. resetting to 'in transition standby to on'"); + CLibCEC::AddLog(CEC_LOG_WARNING, "FIXME: LG seems to have bugged out. resetting to 'in transition standby to on'. the return button will not work"); { CLockObject lock(m_SLMutex); m_bActiveSourceSent = false; @@ -332,7 +333,10 @@ bool CSLCommandHandler::HandleRequestActiveSource(const cec_command &command) { if (m_processor->IsRunning()) { - CLibCEC::AddLog(CEC_LOG_DEBUG, ">> %i requests active source, ignored", (uint8_t) command.initiator); + if (ActiveSourceSent()) + CLibCEC::AddLog(CEC_LOG_DEBUG, ">> %i requests active source, ignored", (uint8_t) command.initiator); + else + ActivateSource(); return true; } return false; @@ -353,7 +357,10 @@ bool CSLCommandHandler::HandleFeatureAbort(const cec_command &command) bool CSLCommandHandler::HandleStandby(const cec_command &command) { if (command.initiator == CECDEVICE_TV) - ResetSLState(); + { + CLockObject lock(m_SLMutex); + m_bActiveSourceSent = false; + } return CCECCommandHandler::HandleStandby(command); } @@ -390,7 +397,12 @@ bool CSLCommandHandler::PowerOn(const cec_logical_address iInitiator, const cec_ { if (iDestination != CECDEVICE_TV) { + /* LG devices only allow themselves to be woken up by the TV with a vendor command */ cec_command command; + + if (!m_bSLEnabled) + TransmitVendorID(CECDEVICE_TV, CEC_VENDOR_LG); + cec_command::Format(command, CECDEVICE_TV, iDestination, CEC_OPCODE_VENDOR_COMMAND); command.PushBack(SL_COMMAND_POWER_ON); command.PushBack(0);