bool CCECBusDevice::PowerOn(void)
{
- CStdString strLog;
- strLog.Format("<< powering on '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
- AddLog(CEC_LOG_DEBUG, strLog.c_str());
+ cec_power_status current = GetPowerStatus();
+ if (current != CEC_POWER_STATUS_ON &&
+ current != CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON)
+ {
+ CStdString strLog;
+ strLog.Format("<< powering on '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_DEBUG, strLog.c_str());
- cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+ SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
- return m_processor->Transmit(command);
+ cec_command command;
+ cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+
+ return m_processor->Transmit(command);
+ }
+
+ return true;
}
bool CCECBusDevice::Standby(void)
if (m_powerStatus != powerStatus)
{
CStdString strLog;
- strLog.Format(">> %s (%X): power status changed from %2x to %2x", GetLogicalAddressName(), m_iLogicalAddress, m_powerStatus, powerStatus);
+ strLog.Format(">> %s (%X): power status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(m_powerStatus), CCECCommandHandler::ToString(powerStatus));
m_processor->AddLog(CEC_LOG_DEBUG, strLog);
m_powerStatus = powerStatus;
}
//@{
bool CCECBusDevice::TransmitActiveSource(void)
{
- if (m_bActiveSource)
+ if (m_powerStatus != CEC_POWER_STATUS_ON)
+ {
+ CStdString strLog;
+ strLog.Format("<< %s (%X) is not powered on", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_DEBUG, strLog);
+ }
+ else if (m_bActiveSource)
{
CStdString strLog;
strLog.Format("<< %s (%X) -> broadcast (F): active source (%4x)", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress);
return false;
}
-bool CCECBusDevice::TransmitActiveView(void)
-{
- CStdString strLog;
- strLog.Format("<< %s (%X) -> broadcast (F): active view (%4x)", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress);
- AddLog(CEC_LOG_NOTICE, strLog);
-
- cec_command command;
- cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
- command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
- command.parameters.push_back(m_iPhysicalAddress & 0xFF);
-
- return m_processor->Transmit(command);
-}
-
bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest)
{
CStdString strLog;
return m_processor->Transmit(command);
}
-bool CCECBusDevice::TransmitDeckStatus(cec_logical_address dest)
-{
- // need to support opcodes play and deck control before doing anything with this
- CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): deck status feature abort", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
- AddLog(CEC_LOG_NOTICE, strLog);
-
- m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DECK_STATUS);
- return false;
-}
-
bool CCECBusDevice::TransmitInactiveView(void)
{
CStdString strLog;
bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
{
CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
-
- switch (m_powerStatus)
- {
- case CEC_POWER_STATUS_ON:
- strLog.append("powered on");
- break;
- case CEC_POWER_STATUS_STANDBY:
- strLog.append("in standby mode");
- break;
- case CEC_POWER_STATUS_IN_TRANSITION_ON_TO_STANDBY:
- strLog.append("in transition from on to standby");
- break;
- case CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON:
- strLog.append("in transition from standby to on");
- break;
- default:
- strLog.append("power state unknown");
- break;
- }
+ strLog.Format("<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest, CCECCommandHandler::ToString(m_powerStatus));
AddLog(CEC_LOG_NOTICE, strLog.c_str());
- strLog.Format("<< reporting power status '%d'", m_powerStatus);
- AddLog(CEC_LOG_NOTICE, strLog);
-
cec_command command;
cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
command.parameters.push_back((uint8_t) m_powerStatus);