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)
return m_processor->GetLogicalAddress();
}
+bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
+{
+ return m_processor->HasLogicalAddress(address);
+}
+
uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const
{
return m_processor->GetPhysicalAddress();
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;
- cec_command::format(command, GetMyLogicalAddress(), GetLogicalAddress(), CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
CLockObject lock(&m_mutex);
if (m_processor->Transmit(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);
+ cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ if (m_processor->Transmit(command))
+ m_condition.Wait(&m_mutex, 1000);
}
}
if (iNewAddress > 0)
{
CStdString strLog;
- strLog.Format(">> %i changed physical address from %04x to %04x", GetLogicalAddress(), m_iPhysicalAddress, iNewAddress);
+ strLog.Format(">> %i changed physical address from %04x to %04x", m_iLogicalAddress, m_iPhysicalAddress, iNewAddress);
AddLog(CEC_LOG_DEBUG, strLog.c_str());
m_iPhysicalAddress = iNewAddress;
return m_processor->Transmit(command);
}
-bool CCECBusDevice::ReportCECVersion(void)
+bool CCECBusDevice::ReportCECVersion(cec_logical_address dest)
{
AddLog(CEC_LOG_NOTICE, "<< reporting CEC version as 1.3a");
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_CEC_VERSION);
+ cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
command.parameters.push_back(CEC_VERSION_1_3A);
return m_processor->Transmit(command);
}
-bool CCECBusDevice::ReportDeckStatus(void)
+bool CCECBusDevice::ReportDeckStatus(cec_logical_address dest)
{
// need to support opcodes play and deck control before doing anything with this
AddLog(CEC_LOG_NOTICE, "<< deck status requested, feature abort");
- m_processor->TransmitAbort(m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
return false;
}
-bool CCECBusDevice::ReportMenuState(bool bActive /* = true */)
+bool CCECBusDevice::ReportMenuState(cec_logical_address dest, bool bActive /* = true */)
{
if (bActive)
AddLog(CEC_LOG_NOTICE, "<< reporting menu state as active");
AddLog(CEC_LOG_NOTICE, "<< reporting menu state as inactive");
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_MENU_STATUS);
+ cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_MENU_STATUS);
command.parameters.push_back(bActive ? (uint8_t) CEC_MENU_STATE_ACTIVATED : (uint8_t) CEC_MENU_STATE_DEACTIVATED);
return m_processor->Transmit(command);
}
-bool CCECBusDevice::ReportOSDName(void)
+bool CCECBusDevice::ReportOSDName(cec_logical_address dest)
{
const char *osdname = m_processor->GetDeviceName().c_str();
CStdString strLog;
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_SET_OSD_NAME);
+ cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_NAME);
for (unsigned int iPtr = 0; iPtr < strlen(osdname); iPtr++)
command.parameters.push_back(osdname[iPtr]);
return m_processor->Transmit(command);
}
-bool CCECBusDevice::ReportPowerState(bool bOn /* = true */)
+bool CCECBusDevice::ReportPowerState(cec_logical_address dest)
{
- if (bOn)
- AddLog(CEC_LOG_NOTICE, "<< reporting \"On\" power status");
- else
- AddLog(CEC_LOG_NOTICE, "<< reporting \"Off\" power status");
+ AddLog(CEC_LOG_NOTICE, "<< reporting \"On\" power status");
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_REPORT_POWER_STATUS);
- command.parameters.push_back(bOn ? (uint8_t) CEC_POWER_STATUS_ON : (uint8_t) CEC_POWER_STATUS_STANDBY);
+ cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
+// command.parameters.push_back(bOn ? (uint8_t) CEC_POWER_STATUS_ON : (uint8_t) CEC_POWER_STATUS_STANDBY);
+ command.parameters.push_back((uint8_t) CEC_POWER_STATUS_ON);
return m_processor->Transmit(command);
}
-bool CCECBusDevice::ReportVendorID(void)
+bool CCECBusDevice::ReportVendorID(cec_logical_address dest)
{
AddLog(CEC_LOG_NOTICE, "<< vendor ID requested, feature abort");
- m_processor->TransmitAbort(m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
return false;
}
AddLog(CEC_LOG_DEBUG, "<< setting active view");
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+ 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);
AddLog(CEC_LOG_DEBUG, "<< setting inactive view");
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
+ cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
command.parameters.push_back(m_iPhysicalAddress & 0xFF);
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
+ cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
command.parameters.push_back((uint8_t) (CEC_DEVICE_TYPE_PLAYBACK_DEVICE));
AddLog(CEC_LOG_NOTICE, "<< broadcasting active source");
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+ cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
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)
+bool CCECBusDevice::PollDevice(cec_logical_address source /* = CECDEVICE_UNKNOWN */)
{
- switch (iVendorId)
- {
- case CEC_VENDOR_SAMSUNG:
- return "Samsung";
- case CEC_VENDOR_LG:
- return "LG";
- default:
- return "Unknown";
- }
+ bool bReturn(false);
+
+ if (source == CECDEVICE_UNKNOWN)
+ source = GetMyLogicalAddress();
+
+ CStdString strLog;
+ strLog.Format("<< sending POLL from device %1x to device %1x", (int8_t)source, m_iLogicalAddress);
+ AddLog(CEC_LOG_DEBUG, strLog);
+
+ cec_command command;
+ cec_command::format(command, source, m_iLogicalAddress, CEC_OPCODE_NONE);
+ CLockObject lock(&m_mutex);
+
+ bReturn = m_processor->Transmit(command);
+ AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
+ return bReturn;
}