#define SL_COMMAND_CONNECT_REQUEST 0x04
#define SL_COMMAND_SET_DEVICE_MODE 0x05
+#define LIB_CEC m_busDevice->GetProcessor()->GetLib()
+#define ToString(p) LIB_CEC->ToString(p)
+
CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
CCECCommandHandler(busDevice),
m_bSLEnabled(false),
primary->ReplaceHandler(false);
}
- /* LG TVs don't always reply to CEC version requests, so just set it to 1.3a */
- if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
- m_busDevice->SetCecVersion(CEC_VERSION_1_3A);
+ /* LG devices don't always reply to CEC version requests, so just set it to 1.3a */
+ m_busDevice->SetCecVersion(CEC_VERSION_1_3A);
/* LG devices always return "korean" as language */
cec_menu_language lang;
return true;
}
-bool CSLCommandHandler::ActivateSource(void)
-{
- if (!SLInitialised())
- {
- CLibCEC::AddLog(CEC_LOG_NOTICE, "not activating the source until SL has been initialised");
- return true;
- }
-
- {
- CLockObject lock(m_SLMutex);
- if (m_bActiveSourceSent)
- return true;
- m_bActiveSourceSent = true;
- }
-
- CCECBusDevice *primary = m_processor->GetPrimaryDevice();
- primary->SetActiveSource();
- primary->TransmitImageViewOn();
- primary->TransmitActiveSource();
- return true;
-}
-
bool CSLCommandHandler::HandleActiveSource(const cec_command &command)
{
if (command.parameters.size == 2)
{
uint16_t iAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
- if (iAddress != m_processor->GetPrimaryDevice()->GetPhysicalAddress(false))
+ CCECBusDevice *primary = m_processor->GetPrimaryDevice();
+ bool bSendPowerOffState(iAddress != primary->GetCurrentPhysicalAddress() && primary->IsActiveSource());
+
+ CCECBusDevice *device = m_processor->GetDeviceByPhysicalAddress(iAddress);
+ if (device)
+ device->MarkAsActiveSource();
+ if (bSendPowerOffState)
{
- CLockObject lock(m_SLMutex);
- m_bActiveSourceSent = false;
+ {
+ CLockObject lock(m_SLMutex);
+ m_bActiveSourceSent = false;
+ }
+ primary->TransmitPowerState(CECDEVICE_TV);
}
- return m_processor->SetActiveSource(iAddress);
}
return true;
+
}
bool CSLCommandHandler::HandleDeviceVendorId(const cec_command &command)
if (!SLInitialised() && command.initiator == CECDEVICE_TV)
{
- cec_command response;
- cec_command::Format(response, m_processor->GetLogicalAddress(), command.initiator, CEC_OPCODE_FEATURE_ABORT);
- return Transmit(response);
- }
- return true;
-}
+ CCECBusDevice *destination = m_processor->GetDevice(command.destination);
+ if (destination && (destination->GetLogicalAddress() == CECDEVICE_BROADCAST || destination->IsHandledByLibCEC()))
+ {
+ cec_logical_address initiator = destination->GetLogicalAddress();
+ if (initiator == CECDEVICE_BROADCAST)
+ initiator = m_processor->GetPrimaryDevice()->GetLogicalAddress();
-bool CSLCommandHandler::HandleGivePhysicalAddress(const cec_command &command)
-{
- if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination))
- {
- CCECBusDevice *device = GetDevice(command.destination);
- if (device)
- return device->TransmitPhysicalAddress(); // only the physical address, don't send image view on
+ cec_command response;
+ cec_command::Format(response, initiator, command.initiator, CEC_OPCODE_FEATURE_ABORT);
+ return Transmit(response);
+ }
}
-
- return false;
+ return true;
}
bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
{
- if (!m_busDevice->MyLogicalAddressContains(command.destination))
+ if (!m_processor->IsHandledByLibCEC(command.destination))
return true;
if (command.parameters.size == 1 &&
response.PushBack(SL_COMMAND_UNKNOWN_02);
response.PushBack(SL_COMMAND_TYPE_HDDRECORDER);
- Transmit(response, false);
+ Transmit(response);
}
void CSLCommandHandler::HandleVendorCommandPowerOn(const cec_command &command)
if (device)
{
SetSLInitialised();
-
- device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); //XXX
+ device->MarkAsActiveSource();
+ device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
device->TransmitPowerState(command.initiator);
- device->SetPowerStatus(CEC_POWER_STATUS_ON);
- device->SetActiveSource();
- TransmitImageViewOn(device->GetLogicalAddress(), command.initiator);
+ CEvent::Sleep(2000);
+ device->SetPowerStatus(CEC_POWER_STATUS_ON);
+ device->TransmitPowerState(command.initiator);
+ device->TransmitPhysicalAddress();
+ {
+ CLockObject lock(m_SLMutex);
+ m_bActiveSourceSent = false;
+ }
}
}
void CSLCommandHandler::HandleVendorCommandPowerOnStatus(const cec_command &command)
{
if (command.destination != CECDEVICE_BROADCAST)
{
- CCECBusDevice *device = m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary];
- device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
- device->TransmitPowerState(command.initiator);
- device->SetPowerStatus(CEC_POWER_STATUS_ON);
+ CCECBusDevice *device = m_processor->GetPrimaryDevice();
+ if (device)
+ {
+ device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
+ device->TransmitPowerState(command.initiator);
+ device->SetPowerStatus(CEC_POWER_STATUS_ON);
+ }
}
}
void CSLCommandHandler::HandleVendorCommandSLConnect(const cec_command &command)
{
SetSLInitialised();
- TransmitVendorCommandSetDeviceMode(m_processor->GetLogicalAddress(), command.initiator, CEC_DEVICE_TYPE_RECORDING_DEVICE);
+ TransmitVendorCommandSetDeviceMode(command.destination, command.initiator, CEC_DEVICE_TYPE_RECORDING_DEVICE);
ActivateSource();
}
cec_command::Format(response, iSource, iDestination, CEC_OPCODE_VENDOR_COMMAND);
response.PushBack(SL_COMMAND_SET_DEVICE_MODE);
response.PushBack((uint8_t)type);
- Transmit(response, false);
+ Transmit(response);
}
bool CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command)
{
- if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination))
+ if (m_processor->CECInitialised() && 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))
{
if (command.parameters.size > 0)
{
- if (!SLInitialised())
- {
- cec_command response;
- cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_FEATURE_ABORT);
- response.PushBack(CEC_OPCODE_GIVE_DECK_STATUS);
- response.PushBack(CEC_ABORT_REASON_NOT_IN_CORRECT_MODE_TO_RESPOND);
- return Transmit(response);
- }
((CCECPlaybackDevice *) device)->SetDeckStatus(!device->IsActiveSource() ? CEC_DECK_INFO_OTHER_STATUS : CEC_DECK_INFO_OTHER_STATUS_LG);
if (command.parameters[0] == CEC_STATUS_REQUEST_ON)
{
bool bReturn = ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator);
- if (device->IsActiveSource())
- {
- bReturn &= device->TransmitImageViewOn() &&
- device->TransmitPhysicalAddress();
- }
+ if (!ActiveSourceSent())
+ ActivateSource();
return bReturn;
}
else if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE)
bool CSLCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
{
bool bReturn(false);
- if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination) && command.initiator == CECDEVICE_TV)
+ if (m_processor->CECInitialised() && m_processor->IsHandledByLibCEC(command.destination) && command.initiator == CECDEVICE_TV)
{
CCECBusDevice *device = GetDevice(command.destination);
- if (device && device->GetPowerStatus(false) != CEC_POWER_STATUS_ON)
+ if (device && device->GetCurrentPowerStatus() != CEC_POWER_STATUS_ON)
{
bReturn = device->TransmitPowerState(command.initiator);
device->SetPowerStatus(CEC_POWER_STATUS_ON);
else if (m_resetPowerState.IsSet() && m_resetPowerState.TimeLeft() > 0)
{
/* TODO assume that we've bugged out. the return button no longer works after this */
- CLibCEC::AddLog(CEC_LOG_WARNING, "FIXME: LG seems to have bugged out. resetting to 'in transition standby to on'. the return button will not work");
+ LIB_CEC->AddLog(CEC_LOG_WARNING, "FIXME: LG seems to have bugged out. resetting to 'in transition standby to on'. the return button will not work");
{
CLockObject lock(m_SLMutex);
m_bActiveSourceSent = false;
bool CSLCommandHandler::HandleRequestActiveSource(const cec_command &command)
{
- if (m_processor->IsRunning())
+ if (m_processor->CECInitialised())
{
if (ActiveSourceSent())
- CLibCEC::AddLog(CEC_LOG_DEBUG, ">> %i requests active source, ignored", (uint8_t) command.initiator);
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, ">> %i requests active source, ignored", (uint8_t) command.initiator);
else
ActivateSource();
return true;
bool CSLCommandHandler::HandleFeatureAbort(const cec_command &command)
{
- if (command.parameters.size == 0 && m_processor->GetPrimaryDevice()->GetPowerStatus() == CEC_POWER_STATUS_ON && !SLInitialised() &&
+ if (command.parameters.size == 0 && m_processor->GetPrimaryDevice()->GetCurrentPowerStatus() == CEC_POWER_STATUS_ON && !SLInitialised() &&
command.initiator == CECDEVICE_TV)
{
m_processor->GetPrimaryDevice()->TransmitPowerState(command.initiator);
void CSLCommandHandler::ResetSLState(void)
{
- CLibCEC::AddLog(CEC_LOG_NOTICE, "resetting SL initialised state");
+ LIB_CEC->AddLog(CEC_LOG_NOTICE, "resetting SL initialised state");
CLockObject lock(m_SLMutex);
m_bSLEnabled = false;
m_bActiveSourceSent = false;
void CSLCommandHandler::SetSLInitialised(void)
{
- CLibCEC::AddLog(CEC_LOG_NOTICE, "SL initialised");
+ LIB_CEC->AddLog(CEC_LOG_NOTICE, "SL initialised");
CLockObject lock(m_SLMutex);
m_bSLEnabled = true;
}
{
if (iDestination != CECDEVICE_TV)
{
+ /* LG devices only allow themselves to be woken up by the TV with a vendor command */
cec_command command;
+
+ if (!m_bSLEnabled)
+ TransmitVendorID(CECDEVICE_TV, CEC_VENDOR_LG);
+
cec_command::Format(command, CECDEVICE_TV, iDestination, CEC_OPCODE_VENDOR_COMMAND);
command.PushBack(SL_COMMAND_POWER_ON);
command.PushBack(0);
repositories / deb_libcec.git / blobdiff