m_bPowerUpEventReceived(false)
{
m_vendorId = CEC_VENDOR_PANASONIC;
-
- /* use the VL commandhandler for the primary device that is handled by libCEC */
- if (busDevice->GetLogicalAddress() == CECDEVICE_TV)
- {
- CCECBusDevice *primary = m_processor->GetPrimaryDevice();
- if (primary && m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
- {
- primary->SetVendorId(CEC_VENDOR_PANASONIC);
- primary->ReplaceHandler(false);
- }
- }
}
bool CVLCommandHandler::InitHandler(void)
{
CCECBusDevice *primary = m_processor->GetPrimaryDevice();
- if (primary->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
- return m_processor->GetPrimaryClient()->ChangeDeviceType(CEC_DEVICE_TYPE_RECORDING_DEVICE, CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+ if (primary && primary->GetLogicalAddress() != CECDEVICE_UNREGISTERED)
+ {
+ /* use the VL commandhandler for the primary device that is handled by libCEC */
+ if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
+ {
+ if (primary && m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
+ {
+ primary->SetVendorId(CEC_VENDOR_PANASONIC);
+ primary->ReplaceHandler(false);
+ }
+ }
+
+ if (primary->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
+ return m_processor->GetPrimaryClient()->ChangeDeviceType(CEC_DEVICE_TYPE_RECORDING_DEVICE, CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+ }
return CCECCommandHandler::InitHandler();
}
-bool CVLCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command)
+int CVLCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command)
{
if (command.initiator == CECDEVICE_TV &&
command.destination == CECDEVICE_BROADCAST &&
else if (command.parameters.At(4) == VL_POWERED_DOWN)
LIB_CEC->AddLog(CEC_LOG_DEBUG, "unknown vendor command");
- return true;
+ return COMMAND_HANDLED;
}
return CCECCommandHandler::HandleDeviceVendorCommandWithId(command);
{
CVLCommandHandler *handler = static_cast<CVLCommandHandler *>(tv->GetHandler());
bPowerUpEventReceived = handler ? handler->PowerUpEventReceived() : false;
+ tv->MarkHandlerReady();
}
if (!bPowerUpEventReceived)
if (bTransmitCommand)
{
LIB_CEC->AddLog(CEC_LOG_DEBUG, "transmitting delayed activate source command");
- return CCECCommandHandler::TransmitActiveSource(m_busDevice->GetLogicalAddress(), m_busDevice->GetCurrentPhysicalAddress());
+ return CCECCommandHandler::TransmitActiveSource(m_busDevice->GetLogicalAddress(), m_busDevice->GetCurrentPhysicalAddress()) &&
+ TransmitMenuState(m_busDevice->GetLogicalAddress(), CECDEVICE_TV, CEC_MENU_STATE_ACTIVATED);
}
return true;
}
return true;
}
- cec_power_status powerStatus = m_busDevice->GetCurrentPowerStatus();
+ cec_logical_address sourceLA = m_busDevice->GetLogicalAddress();
+ if (sourceLA == CECDEVICE_TV)
+ sourceLA = m_processor->GetPrimaryDevice()->GetLogicalAddress();
+
+ cec_power_status powerStatus = m_busDevice->GetPowerStatus(sourceLA);
CLockObject lock(m_mutex);
m_bPowerUpEventReceived = (powerStatus == CEC_POWER_STATUS_ON);