m_iLogicalAddress(iLogicalAddress),
m_powerStatus(CEC_POWER_STATUS_UNKNOWN),
m_processor(processor),
- m_iVendorId(0),
m_iVendorClass(CEC_VENDOR_UNKNOWN),
m_iLastActive(0),
m_cecVersion(CEC_VERSION_UNKNOWN)
m_menuLanguage.language[iPtr] = '?';
m_menuLanguage.language[3] = 0;
m_menuLanguage.device = iLogicalAddress;
+ m_vendor.vendor = CEC_VENDOR_UNKNOWN;
}
CCECBusDevice::~CCECBusDevice(void)
void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
{
- CStdString strLog;
- strLog.Format("device %d power status changed from %2x to %2x", m_iLogicalAddress, m_powerStatus, powerStatus);
- m_processor->AddLog(CEC_LOG_DEBUG, strLog);
- m_powerStatus = powerStatus;
+ if (m_powerStatus != powerStatus)
+ {
+ CStdString strLog;
+ strLog.Format("device %d power status changed from %2x to %2x", m_iLogicalAddress, m_powerStatus, powerStatus);
+ m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+ m_powerStatus = powerStatus;
+ }
}
void CCECBusDevice::SetVendorId(const cec_datapacket &data)
void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 */)
{
- m_iVendorId = iVendorId;
+ m_vendor.vendor = (cec_vendor_id)iVendorId;
m_iVendorClass = iVendorClass;
switch (iVendorId)
return true;
}
-uint64_t CCECBusDevice::GetVendorId(void)
+const cec_vendor &CCECBusDevice::GetVendor(void)
{
- if (m_iVendorId == CEC_VENDOR_UNKNOWN)
+ if (m_vendor.vendor == CEC_VENDOR_UNKNOWN)
{
AddLog(CEC_LOG_NOTICE, "<< requesting vendor ID");
cec_command command;
m_condition.Wait(&m_mutex, 1000);
}
- return m_iVendorId;
+ return m_vendor;
}
void CCECBusDevice::PollVendorId(void)
{
CLockObject lock(&m_mutex);
if (m_iLastActive > 0 && m_iLogicalAddress != CECDEVICE_BROADCAST &&
- m_iVendorId == CEC_VENDOR_UNKNOWN &&
+ m_vendor.vendor == CEC_VENDOR_UNKNOWN &&
GetTimeMs() - m_iLastActive > 5000)
{
m_iLastActive = GetTimeMs();
cec_command command;
cec_command::format(command, GetMyLogicalAddress(), GetLogicalAddress(), CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
- command.ack_timeout = 0;
- m_processor->Transmit(command);
+ if (m_processor->Transmit(command))
+ m_condition.Wait(&m_mutex, 1000);
}
}
void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
{
- CStdString strLog;
- strLog.Format(">> %i changed physical address from %04x to %04x", GetLogicalAddress(), m_iPhysicalAddress, iNewAddress);
- AddLog(CEC_LOG_DEBUG, strLog.c_str());
+ if (iNewAddress > 0)
+ {
+ CStdString strLog;
+ strLog.Format(">> %i changed physical address from %04x to %04x", GetLogicalAddress(), m_iPhysicalAddress, iNewAddress);
+ AddLog(CEC_LOG_DEBUG, strLog.c_str());
- m_iPhysicalAddress = iNewAddress;
+ m_iPhysicalAddress = iNewAddress;
+ }
}
bool CCECBusDevice::PowerOn(void)
return m_processor->Transmit(command);
}
-cec_version CCECBusDevice::GetCecVersion(void)
+cec_version CCECBusDevice::GetCecVersion(bool bRefresh /* = true */)
{
- if (m_cecVersion == CEC_VERSION_UNKNOWN)
+ if (bRefresh || m_cecVersion == CEC_VERSION_UNKNOWN)
{
AddLog(CEC_LOG_NOTICE, "<< requesting CEC version");
cec_command command;
return m_cecVersion;
}
-cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
+cec_menu_language &CCECBusDevice::GetMenuLanguage(bool bRefresh /* = true */)
{
- if (!strcmp(m_menuLanguage.language, "???"))
+ if (bRefresh || !strcmp(m_menuLanguage.language, "???"))
{
AddLog(CEC_LOG_NOTICE, "<< requesting menu language");
cec_command command;
return m_menuLanguage;
}
-cec_power_status CCECBusDevice::GetPowerStatus(void)
+cec_power_status CCECBusDevice::GetPowerStatus(bool bRefresh /* = true */)
{
- if (m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
+ if (bRefresh || m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
{
AddLog(CEC_LOG_NOTICE, "<< requesting power status");
cec_command command;
return m_powerStatus;
}
-
-const char *CCECBusDevice::CECVendorIdToString(const uint64_t iVendorId)
-{
- switch (iVendorId)
- {
- case CEC_VENDOR_SAMSUNG:
- return "Samsung";
- case CEC_VENDOR_LG:
- return "LG";
- default:
- return "Unknown";
- }
-}