using namespace CEC;
+#define ToString(p) CCECCommandHandler::ToString(p)
+
CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogicalAddress, uint16_t iPhysicalAddress) :
+ m_type(CEC_DEVICE_TYPE_RESERVED),
m_iPhysicalAddress(iPhysicalAddress),
+ m_iStreamPath(0),
m_iLogicalAddress(iLogicalAddress),
m_powerStatus(CEC_POWER_STATUS_UNKNOWN),
m_processor(processor),
- m_bMenuActive(true),
- m_iVendorClass(CEC_VENDOR_UNKNOWN),
+ m_vendor(CEC_VENDOR_UNKNOWN),
+ m_menuState(CEC_MENU_STATE_ACTIVATED),
+ m_bActiveSource(false),
+ m_iLastCommandSent(0),
m_iLastActive(0),
- m_cecVersion(CEC_VERSION_1_3A)
+ m_cecVersion(CEC_VERSION_UNKNOWN)
{
m_handler = new CCECCommandHandler(this);
m_menuLanguage.language[3] = 0;
m_menuLanguage.device = iLogicalAddress;
- m_vendor.vendor = CEC_VENDOR_UNKNOWN;
- m_type = CEC_DEVICE_TYPE_RESERVED;
- m_strDeviceName = "Unknown";
+ m_strDeviceName = ToString(m_iLogicalAddress);
}
CCECBusDevice::~CCECBusDevice(void)
{
CLockObject lock(&m_mutex);
if (m_iLastActive > 0 && m_iLogicalAddress != CECDEVICE_BROADCAST &&
- m_vendor.vendor == CEC_VENDOR_UNKNOWN &&
- GetTimeMs() - m_iLastActive > 5000)
+ m_vendor == CEC_VENDOR_UNKNOWN &&
+ GetTimeMs() - m_iLastCommandSent > 5000 &&
+ !m_processor->IsMonitoring())
{
- m_iLastActive = GetTimeMs();
+ CStdString strLog;
+ strLog.Format("<< requesting vendor ID of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ m_iLastCommandSent = GetTimeMs();
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
if (m_processor->Transmit(command))
m_condition.Wait(&m_mutex, 1000);
}
bool CCECBusDevice::PowerOn(void)
{
- CStdString strLog;
- strLog.Format("<< powering on device with logical address %d", (int8_t)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)
{
CStdString strLog;
- strLog.Format("<< putting device with logical address %d in standby mode", (int8_t)m_iLogicalAddress);
+ strLog.Format("<< putting '%s' (%X) in standby mode", GetLogicalAddressName(), m_iLogicalAddress);
AddLog(CEC_LOG_DEBUG, strLog.c_str());
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY);
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY);
return m_processor->Transmit(command);
}
/** @name Getters */
//@{
-cec_version CCECBusDevice::GetCecVersion(bool bRefresh /* = true */)
+cec_version CCECBusDevice::GetCecVersion(void)
{
- if (bRefresh || m_cecVersion == CEC_VERSION_UNKNOWN)
+ if (m_cecVersion == CEC_VERSION_UNKNOWN)
{
- AddLog(CEC_LOG_NOTICE, "<< requesting CEC version");
- cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_CEC_VERSION);
- CLockObject lock(&m_mutex);
- if (m_processor->Transmit(command))
- m_condition.Wait(&m_mutex, 1000);
+ if (!MyLogicalAddressContains(m_iLogicalAddress))
+ {
+ CStdString strLog;
+ strLog.Format("<< requesting CEC version of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ cec_command command;
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_CEC_VERSION);
+ CLockObject lock(&m_mutex);
+ if (m_processor->Transmit(command))
+ m_condition.Wait(&m_mutex, 1000);
+ }
}
return m_cecVersion;
}
-cec_menu_language &CCECBusDevice::GetMenuLanguage(bool bRefresh /* = true */)
+const char* CCECBusDevice::GetLogicalAddressName(void) const
+{
+ return ToString(m_iLogicalAddress);
+}
+
+cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
{
- if (bRefresh || !strcmp(m_menuLanguage.language, "???"))
+ if (!strcmp(m_menuLanguage.language, "???"))
{
- AddLog(CEC_LOG_NOTICE, "<< requesting menu language");
- cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_MENU_LANGUAGE);
- CLockObject lock(&m_mutex);
- if (m_processor->Transmit(command))
- m_condition.Wait(&m_mutex, 1000);
+ if (!MyLogicalAddressContains(m_iLogicalAddress))
+ {
+ CStdString strLog;
+ strLog.Format("<< requesting menu language of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ cec_command command;
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_MENU_LANGUAGE);
+ CLockObject lock(&m_mutex);
+ if (m_processor->Transmit(command))
+ m_condition.Wait(&m_mutex, 1000);
+ }
}
return m_menuLanguage;
return m_processor->GetPhysicalAddress();
}
-cec_power_status CCECBusDevice::GetPowerStatus(bool bRefresh /* = true */)
+cec_power_status CCECBusDevice::GetPowerStatus(void)
{
- if (bRefresh || m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
+ if (m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
{
- AddLog(CEC_LOG_NOTICE, "<< requesting power status");
- cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS);
- CLockObject lock(&m_mutex);
- if (m_processor->Transmit(command))
- m_condition.Wait(&m_mutex, 1000);
+ if (!MyLogicalAddressContains(m_iLogicalAddress))
+ {
+ CStdString strLog;
+ strLog.Format("<< requesting power status of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ cec_command command;
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS);
+ CLockObject lock(&m_mutex);
+ if (m_processor->Transmit(command))
+ m_condition.Wait(&m_mutex, 1000);
+ }
}
return m_powerStatus;
}
-const cec_vendor &CCECBusDevice::GetVendor(void)
+const cec_vendor_id CCECBusDevice::GetVendorId(void)
{
- if (m_vendor.vendor == CEC_VENDOR_UNKNOWN)
+ if (m_vendor == CEC_VENDOR_UNKNOWN)
{
- AddLog(CEC_LOG_NOTICE, "<< requesting vendor ID");
- cec_command command;
- 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);
+ if (!MyLogicalAddressContains(m_iLogicalAddress))
+ {
+ CStdString strLog;
+ strLog.Format("<< requesting vendor ID of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ cec_command command;
+ 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_vendor;
}
+const char *CCECBusDevice::GetVendorName(void)
+{
+ GetVendorId();
+ return ToString(m_vendor);
+}
+
bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
{
return m_processor->HasLogicalAddress(address);
//@{
void CCECBusDevice::SetCecVersion(const cec_version newVersion)
{
- CStdString strLog;
m_cecVersion = newVersion;
- switch (newVersion)
- {
- case CEC_VERSION_1_2:
- strLog.Format("device %d reports CEC version 1.2", m_iLogicalAddress);
- break;
- case CEC_VERSION_1_2A:
- strLog.Format("device %d reports CEC version 1.2a", m_iLogicalAddress);
- break;
- case CEC_VERSION_1_3:
- strLog.Format("device %d reports CEC version 1.3", m_iLogicalAddress);
- break;
- case CEC_VERSION_1_3A:
- strLog.Format("device %d reports CEC version 1.3a", m_iLogicalAddress);
- break;
- default:
- strLog.Format("device %d reports an unknown CEC version", m_iLogicalAddress);
- m_cecVersion = CEC_VERSION_UNKNOWN;
- break;
- }
+ CStdString strLog;
+ strLog.Format("%s (%X): CEC version %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(newVersion));
AddLog(CEC_LOG_DEBUG, strLog);
}
if (language.device == m_iLogicalAddress)
{
CStdString strLog;
- strLog.Format("device %d menu language set to '%s'", m_iLogicalAddress, language.language);
+ strLog.Format(">> %s (%X): menu language set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, language.language);
m_processor->AddLog(CEC_LOG_DEBUG, strLog);
m_menuLanguage = language;
}
}
-void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
+void CCECBusDevice::SetMenuState(const cec_menu_state state)
+{
+ if (m_menuState != state)
+ {
+ CStdString strLog;
+ strLog.Format(">> %s (%X): menu state set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_menuState));
+ m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+ m_menuState = state;
+ }
+}
+
+void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress)
{
if (iNewAddress > 0)
{
CStdString strLog;
- strLog.Format(">> %i changed physical address from %04x to %04x", m_iLogicalAddress, m_iPhysicalAddress, iNewAddress);
+ strLog.Format(">> %s (%X): physical address changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress, iNewAddress);
AddLog(CEC_LOG_DEBUG, strLog.c_str());
m_iPhysicalAddress = iNewAddress;
}
}
-void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
+void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
{
- if (m_powerStatus != powerStatus)
+ if (iNewAddress > 0)
{
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;
+ strLog.Format(">> %s (%X): stream path changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, iOldAddress, iNewAddress);
+ AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+ m_iStreamPath = iNewAddress;
+
+ if (iNewAddress > 0)
+ SetPowerStatus(CEC_POWER_STATUS_ON);
}
}
-void CCECBusDevice::SetVendorId(const cec_datapacket &data)
+void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
{
- if (data.size < 3)
+ if (m_powerStatus != powerStatus)
{
- AddLog(CEC_LOG_WARNING, "invalid vendor ID received");
- return;
+ CStdString strLog;
+ strLog.Format(">> %s (%X): power status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_powerStatus), ToString(powerStatus));
+ m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+ m_powerStatus = powerStatus;
}
-
- uint64_t iVendorId = ((uint64_t)data[0] << 3) +
- ((uint64_t)data[1] << 2) +
- (uint64_t)data[2];
-
- SetVendorId(iVendorId, data.size >= 4 ? data[3] : 0);
}
-void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 */)
+void CCECBusDevice::SetVendorId(uint64_t iVendorId)
{
- m_vendor.vendor = (cec_vendor_id)iVendorId;
- m_iVendorClass = iVendorClass;
+ m_vendor = (cec_vendor_id)iVendorId;
switch (iVendorId)
{
}
CStdString strLog;
- strLog.Format("device %d: vendor = %s (%06x) class = %2x", m_iLogicalAddress, GetVendorName(), GetVendorId(), GetVendorClass());
+ strLog.Format("%s (%X): vendor = %s (%06x)", GetLogicalAddressName(), m_iLogicalAddress, GetVendorName(), GetVendorId());
m_processor->AddLog(CEC_LOG_DEBUG, strLog.c_str());
}
//@}
//@{
bool CCECBusDevice::TransmitActiveSource(void)
{
- AddLog(CEC_LOG_NOTICE, "<< broadcasting active source");
-
- cec_command command;
- 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);
-}
+ 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);
+ AddLog(CEC_LOG_NOTICE, strLog);
-bool CCECBusDevice::TransmitActiveView(void)
-{
- AddLog(CEC_LOG_DEBUG, "<< setting active view");
+ cec_command command;
+ cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+ command.parameters.PushBack((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+ command.parameters.PushBack((uint8_t) (m_iPhysicalAddress & 0xFF));
- 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);
+ }
+ else
+ {
+ CStdString strLog;
+ strLog.Format("<< %s (%X) is not the active source", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_DEBUG, strLog);
+ }
- return m_processor->Transmit(command);
+ return false;
}
bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest)
{
- AddLog(CEC_LOG_NOTICE, "<< reporting CEC version as 1.3a");
+ CStdString strLog;
+ strLog.Format("<< %s (%X) -> %s (%X): cec version %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_cecVersion));
+ AddLog(CEC_LOG_NOTICE, strLog);
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
- command.parameters.push_back(m_cecVersion);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
+ command.parameters.PushBack((uint8_t)m_cecVersion);
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
- AddLog(CEC_LOG_NOTICE, "<< deck status requested, feature abort");
- m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
- return false;
-}
-
bool CCECBusDevice::TransmitInactiveView(void)
{
- AddLog(CEC_LOG_DEBUG, "<< setting inactive view");
+ CStdString strLog;
+ strLog.Format("<< %s (%X) -> broadcast (F): inactive view", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
cec_command command;
- 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);
+ cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
+ command.parameters.PushBack((m_iPhysicalAddress >> 8) & 0xFF);
+ command.parameters.PushBack(m_iPhysicalAddress & 0xFF);
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitMenuState(cec_logical_address dest)
{
- if (m_bMenuActive)
- AddLog(CEC_LOG_NOTICE, "<< reporting menu state as active");
- else
- AddLog(CEC_LOG_NOTICE, "<< reporting menu state as inactive");
+ CStdString strLog;
+ strLog.Format("<< %s (%X) -> %s (%X): menu state '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_menuState));
+ AddLog(CEC_LOG_NOTICE, strLog);
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_MENU_STATUS);
- command.parameters.push_back(m_bMenuActive ? (uint8_t) CEC_MENU_STATE_ACTIVATED : (uint8_t) CEC_MENU_STATE_DEACTIVATED);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_MENU_STATUS);
+ command.parameters.PushBack((uint8_t)m_menuState);
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitOSDName(cec_logical_address dest)
{
CStdString strLog;
- strLog.Format("<< reporting OSD name as %s", m_strDeviceName.c_str());
+ strLog.Format("<< %s (%X) -> %s (%X): OSD name '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, m_strDeviceName.c_str());
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_NAME);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_NAME);
for (unsigned int iPtr = 0; iPtr < m_strDeviceName.length(); iPtr++)
- command.parameters.push_back(m_strDeviceName.at(iPtr));
+ command.parameters.PushBack(m_strDeviceName.at(iPtr));
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage)
{
CStdString strLog;
- strLog.Format("<< display message '%s'", strMessage);
+ strLog.Format("<< %s (%X) -> %s (%X): display OSD message '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, strMessage);
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_STRING);
- command.parameters.push_back((uint8_t)duration);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_STRING);
+ command.parameters.PushBack((uint8_t)duration);
unsigned int iLen = strlen(strMessage);
if (iLen > 13) iLen = 13;
for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
- command.parameters.push_back(strMessage[iPtr]);
+ command.parameters.PushBack(strMessage[iPtr]);
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitPhysicalAddress(void)
{
CStdString strLog;
- strLog.Format("<< reporting physical address as %04x", m_iPhysicalAddress);
+ strLog.Format("<< %s (%X) -> broadcast (F): physical adddress %4x", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress);
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- 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));
+ cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
+ command.parameters.PushBack((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+ command.parameters.PushBack((uint8_t) (m_iPhysicalAddress & 0xFF));
+ command.parameters.PushBack((uint8_t) (m_type));
return m_processor->Transmit(command);
}
dest = m_iLogicalAddress;
CStdString strLog;
- strLog.Format("<< sending POLL from device %1x to device %1x", m_iLogicalAddress, (int8_t)dest);
- AddLog(CEC_LOG_DEBUG, strLog);
+ strLog.Format("<< %s (%X) -> %s (%X): POLL", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
+ AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE);
CLockObject lock(&m_mutex);
bReturn = m_processor->Transmit(command);
bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
{
CStdString strLog;
- strLog.Format("<< reporting power status '%d'", m_powerStatus);
- AddLog(CEC_LOG_NOTICE, strLog);
+ strLog.Format("<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_powerStatus));
+ AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
- command.parameters.push_back((uint8_t) m_powerStatus);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
+ command.parameters.PushBack((uint8_t) m_powerStatus);
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitVendorID(cec_logical_address dest)
{
- AddLog(CEC_LOG_NOTICE, "<< vendor ID requested, feature abort");
- m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
- return false;
+ if (m_vendor == CEC_VENDOR_UNKNOWN)
+ {
+ CStdString strLog;
+ strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
+ AddLog(CEC_LOG_NOTICE, strLog);
+
+ m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ return false;
+ }
+ else
+ {
+ CStdString strLog;
+ strLog.Format("<< %s (%X) -> %s (%X): vendor id %s (%x)", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_vendor), (uint64_t)m_vendor);
+ AddLog(CEC_LOG_NOTICE, strLog);
+
+ cec_command command;
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+
+ command.parameters.PushBack((uint8_t) (((uint64_t)m_vendor >> 16) & 0xFF));
+ command.parameters.PushBack((uint8_t) (((uint64_t)m_vendor >> 8) & 0xFF));
+ command.parameters.PushBack((uint8_t) ((uint64_t)m_vendor & 0xFF));
+
+ return m_processor->Transmit(command);
+ }
}
//@}
repositories / deb_libcec.git / blobdiff