m_cecVersion(CEC_VERSION_UNKNOWN),
m_deviceStatus(CEC_DEVICE_STATUS_UNKNOWN),
m_iHandlerUseCount(0),
- m_bAwaitingReceiveFailed(false)
+ m_bAwaitingReceiveFailed(false),
+ m_bVendorIdRequested(false)
{
m_handler = new CCECCommandHandler(this);
}
if (bRequestUpdate)
+ {
+ CheckVendorIdRequested();
RequestCecVersion();
+ }
CLockObject lock(m_mutex);
return m_cecVersion;
}
if (bRequestUpdate)
+ {
+ CheckVendorIdRequested();
RequestMenuLanguage();
+ }
CLockObject lock(m_mutex);
return m_menuLanguage;
}
if (bRequestUpdate)
+ {
+ CheckVendorIdRequested();
RequestOSDName();
+ }
CLockObject lock(m_mutex);
return m_strDeviceName;
(m_iPhysicalAddress == 0xFFFF || bUpdate);
}
- if (bRequestUpdate && !RequestPhysicalAddress())
- CLibCEC::AddLog(CEC_LOG_ERROR, "failed to request the physical address");
+ if (bRequestUpdate)
+ {
+ CheckVendorIdRequested();
+ if (!RequestPhysicalAddress())
+ CLibCEC::AddLog(CEC_LOG_ERROR, "failed to request the physical address");
+ }
CLockObject lock(m_mutex);
return m_iPhysicalAddress;
}
if (bRequestUpdate)
+ {
+ CheckVendorIdRequested();
RequestPowerStatus();
+ }
CLockObject lock(m_mutex);
return m_powerStatus;
if (bNeedsPoll)
{
bool bPollAcked(false);
- if (bNeedsPoll || NeedsPoll())
+ if (bNeedsPoll && NeedsPoll())
bPollAcked = m_processor->PollDevice(m_iLogicalAddress);
status = bPollAcked ? CEC_DEVICE_STATUS_PRESENT : CEC_DEVICE_STATUS_NOT_PRESENT;
{
{
CLockObject lock(m_mutex);
+ if (m_bActiveSource)
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "marking %s (%X) as inactive source", GetLogicalAddressName(), m_iLogicalAddress);
m_bActiveSource = false;
}
{
CLockObject lock(m_mutex);
if (!IsActiveSource())
+ {
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "power state requested of %s (%X), but we are not the active source. setting power state to standby", GetLogicalAddressName(), m_iLogicalAddress);
SetPowerStatus(CEC_POWER_STATUS_STANDBY);
+ }
CLibCEC::AddLog(CEC_LOG_NOTICE, "<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_powerStatus));
state = m_powerStatus;
return bReturn;
}
+void CCECBusDevice::CheckVendorIdRequested(void)
+{
+ bool bRequestVendorId(false);
+ {
+ CLockObject lock(m_mutex);
+ bRequestVendorId = !m_bVendorIdRequested;
+ m_bVendorIdRequested = true;
+ }
+
+ if (bRequestVendorId)
+ {
+ ReplaceHandler(false);
+ GetVendorId();
+ }
+}
+
//@}