/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
{
if (primary && m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
{
+ libcec_configuration config;
+ m_processor->GetPrimaryClient()->GetCurrentConfiguration(config);
+ if (config.iDoubleTapTimeout50Ms == 0)
+ {
+ 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);
+ }
+
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);
+ 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();
int CVLCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command)
{
+ if (!m_processor->IsHandledByLibCEC(command.destination))
+ return CEC_ABORT_REASON_INVALID_OPERAND;
+
if (command.parameters[0] != 0x00 ||
command.parameters[1] != 0x80 ||
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)
{
// send capabilties
SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), command.initiator);
+
+ // reactivate the source, so the tv switches channels
+ if (m_processor->IsActiveSource(m_processor->GetLogicalAddress()))
+ m_processor->GetDevice(m_processor->GetLogicalAddress())->TransmitActiveSource(false);
}
else if (command.parameters.At(4) == VL_POWERED_DOWN)
{
if (m_busDevice->GetLogicalAddress() != CECDEVICE_TV)
{
+ CCECBusDevice* tv = m_processor->GetTV();
+ if (tv && tv->GetStatus() != CEC_DEVICE_STATUS_PRESENT)
+ return true;
+
// get the status from the TV
- CCECBusDevice *tv = m_processor->GetTV();
if (tv && tv->GetCurrentVendorId() == CEC_VENDOR_PANASONIC)
{
CVLCommandHandler *handler = static_cast<CVLCommandHandler *>(tv->GetHandler());
{
CLockObject lock(m_mutex);
m_iPowerUpEventReceived = 0;
+ m_bCapabilitiesSent = false;
}
return CCECCommandHandler::HandleStandby(command);
bool bTransmit(false);
{
CLockObject lock(m_mutex);
- bTransmit = m_bCapabilitiesSent;
+ bTransmit = !m_bCapabilitiesSent;
}
if (bTransmit)
SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), CECDEVICE_TV);
void CVLCommandHandler::SendVendorCommandCapabilities(const cec_logical_address initiator, const cec_logical_address destination)
{
- cec_command response;
- cec_command::Format(response, initiator, destination, CEC_OPCODE_VENDOR_COMMAND);
- uint8_t iResponseData[] = {0x10, 0x02, 0xFF, 0xFF, 0x00, 0x05, 0x05, 0x45, 0x55, 0x5c, 0x58, 0x32};
- response.PushArray(12, iResponseData);
-
- if (Transmit(response, false, true))
+ if (PowerUpEventReceived())
{
- if (PowerUpEventReceived())
+ cec_command response;
+ cec_command::Format(response, initiator, destination, CEC_OPCODE_VENDOR_COMMAND);
+ uint8_t iResponseData[] = {0x10, 0x02, 0xFF, 0xFF, 0x00, 0x05, 0x05, 0x45, 0x55, 0x5c, 0x58, 0x32};
+ response.PushArray(12, iResponseData);
+
+ if (Transmit(response, false, true))
{
CLockObject lock(m_mutex);
m_bCapabilitiesSent = true;
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, false);
+
return PowerUpEventReceived();
}