X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FCECCommandHandler.cpp;h=f35dd329373a9adda70ae80b7194ef834c1f957f;hb=f5aa7e4ce43db8b8e9d6d494176261da768e6427;hp=47a0b0ec0fe5a4ed5d35fc27d79ac1ab19e840cf;hpb=7f9191154db80ab386da77ef6706961d9fbc8b97;p=deb_libcec.git diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp index 47a0b0e..f35dd32 100644 --- a/src/lib/implementations/CECCommandHandler.cpp +++ b/src/lib/implementations/CECCommandHandler.cpp @@ -1,7 +1,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -34,32 +34,45 @@ #include "../devices/CECBusDevice.h" #include "../devices/CECAudioSystem.h" #include "../devices/CECPlaybackDevice.h" +#include "../CECClient.h" #include "../CECProcessor.h" +#include "../LibCEC.h" using namespace CEC; using namespace std; +using namespace PLATFORM; + +#define LIB_CEC m_busDevice->GetProcessor()->GetLib() +#define ToString(p) LIB_CEC->ToString(p) CCECCommandHandler::CCECCommandHandler(CCECBusDevice *busDevice) : m_busDevice(busDevice), m_processor(m_busDevice->GetProcessor()), - m_iTransmitTimeout(1000) + m_iTransmitTimeout(CEC_DEFAULT_TRANSMIT_TIMEOUT), + m_iTransmitWait(CEC_DEFAULT_TRANSMIT_WAIT), + m_iTransmitRetries(CEC_DEFAULT_TRANSMIT_RETRIES), + m_bHandlerInited(false), + m_bOPTSendDeckStatusUpdateOnActiveSource(false), + m_vendorId(CEC_VENDOR_UNKNOWN), + m_waitForResponse(new CWaitForResponse) { } CCECCommandHandler::~CCECCommandHandler(void) { - m_condition.Broadcast(); + delete m_waitForResponse; } bool CCECCommandHandler::HandleCommand(const cec_command &command) { - bool bHandled(true), bHandlerChanged(false); + if (command.opcode_set == 0) + return HandlePoll(command); - CStdString strLog; - strLog.Format(">> %s (%X) -> %s (%X): %s (%2X)", m_processor->ToString(command.initiator), command.initiator, m_processor->ToString(command.destination), command.destination, m_processor->ToString(command.opcode), command.opcode); - m_busDevice->AddLog(CEC_LOG_NOTICE, strLog); + bool bHandled(true); - m_processor->AddCommand(command); + CCECClient *client = m_busDevice->GetClient(); + if (client) + client->AddCommand(command); switch(command.opcode) { @@ -73,49 +86,65 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command) HandleSetMenuLanguage(command); break; case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS: - HandleGivePhysicalAddress(command); + if (m_processor->CECInitialised()) + HandleGivePhysicalAddress(command); + break; + case CEC_OPCODE_GET_MENU_LANGUAGE: + if (m_processor->CECInitialised()) + HandleGiveMenuLanguage(command); break; case CEC_OPCODE_GIVE_OSD_NAME: - HandleGiveOSDName(command); + if (m_processor->CECInitialised()) + HandleGiveOSDName(command); break; case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID: - HandleGiveDeviceVendorId(command); + if (m_processor->CECInitialised()) + HandleGiveDeviceVendorId(command); break; case CEC_OPCODE_DEVICE_VENDOR_ID: - bHandlerChanged = HandleDeviceVendorId(command); + HandleDeviceVendorId(command); break; case CEC_OPCODE_VENDOR_COMMAND_WITH_ID: HandleDeviceVendorCommandWithId(command); break; case CEC_OPCODE_GIVE_DECK_STATUS: - HandleGiveDeckStatus(command); + if (m_processor->CECInitialised()) + HandleGiveDeckStatus(command); break; case CEC_OPCODE_DECK_CONTROL: HandleDeckControl(command); break; case CEC_OPCODE_MENU_REQUEST: - HandleMenuRequest(command); + if (m_processor->CECInitialised()) + HandleMenuRequest(command); break; case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS: - HandleGiveDevicePowerStatus(command); + if (m_processor->CECInitialised()) + HandleGiveDevicePowerStatus(command); break; case CEC_OPCODE_GET_CEC_VERSION: - HandleGetCecVersion(command); + if (m_processor->CECInitialised()) + HandleGetCecVersion(command); break; case CEC_OPCODE_USER_CONTROL_PRESSED: - HandleUserControlPressed(command); + if (m_processor->CECInitialised()) + HandleUserControlPressed(command); break; case CEC_OPCODE_USER_CONTROL_RELEASE: - HandleUserControlRelease(command); + if (m_processor->CECInitialised()) + HandleUserControlRelease(command); break; case CEC_OPCODE_GIVE_AUDIO_STATUS: - HandleGiveAudioStatus(command); + if (m_processor->CECInitialised()) + HandleGiveAudioStatus(command); break; case CEC_OPCODE_GIVE_SYSTEM_AUDIO_MODE_STATUS: - HandleGiveSystemAudioModeStatus(command); + if (m_processor->CECInitialised()) + HandleGiveSystemAudioModeStatus(command); break; case CEC_OPCODE_SYSTEM_AUDIO_MODE_REQUEST: - HandleSystemAudioModeRequest(command); + if (m_processor->CECInitialised()) + HandleSystemAudioModeRequest(command); break; case CEC_OPCODE_REPORT_AUDIO_STATUS: HandleReportAudioStatus(command); @@ -127,7 +156,8 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command) HandleSetSystemAudioMode(command); break; case CEC_OPCODE_REQUEST_ACTIVE_SOURCE: - HandleRequestActiveSource(command); + if (m_processor->CECInitialised()) + HandleRequestActiveSource(command); break; case CEC_OPCODE_SET_STREAM_PATH: HandleSetStreamPath(command); @@ -139,7 +169,8 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command) HandleRoutingInformation(command); break; case CEC_OPCODE_STANDBY: - HandleStandby(command); + if (m_processor->CECInitialised()) + HandleStandby(command); break; case CEC_OPCODE_ACTIVE_SOURCE: HandleActiveSource(command); @@ -156,17 +187,21 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command) case CEC_OPCODE_TEXT_VIEW_ON: HandleTextViewOn(command); break; + case CEC_OPCODE_FEATURE_ABORT: + HandleFeatureAbort(command); + break; + case CEC_OPCODE_VENDOR_COMMAND: + HandleVendorCommand(command); + break; default: - UnhandledCommand(command); bHandled = false; break; } - if (bHandled && !bHandlerChanged) - { - CLockObject lock(&m_processor->m_transmitMutex); - m_condition.Signal(); - } + if (bHandled) + m_waitForResponse->Received((command.opcode == CEC_OPCODE_FEATURE_ABORT && command.parameters.size > 0) ? (cec_opcode)command.parameters[0] : command.opcode); + else + UnhandledCommand(command); return bHandled; } @@ -176,7 +211,9 @@ bool CCECCommandHandler::HandleActiveSource(const cec_command &command) if (command.parameters.size == 2) { uint16_t iAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]); - return m_processor->SetStreamPath(iAddress); + CCECBusDevice *device = m_processor->GetDeviceByPhysicalAddress(iAddress); + if (device) + device->MarkAsActiveSource(); } return true; @@ -208,8 +245,8 @@ bool CCECCommandHandler::HandleDeviceCecVersion(const cec_command &command) bool CCECCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) - m_processor->TransmitAbort(command.initiator, command.opcode, CEC_ABORT_REASON_REFUSED); + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) + m_processor->TransmitAbort(command.destination, command.initiator, command.opcode, CEC_ABORT_REASON_REFUSED); return true; } @@ -219,9 +256,18 @@ bool CCECCommandHandler::HandleDeviceVendorId(const cec_command &command) return SetVendorId(command); } +bool CCECCommandHandler::HandleFeatureAbort(const cec_command &command) +{ + if (command.parameters.size == 2 && + (command.parameters[1] == CEC_ABORT_REASON_UNRECOGNIZED_OPCODE || + command.parameters[1] == CEC_ABORT_REASON_REFUSED)) + m_processor->GetDevice(command.initiator)->SetUnsupportedFeature((cec_opcode)command.parameters[0]); + return true; +} + bool CCECCommandHandler::HandleGetCecVersion(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { CCECBusDevice *device = GetDevice(command.destination); if (device) @@ -233,7 +279,7 @@ bool CCECCommandHandler::HandleGetCecVersion(const cec_command &command) bool CCECCommandHandler::HandleGiveAudioStatus(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { CCECBusDevice *device = GetDevice(command.destination); if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM) @@ -245,7 +291,7 @@ bool CCECCommandHandler::HandleGiveAudioStatus(const cec_command &command) bool CCECCommandHandler::HandleGiveDeckStatus(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { CCECBusDevice *device = GetDevice(command.destination); if (device && (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)) @@ -257,7 +303,7 @@ bool CCECCommandHandler::HandleGiveDeckStatus(const cec_command &command) bool CCECCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { CCECBusDevice *device = GetDevice(command.destination); if (device) @@ -269,7 +315,7 @@ bool CCECCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command) bool CCECCommandHandler::HandleGiveDeviceVendorId(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { CCECBusDevice *device = GetDevice(command.destination); if (device) @@ -281,7 +327,7 @@ bool CCECCommandHandler::HandleGiveDeviceVendorId(const cec_command &command) bool CCECCommandHandler::HandleGiveOSDName(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { CCECBusDevice *device = GetDevice(command.destination); if (device) @@ -293,7 +339,7 @@ bool CCECCommandHandler::HandleGiveOSDName(const cec_command &command) bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { CCECBusDevice *device = GetDevice(command.destination); if (device) @@ -303,9 +349,21 @@ bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command) return false; } +bool CCECCommandHandler::HandleGiveMenuLanguage(const cec_command &command) +{ + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(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_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { CCECBusDevice *device = GetDevice(command.destination); if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM) @@ -317,25 +375,44 @@ bool CCECCommandHandler::HandleGiveSystemAudioModeStatus(const cec_command &comm bool CCECCommandHandler::HandleImageViewOn(const cec_command &command) { - m_processor->SetActiveSource(command.initiator); + m_processor->GetDevice(command.initiator)->MarkAsActiveSource(); return true; } bool CCECCommandHandler::HandleMenuRequest(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { - if (command.parameters[0] == CEC_MENU_REQUEST_TYPE_QUERY) + CCECBusDevice *device = GetDevice(command.destination); + if (device) { - CCECBusDevice *device = GetDevice(command.destination); - if (device) - return device->TransmitMenuState(command.initiator); + CCECClient *client = device->GetClient(); + if (client) + { + if (command.parameters[0] == CEC_MENU_REQUEST_TYPE_ACTIVATE) + { + if (client->MenuStateChanged(CEC_MENU_STATE_ACTIVATED) == 1) + device->SetMenuState(CEC_MENU_STATE_ACTIVATED); + } + else if (command.parameters[0] == CEC_MENU_REQUEST_TYPE_DEACTIVATE) + { + if (client->MenuStateChanged(CEC_MENU_STATE_DEACTIVATED) == 1) + device->SetMenuState(CEC_MENU_STATE_DEACTIVATED); + } + } + return device->TransmitMenuState(command.initiator); } } 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) @@ -373,15 +450,18 @@ bool CCECCommandHandler::HandleReportPowerStatus(const cec_command &command) bool CCECCommandHandler::HandleRequestActiveSource(const cec_command &command) { - CStdString strLog; - strLog.Format(">> %i requests active source", (uint8_t) command.initiator); - m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str()); + if (m_processor->IsRunning()) + { + LIB_CEC->AddLog(CEC_LOG_DEBUG, ">> %i requests active source", (uint8_t) command.initiator); + m_processor->GetDevice(command.initiator)->SetPowerStatus(CEC_POWER_STATUS_ON); - vector devices; - for (int iDevicePtr = (int)GetMyDevices(devices)-1; iDevicePtr >=0; iDevicePtr--) - devices[iDevicePtr]->TransmitActiveSource(); + vector devices; + for (size_t iDevicePtr = 0; iDevicePtr < GetMyDevices(devices); iDevicePtr++) + devices[iDevicePtr]->TransmitActiveSource(); - return true; + return true; + } + return false; } bool CCECCommandHandler::HandleRoutingChange(const cec_command &command) @@ -403,7 +483,9 @@ bool CCECCommandHandler::HandleRoutingInformation(const cec_command &command) if (command.parameters.size == 2) { uint16_t iNewAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]); - m_processor->SetStreamPath(iNewAddress); + CCECBusDevice *device = m_processor->GetDeviceByPhysicalAddress(iNewAddress); + if (device) + device->MarkAsActiveSource(); } return false; @@ -451,29 +533,22 @@ bool CCECCommandHandler::HandleSetOSDName(const cec_command &command) bool CCECCommandHandler::HandleSetStreamPath(const cec_command &command) { - if (command.parameters.size >= 2) + if (m_processor->IsRunning() && command.parameters.size >= 2) { uint16_t iStreamAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]); - CStdString strLog; - strLog.Format(">> %i sets stream path to physical address %04x", command.initiator, iStreamAddress); - m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str()); + LIB_CEC->AddLog(CEC_LOG_DEBUG, ">> %i sets stream path to physical address %04x", command.initiator, iStreamAddress); - if (m_processor->SetStreamPath(iStreamAddress)) - { - CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamAddress); - if (device) - { - return device->TransmitActiveSource() && - device->TransmitMenuState(command.initiator); - } - } + /* one of the device handled by libCEC has been made active */ + CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamAddress); + if (device && device->IsHandledByLibCEC()) + device->ActivateSource(); } return false; } bool CCECCommandHandler::HandleSystemAudioModeRequest(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) { CCECBusDevice *device = GetDevice(command.destination); if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM) @@ -485,7 +560,7 @@ bool CCECCommandHandler::HandleSystemAudioModeRequest(const cec_command &command uint16_t iNewAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]); CCECBusDevice *newActiveDevice = GetDeviceByPhysicalAddress(iNewAddress); if (newActiveDevice) - m_processor->SetActiveSource(newActiveDevice->GetLogicalAddress()); + newActiveDevice->MarkAsActiveSource(); return ((CCECAudioSystem *) device)->TransmitSetSystemAudioMode(command.initiator); } else @@ -539,58 +614,86 @@ bool CCECCommandHandler::HandleSetSystemAudioMode(const cec_command &command) bool CCECCommandHandler::HandleTextViewOn(const cec_command &command) { - m_processor->SetActiveSource(command.initiator); + m_processor->GetDevice(command.initiator)->MarkAsActiveSource(); return true; } bool CCECCommandHandler::HandleUserControlPressed(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination) && command.parameters.size > 0) + if (m_processor->IsRunning() && + m_processor->IsHandledByLibCEC(command.destination) && + command.parameters.size > 0) { - m_processor->AddKey(); + CCECBusDevice *device = GetDevice(command.destination); + if (!device) + return true; + + CCECClient *client = device->GetClient(); + if (client) + client->AddKey(); if (command.parameters[0] <= CEC_USER_CONTROL_CODE_MAX) + client->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) { - CStdString strLog; - strLog.Format("key pressed: %x", command.parameters[0]); - m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str()); + bool bPowerOn(true); + if (!device) + return true; - if (command.parameters[0] == CEC_USER_CONTROL_CODE_POWER || - command.parameters[0] == CEC_USER_CONTROL_CODE_POWER_ON_FUNCTION) + // 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); + cec_power_status status = device->GetCurrentPowerStatus(); + bPowerOn = !(status == CEC_POWER_STATUS_ON || status == CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); } - m_processor->SetCurrentButton((cec_user_control_code) command.parameters[0]); - return true; + if (bPowerOn) + { + device->ActivateSource(); + } + else + { + device->MarkAsInactiveSource(); + device->TransmitInactiveSource(); + device->SetMenuState(CEC_MENU_STATE_DEACTIVATED); + } } + + return true; } return false; } bool CCECCommandHandler::HandleUserControlRelease(const cec_command &command) { - if (m_busDevice->MyLogicalAddressContains(command.destination)) - m_processor->AddKey(); + CCECClient *client = m_processor->GetClient(command.destination); + if (client) + client->AddKey(); + return true; +} +bool CCECCommandHandler::HandleVendorCommand(const cec_command & UNUSED(command)) +{ return true; } void CCECCommandHandler::UnhandledCommand(const cec_command &command) { - CStdString strLog; - strLog.Format("unhandled command with opcode %02x from address %d", command.opcode, command.initiator); - m_busDevice->AddLog(CEC_LOG_DEBUG, strLog); + LIB_CEC->AddLog(CEC_LOG_DEBUG, "unhandled command with opcode %02x from address %d", command.opcode, command.initiator); + + if (m_processor->IsRunning() && m_processor->IsHandledByLibCEC(command.destination)) + m_processor->TransmitAbort(m_busDevice->GetLogicalAddress(), command.initiator, command.opcode, CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); } -unsigned int CCECCommandHandler::GetMyDevices(vector &devices) const +size_t CCECCommandHandler::GetMyDevices(vector &devices) const { - unsigned int iReturn(0); + size_t iReturn(0); cec_logical_addresses addresses = m_processor->GetLogicalAddresses(); - for (uint8_t iPtr = 0; iPtr < 16; iPtr++) + for (uint8_t iPtr = CECDEVICE_TV; iPtr < CECDEVICE_BROADCAST; iPtr++) { if (addresses[iPtr]) { @@ -604,12 +707,7 @@ unsigned int CCECCommandHandler::GetMyDevices(vector &devices) CCECBusDevice *CCECCommandHandler::GetDevice(cec_logical_address iLogicalAddress) const { - CCECBusDevice *device = NULL; - - if (iLogicalAddress >= CECDEVICE_TV && iLogicalAddress <= CECDEVICE_BROADCAST) - device = m_processor->m_busDevices[iLogicalAddress]; - - return device; + return m_processor->GetDevice(iLogicalAddress); } CCECBusDevice *CCECCommandHandler::GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress) const @@ -617,17 +715,12 @@ CCECBusDevice *CCECCommandHandler::GetDeviceByPhysicalAddress(uint16_t iPhysical return m_processor->GetDeviceByPhysicalAddress(iPhysicalAddress); } -CCECBusDevice *CCECCommandHandler::GetDeviceByType(cec_device_type type) const -{ - return m_processor->GetDeviceByType(type); -} - bool CCECCommandHandler::SetVendorId(const cec_command &command) { bool bChanged(false); if (command.parameters.size < 3) { - m_busDevice->AddLog(CEC_LOG_WARNING, "invalid vendor ID received"); + LIB_CEC->AddLog(CEC_LOG_WARNING, "invalid vendor ID received"); return bChanged; } @@ -643,37 +736,42 @@ bool CCECCommandHandler::SetVendorId(const cec_command &command) void CCECCommandHandler::SetPhysicalAddress(cec_logical_address iAddress, uint16_t iNewAddress) { - if (!m_busDevice->MyLogicalAddressContains(iAddress)) + if (!m_processor->IsHandledByLibCEC(iAddress)) { - bool bOurAddress(m_processor->GetPhysicalAddress() == iNewAddress); - GetDevice(iAddress)->SetPhysicalAddress(iNewAddress); - if (bOurAddress) + CCECBusDevice *otherDevice = m_processor->GetDeviceByPhysicalAddress(iNewAddress); + CCECClient *client = otherDevice ? otherDevice->GetClient() : NULL; + + CCECBusDevice *device = m_processor->GetDevice(iAddress); + if (device) + device->SetPhysicalAddress(iNewAddress); + else { - /* another device reported the same physical address as ours - * since we don't have physical address detection yet, we'll just use the - * given address, increased by 0x100 for now */ - m_processor->SetPhysicalAddress(iNewAddress + 0x100); + LIB_CEC->AddLog(CEC_LOG_DEBUG, "device with logical address %X not found", iAddress); } + + /* another device reported the same physical address as ours */ + if (client) + client->ResetPhysicalAddress(); + } + else + { + LIB_CEC->AddLog(CEC_LOG_DEBUG, "ignore physical address report for device %s (%X) because it's marked as handled by libCEC", ToString(iAddress), iAddress); } } -void CCECCommandHandler::HandlePoll(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination) { - CStdString strLog; - strLog.Format("<< POLL: %s (%x) -> %s (%x)", m_processor->ToString(iInitiator), iInitiator, m_processor->ToString(iDestination), iDestination); - m_processor->AddLog(CEC_LOG_DEBUG, strLog); -} + if (iDestination == CECDEVICE_TV) + return TransmitImageViewOn(iInitiator, iDestination); -bool CCECCommandHandler::HandleReceiveFailed(void) -{ - /* default = error */ - return true; + return TransmitKeypress(iInitiator, iDestination, CEC_USER_CONTROL_CODE_POWER) && + TransmitKeyRelease(iInitiator, iDestination); } -bool CCECCommandHandler::TransmitPowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::TransmitImageViewOn(const cec_logical_address iInitiator, const cec_logical_address iDestination) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_IMAGE_VIEW_ON, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_IMAGE_VIEW_ON); return Transmit(command); } @@ -681,63 +779,71 @@ bool CCECCommandHandler::TransmitPowerOn(const cec_logical_address iInitiator, c bool CCECCommandHandler::TransmitStandby(const cec_logical_address iInitiator, const cec_logical_address iDestination) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_STANDBY, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_STANDBY); return Transmit(command); } -bool CCECCommandHandler::TransmitRequestCecVersion(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::TransmitRequestActiveSource(const cec_logical_address iInitiator, bool bWaitForResponse /* = true */) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GET_CEC_VERSION, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_REQUEST_ACTIVE_SOURCE); - return Transmit(command); + return Transmit(command, !bWaitForResponse); } -bool CCECCommandHandler::TransmitRequestMenuLanguage(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_MENU_LANGUAGE, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GET_CEC_VERSION); - return Transmit(command); + return Transmit(command, !bWaitForResponse); } -bool CCECCommandHandler::TransmitRequestOSDName(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_GIVE_OSD_NAME, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GET_MENU_LANGUAGE); - return Transmit(command); + return Transmit(command, !bWaitForResponse); } -bool CCECCommandHandler::TransmitRequestPhysicalAddress(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_PHYSICAL_ADDRESS, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_OSD_NAME); - return Transmit(command); + return Transmit(command, !bWaitForResponse); } -bool CCECCommandHandler::TransmitRequestPowerStatus(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_DEVICE_POWER_STATUS, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_PHYSICAL_ADDRESS); - return Transmit(command); + return Transmit(command, !bWaitForResponse); } -bool CCECCommandHandler::TransmitRequestVendorId(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_VENDOR_ID, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS); - return Transmit(command); + return Transmit(command, !bWaitForResponse); +} + +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, !bWaitForResponse); } bool CCECCommandHandler::TransmitActiveSource(const cec_logical_address iInitiator, uint16_t iPhysicalAddress) { cec_command command; - cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE); command.parameters.PushBack((uint8_t) ((iPhysicalAddress >> 8) & 0xFF)); command.parameters.PushBack((uint8_t) (iPhysicalAddress & 0xFF)); @@ -747,7 +853,7 @@ bool CCECCommandHandler::TransmitActiveSource(const cec_logical_address iInitiat bool CCECCommandHandler::TransmitCECVersion(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_version cecVersion) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_CEC_VERSION, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_CEC_VERSION); command.parameters.PushBack((uint8_t)cecVersion); return Transmit(command); @@ -756,7 +862,7 @@ bool CCECCommandHandler::TransmitCECVersion(const cec_logical_address iInitiator bool CCECCommandHandler::TransmitInactiveSource(const cec_logical_address iInitiator, uint16_t iPhysicalAddress) { cec_command command; - cec_command::Format(command, iInitiator, CECDEVICE_TV, CEC_OPCODE_INACTIVE_SOURCE, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, CECDEVICE_TV, CEC_OPCODE_INACTIVE_SOURCE); command.parameters.PushBack((iPhysicalAddress >> 8) & 0xFF); command.parameters.PushBack(iPhysicalAddress & 0xFF); @@ -766,7 +872,7 @@ bool CCECCommandHandler::TransmitInactiveSource(const cec_logical_address iIniti bool CCECCommandHandler::TransmitMenuState(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_menu_state menuState) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_MENU_STATUS, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_MENU_STATUS); command.parameters.PushBack((uint8_t)menuState); return Transmit(command); @@ -775,8 +881,8 @@ bool CCECCommandHandler::TransmitMenuState(const cec_logical_address iInitiator, bool CCECCommandHandler::TransmitOSDName(const cec_logical_address iInitiator, const cec_logical_address iDestination, CStdString strDeviceName) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SET_OSD_NAME, m_iTransmitTimeout); - for (unsigned int iPtr = 0; iPtr < strDeviceName.length(); iPtr++) + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SET_OSD_NAME); + for (size_t iPtr = 0; iPtr < strDeviceName.length(); iPtr++) command.parameters.PushBack(strDeviceName.at(iPtr)); return Transmit(command); @@ -785,13 +891,13 @@ bool CCECCommandHandler::TransmitOSDName(const cec_logical_address iInitiator, c bool CCECCommandHandler::TransmitOSDString(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_display_control duration, const char *strMessage) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SET_OSD_STRING, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SET_OSD_STRING); command.parameters.PushBack((uint8_t)duration); - unsigned int iLen = strlen(strMessage); + size_t iLen = strlen(strMessage); if (iLen > 13) iLen = 13; - for (unsigned int iPtr = 0; iPtr < iLen; iPtr++) + for (size_t iPtr = 0; iPtr < iLen; iPtr++) command.parameters.PushBack(strMessage[iPtr]); return Transmit(command); @@ -800,7 +906,7 @@ bool CCECCommandHandler::TransmitOSDString(const cec_logical_address iInitiator, bool CCECCommandHandler::TransmitPhysicalAddress(const cec_logical_address iInitiator, uint16_t iPhysicalAddress, cec_device_type type) { cec_command command; - cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS); command.parameters.PushBack((uint8_t) ((iPhysicalAddress >> 8) & 0xFF)); command.parameters.PushBack((uint8_t) (iPhysicalAddress & 0xFF)); command.parameters.PushBack((uint8_t) (type)); @@ -808,11 +914,21 @@ bool CCECCommandHandler::TransmitPhysicalAddress(const cec_logical_address iInit return Transmit(command); } +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); +} + bool CCECCommandHandler::TransmitPoll(const cec_logical_address iInitiator, const cec_logical_address iDestination) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_NONE, m_iTransmitTimeout); - command.retries = 0; + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_NONE); return Transmit(command); } @@ -820,7 +936,7 @@ bool CCECCommandHandler::TransmitPoll(const cec_logical_address iInitiator, cons bool CCECCommandHandler::TransmitPowerState(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_power_status state) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_REPORT_POWER_STATUS, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_REPORT_POWER_STATUS); command.parameters.PushBack((uint8_t) state); return Transmit(command); @@ -829,7 +945,7 @@ bool CCECCommandHandler::TransmitPowerState(const cec_logical_address iInitiator bool CCECCommandHandler::TransmitVendorID(const cec_logical_address iInitiator, uint64_t iVendorId) { cec_command command; - cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_DEVICE_VENDOR_ID, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_DEVICE_VENDOR_ID); command.parameters.PushBack((uint8_t) (((uint64_t)iVendorId >> 16) & 0xFF)); command.parameters.PushBack((uint8_t) (((uint64_t)iVendorId >> 8) & 0xFF)); @@ -841,7 +957,7 @@ bool CCECCommandHandler::TransmitVendorID(const cec_logical_address iInitiator, bool CCECCommandHandler::TransmitAudioStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, uint8_t state) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_REPORT_AUDIO_STATUS, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_REPORT_AUDIO_STATUS); command.parameters.PushBack(state); return Transmit(command); @@ -850,16 +966,26 @@ bool CCECCommandHandler::TransmitAudioStatus(const cec_logical_address iInitiato bool CCECCommandHandler::TransmitSetSystemAudioMode(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_system_audio_status state) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SET_SYSTEM_AUDIO_MODE, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SET_SYSTEM_AUDIO_MODE); command.parameters.PushBack((uint8_t)state); return Transmit(command); } +bool CCECCommandHandler::TransmitSetStreamPath(uint16_t iStreamPath) +{ + cec_command command; + cec_command::Format(command, m_busDevice->GetLogicalAddress(), CECDEVICE_BROADCAST, CEC_OPCODE_SET_STREAM_PATH); + command.parameters.PushBack((uint8_t) ((iStreamPath >> 8) & 0xFF)); + command.parameters.PushBack((uint8_t) (iStreamPath & 0xFF)); + + return Transmit(command); +} + bool CCECCommandHandler::TransmitSystemAudioModeStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_system_audio_status state) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SYSTEM_AUDIO_MODE_STATUS, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SYSTEM_AUDIO_MODE_STATUS); command.parameters.PushBack((uint8_t)state); return Transmit(command); @@ -868,34 +994,82 @@ bool CCECCommandHandler::TransmitSystemAudioModeStatus(const cec_logical_address bool CCECCommandHandler::TransmitDeckStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_deck_info state) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_DECK_STATUS, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_DECK_STATUS); command.PushBack((uint8_t)state); return Transmit(command); } -bool CCECCommandHandler::TransmitKeypress(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_user_control_code key) +bool CCECCommandHandler::TransmitKeypress(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_USER_CONTROL_PRESSED, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_USER_CONTROL_PRESSED); command.parameters.PushBack((uint8_t)key); - return Transmit(command); + return Transmit(command, !bWait); } -bool CCECCommandHandler::TransmitKeyRelease(const cec_logical_address iInitiator, const cec_logical_address iDestination) +bool CCECCommandHandler::TransmitKeyRelease(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWait /* = true */) { cec_command command; - cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_USER_CONTROL_RELEASE, m_iTransmitTimeout); + cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_USER_CONTROL_RELEASE); - return Transmit(command); + return Transmit(command, !bWait); } -bool CCECCommandHandler::Transmit(cec_command &command) +bool CCECCommandHandler::Transmit(cec_command &command, bool bSuppressWait /* = false */) { - CLockObject writeLock(&m_processor->m_transmitMutex); - if (m_processor->Transmit(command)) - return m_condition.Wait(&m_processor->m_transmitMutex, m_iTransmitTimeout); + bool bReturn(false); + cec_opcode expectedResponse(cec_command::GetResponseOpcode(command.opcode)); + bool bExpectResponse(expectedResponse != CEC_OPCODE_NONE && !bSuppressWait); + command.transmit_timeout = m_iTransmitTimeout; - return false; + if (command.initiator == CECDEVICE_UNKNOWN) + { + LIB_CEC->AddLog(CEC_LOG_ERROR, "not transmitting a command without a valid initiator"); + return bReturn; + } + + { + uint8_t iTries(0), iMaxTries(!command.opcode_set ? 1 : m_iTransmitRetries + 1); + while (!bReturn && ++iTries <= iMaxTries && !m_busDevice->IsUnsupportedFeature(command.opcode)) + { + if ((bReturn = m_processor->Transmit(command)) == true) + { + LIB_CEC->AddLog(CEC_LOG_DEBUG, "command transmitted"); + if (bExpectResponse) + { + bReturn = m_waitForResponse->Wait(expectedResponse); + LIB_CEC->AddLog(CEC_LOG_DEBUG, bReturn ? "expected response received (%X: %s)" : "expected response not received (%X: %s)", (int)expectedResponse, ToString(expectedResponse)); + } + } + } + } + + return bReturn; +} + +bool CCECCommandHandler::ActivateSource(void) +{ + if (m_busDevice->IsActiveSource() && + m_busDevice->IsHandledByLibCEC()) + { + 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; +} + +void CCECCommandHandler::SignalOpcode(cec_opcode opcode) +{ + m_waitForResponse->Received(opcode); }