{
libcec_configuration config;
m_processor->GetPrimaryClient()->GetCurrentConfiguration(config);
- if (config.iDoubleTapTimeoutMs == 0)
+ if (config.iDoubleTapTimeout50Ms == 0)
{
- config.iDoubleTapTimeoutMs = CEC_DOUBLE_TAP_TIMEOUT_MS;
+ config.iDoubleTapTimeout50Ms = config.clientVersion >= CEC_CLIENT_VERSION_2_2_0 ? CEC_DOUBLE_TAP_TIMEOUT_50_MS : CEC_DOUBLE_TAP_TIMEOUT_MS_OLD;
m_processor->GetPrimaryClient()->SetConfiguration(config);
}
command.parameters[2] != 0x45)
return CEC_ABORT_REASON_INVALID_OPERAND;
- // XXX this is also sent when the TV is powered off
-#if 0
if (command.initiator == CECDEVICE_TV &&
command.parameters.At(3) == VL_UNKNOWN1)
{
- // set the power up event time
+ if (command.parameters.size >= 5 && command.parameters.At(4) == 0x05)
{
- CLockObject lock(m_mutex);
- if (m_iPowerUpEventReceived == 0)
- m_iPowerUpEventReceived = GetTimeMs();
+ // set the power up event time
+ {
+ CLockObject lock(m_mutex);
+ if (m_iPowerUpEventReceived == 0)
+ m_iPowerUpEventReceived = GetTimeMs();
+ }
+ // mark the TV as powered on
+ m_processor->GetTV()->SetPowerStatus(CEC_POWER_STATUS_ON);
+
+ CCECBusDevice* dev = m_processor->GetPrimaryDevice();
+ if (dev && dev->IsActiveSource())
+ dev->TransmitActiveSource(false);
+
+ return COMMAND_HANDLED;
}
- // mark the TV as powered on
- m_processor->GetTV()->SetPowerStatus(CEC_POWER_STATUS_ON);
}
- else
-#endif
- if (command.initiator == CECDEVICE_TV &&
+ else if (command.initiator == CECDEVICE_TV &&
command.destination == CECDEVICE_BROADCAST &&
command.parameters.At(3) == VL_POWER_CHANGE)
{
if (command.parameters.size == 3 &&
command.parameters[0] == 0x10 &&
command.parameters[1] == 0x01 &&
- command.parameters[2] == 0x05 &&
m_processor->IsHandledByLibCEC(command.destination))
{
+ // XXX i've seen 0x05 and 0x03 as third param. these probably indicate different types of TVs/capabilities
+ // when we feature abort this, then the TV will try the same thing with a vendor command with id
SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), command.initiator);
+
+ CCECBusDevice* dev = m_processor->GetDevice(command.destination);
+ if (dev && dev->IsActiveSource())
+ dev->ActivateSource(500);
return COMMAND_HANDLED;
}
bool CVLCommandHandler::SourceSwitchAllowed(void)
{
if (!PowerUpEventReceived())
- TransmitRequestPowerStatus(m_processor->GetPrimaryDevice()->GetLogicalAddress(), CECDEVICE_TV, false);
+ TransmitRequestPowerStatus(m_processor->GetPrimaryDevice()->GetLogicalAddress(), CECDEVICE_TV, false, false);
return PowerUpEventReceived();
}