X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FCECCommandHandler.cpp;h=eed60878d8231244346e80756ef45f39081f9d5d;hb=e35aa7baab13fbfafe20e1c6d9242d2f95c2ba8c;hp=8c1895894253e0d5e2210da3d9b1e78bf5797205;hpb=94e9a2afff9e6bfc18fa401fc9824432475a5927;p=deb_libcec.git diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp index 8c18958..eed6087 100644 --- a/src/lib/implementations/CECCommandHandler.cpp +++ b/src/lib/implementations/CECCommandHandler.cpp @@ -48,22 +48,22 @@ CCECCommandHandler::CCECCommandHandler(CCECBusDevice *busDevice) : m_iTransmitWait(CEC_DEFAULT_TRANSMIT_WAIT), m_iTransmitRetries(CEC_DEFAULT_TRANSMIT_RETRIES), m_bHandlerInited(false), - m_expectedResponse(CEC_OPCODE_NONE), m_bOPTSendDeckStatusUpdateOnActiveSource(false), m_vendorId(CEC_VENDOR_UNKNOWN), - m_bRcvSignal(false) + m_waitForResponse(new CWaitForResponse) { } CCECCommandHandler::~CCECCommandHandler(void) { - CLockObject lock(m_processor->m_transmitMutex); - CLockObject receiveLock(m_receiveMutex); - m_condition.Broadcast(); + delete m_waitForResponse; } bool CCECCommandHandler::HandleCommand(const cec_command &command) { + if (command.opcode_set == 0) + return HandlePoll(command); + bool bHandled(true); CLibCEC::AddCommand(command); @@ -83,6 +83,10 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command) if (m_processor->IsInitialised()) HandleGivePhysicalAddress(command); break; + case CEC_OPCODE_GET_MENU_LANGUAGE: + if (m_processor->IsInitialised()) + HandleGiveMenuLanguage(command); + break; case CEC_OPCODE_GIVE_OSD_NAME: if (m_processor->IsInitialised()) HandleGiveOSDName(command); @@ -190,15 +194,7 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command) } if (bHandled) - { - CLockObject lock(m_receiveMutex); - if (m_expectedResponse == CEC_OPCODE_NONE || - m_expectedResponse == command.opcode) - { - m_bRcvSignal = true; - m_condition.Signal(); - } - } + m_waitForResponse->Received((command.opcode == CEC_OPCODE_FEATURE_ABORT && command.parameters.size > 0) ? (cec_opcode)command.parameters[0] : command.opcode); return bHandled; } @@ -253,10 +249,10 @@ bool CCECCommandHandler::HandleDeviceVendorId(const cec_command &command) bool CCECCommandHandler::HandleFeatureAbort(const cec_command &command) { - if (command.parameters.size == 2) - { + if (command.parameters.size == 2 && + (command.parameters[1] == CEC_ABORT_REASON_UNRECOGNIZED_OPCODE || + command.parameters[1] == CEC_ABORT_REASON_REFUSED)) m_processor->m_busDevices[command.initiator]->SetUnsupportedFeature((cec_opcode)command.parameters[0]); - } return true; } @@ -341,6 +337,7 @@ bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command) { device->SetActiveSource(); return device->TransmitPhysicalAddress() && + device->TransmitImageViewOn() && device->TransmitActiveSource(); } } @@ -348,6 +345,18 @@ bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command) return false; } +bool CCECCommandHandler::HandleGiveMenuLanguage(const cec_command &command) +{ + if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination)) + { + CCECBusDevice *device = GetDevice(command.destination); + if (device) + return device->TransmitSetMenuLanguage(command.initiator); + } + + return false; +} + bool CCECCommandHandler::HandleGiveSystemAudioModeStatus(const cec_command &command) { if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination)) @@ -381,6 +390,12 @@ bool CCECCommandHandler::HandleMenuRequest(const cec_command &command) return false; } +bool CCECCommandHandler::HandlePoll(const cec_command &command) +{ + m_busDevice->HandlePoll(command.destination); + return true; +} + bool CCECCommandHandler::HandleReportAudioStatus(const cec_command &command) { if (command.parameters.size == 1) @@ -508,6 +523,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); @@ -591,36 +607,49 @@ bool CCECCommandHandler::HandleTextViewOn(const cec_command &command) bool CCECCommandHandler::HandleUserControlPressed(const cec_command &command) { - if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination) && command.parameters.size > 0) + if (m_processor->IsRunning() && + m_busDevice->MyLogicalAddressContains(command.destination) && + command.parameters.size > 0) { CLibCEC::AddKey(); - if (command.parameters[0] <= CEC_USER_CONTROL_CODE_MAX) + CLibCEC::SetCurrentButton((cec_user_control_code) command.parameters[0]); + + if (command.parameters[0] == CEC_USER_CONTROL_CODE_POWER || + command.parameters[0] == CEC_USER_CONTROL_CODE_POWER_ON_FUNCTION) { - if (command.parameters[0] == CEC_USER_CONTROL_CODE_POWER || - command.parameters[0] == CEC_USER_CONTROL_CODE_POWER_ON_FUNCTION) + bool bPowerOn(true); + CCECBusDevice *device = GetDevice(command.destination); + if (!device) + return true; + + // CEC_USER_CONTROL_CODE_POWER operates as a toggle + // assume CEC_USER_CONTROL_CODE_POWER_ON_FUNCTION does not + if (command.parameters[0] == CEC_USER_CONTROL_CODE_POWER) { - CCECBusDevice *device = GetDevice(command.destination); - if (device) - { - device->SetPowerStatus(CEC_POWER_STATUS_ON); - if (device->MyLogicalAddressContains(device->GetLogicalAddress())) - { - device->SetActiveSource(); - device->TransmitActiveSource(); - - if (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || - device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE) - ((CCECPlaybackDevice *)device)->TransmitDeckStatus(command.initiator); - } - } + cec_power_status status = device->GetPowerStatus(); + bPowerOn = !(status == CEC_POWER_STATUS_ON || status == CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); + } + + if (bPowerOn) + { + device->SetActiveSource(); + device->TransmitImageViewOn(); + device->TransmitActiveSource(); + + if (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || + device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE) + ((CCECPlaybackDevice *)device)->TransmitDeckStatus(command.initiator); } else { - CLibCEC::SetCurrentButton((cec_user_control_code) command.parameters[0]); + device->SetInactiveSource(); + device->TransmitInactiveSource(); + device->SetMenuState(CEC_MENU_STATE_DEACTIVATED); } - return true; } + + return true; } return false; } @@ -715,6 +744,15 @@ void CCECCommandHandler::SetPhysicalAddress(cec_logical_address iAddress, uint16 } } +bool CCECCommandHandler::PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination) +{ + if (iDestination == CECDEVICE_TV) + return TransmitImageViewOn(iInitiator, iDestination); + + return TransmitKeypress(iInitiator, iDestination, CEC_USER_CONTROL_CODE_POWER) && + TransmitKeyRelease(iInitiator, iDestination); +} + bool CCECCommandHandler::TransmitImageViewOn(const cec_logical_address iInitiator, const cec_logical_address iDestination) { cec_command command; @@ -731,52 +769,52 @@ bool CCECCommandHandler::TransmitStandby(const cec_logical_address iInitiator, c return Transmit(command, false); } -bool CCECCommandHandler::TransmitRequestCecVersion(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::TransmitRequestCecVersion(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse /* = true */) { cec_command command; cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GET_CEC_VERSION); - return Transmit(command, true, CEC_OPCODE_CEC_VERSION); + return Transmit(command, bWaitForResponse, CEC_OPCODE_CEC_VERSION); } -bool CCECCommandHandler::TransmitRequestMenuLanguage(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::TransmitRequestMenuLanguage(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse /* = true */) { cec_command command; cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GET_MENU_LANGUAGE); - return Transmit(command, true, CEC_OPCODE_SET_MENU_LANGUAGE); + return Transmit(command, bWaitForResponse, CEC_OPCODE_SET_MENU_LANGUAGE); } -bool CCECCommandHandler::TransmitRequestOSDName(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::TransmitRequestOSDName(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse /* = true */) { cec_command command; cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_OSD_NAME); - return Transmit(command, true, CEC_OPCODE_SET_OSD_NAME); + return Transmit(command, bWaitForResponse, CEC_OPCODE_SET_OSD_NAME); } -bool CCECCommandHandler::TransmitRequestPhysicalAddress(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::TransmitRequestPhysicalAddress(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse /* = true */) { cec_command command; cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_PHYSICAL_ADDRESS); - return Transmit(command, true, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS); + return Transmit(command, bWaitForResponse, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS); } -bool CCECCommandHandler::TransmitRequestPowerStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::TransmitRequestPowerStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse /* = true */) { cec_command command; cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS); - return Transmit(command, true, CEC_OPCODE_REPORT_POWER_STATUS); + return Transmit(command, bWaitForResponse, CEC_OPCODE_REPORT_POWER_STATUS); } -bool CCECCommandHandler::TransmitRequestVendorId(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::TransmitRequestVendorId(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse /* = true */) { cec_command command; cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID); - return Transmit(command, true, CEC_OPCODE_DEVICE_VENDOR_ID); + return Transmit(command, bWaitForResponse, CEC_OPCODE_DEVICE_VENDOR_ID); } bool CCECCommandHandler::TransmitActiveSource(const cec_logical_address iInitiator, uint16_t iPhysicalAddress) @@ -853,6 +891,17 @@ bool CCECCommandHandler::TransmitPhysicalAddress(const cec_logical_address iInit return Transmit(command, false); } +bool CCECCommandHandler::TransmitSetMenuLanguage(const cec_logical_address iInitiator, const char lang[3]) +{ + cec_command command; + command.Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_SET_MENU_LANGUAGE); + command.parameters.PushBack((uint8_t) lang[0]); + command.parameters.PushBack((uint8_t) lang[1]); + command.parameters.PushBack((uint8_t) lang[2]); + + return Transmit(command, false); +} + bool CCECCommandHandler::TransmitPoll(const cec_logical_address iInitiator, const cec_logical_address iDestination) { cec_command command; @@ -950,20 +999,24 @@ bool CCECCommandHandler::Transmit(cec_command &command, bool bExpectResponse /* bool bReturn(false); command.transmit_timeout = m_iTransmitTimeout; + if (command.initiator == CECDEVICE_UNKNOWN) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "not transmitting a command without a valid initiator"); + return bReturn; + } + { uint8_t iTries(0), iMaxTries(command.opcode == CEC_OPCODE_NONE ? 1 : m_iTransmitRetries + 1); - CLockObject writeLock(m_processor->m_transmitMutex); - CLockObject receiveLock(m_receiveMutex); while (!bReturn && ++iTries <= iMaxTries) { - m_expectedResponse = expectedResponse; if ((bReturn = m_processor->Transmit(command)) == true) { CLibCEC::AddLog(CEC_LOG_DEBUG, "command transmitted"); if (bExpectResponse) - bReturn = m_condition.Wait(m_receiveMutex, m_bRcvSignal, m_iTransmitWait); - m_bRcvSignal = false; - CLibCEC::AddLog(CEC_LOG_DEBUG, bReturn ? "expected response received" : "expected response not received"); + { + bReturn = m_waitForResponse->Wait(expectedResponse); + CLibCEC::AddLog(CEC_LOG_DEBUG, bReturn ? "expected response received (%X: %s)" : "expected response not received (%X: %s)", (int)expectedResponse, m_processor->ToString(expectedResponse)); + } } } } @@ -973,18 +1026,20 @@ bool CCECCommandHandler::Transmit(cec_command &command, bool bExpectResponse /* bool CCECCommandHandler::ActivateSource(void) { - if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV) + if (m_busDevice->IsActiveSource() && + m_busDevice->GetStatus(false) == CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC) { - CCECBusDevice *primary = m_processor->GetPrimaryDevice(); - primary->SetPowerStatus(CEC_POWER_STATUS_ON); - primary->SetMenuState(CEC_MENU_STATE_ACTIVATED); - - if (m_processor->GetPrimaryDevice()->GetPhysicalAddress(false) != 0xffff) - { - m_processor->SetActiveSource(); - primary->TransmitMenuState(m_busDevice->GetLogicalAddress()); - m_bHandlerInited = true; - } + m_busDevice->SetPowerStatus(CEC_POWER_STATUS_ON); + m_busDevice->SetMenuState(CEC_MENU_STATE_ACTIVATED); + + m_busDevice->TransmitImageViewOn(); + m_busDevice->TransmitActiveSource(); + m_busDevice->TransmitMenuState(CECDEVICE_TV); + if ((m_busDevice->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || + m_busDevice->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE) && + SendDeckStatusUpdateOnActiveSource()) + ((CCECPlaybackDevice *)m_busDevice)->TransmitDeckStatus(CECDEVICE_TV); + m_bHandlerInited = true; } return true; }