X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.cpp;h=1fca4a513f04ce99073210d31c0586e806a8374e;hb=88e5de6f3e5f0f0ff13f47490c364aa68b5e773c;hp=3c371f4be990b9c415aa2ae4f7b94f8621bdb260;hpb=d54e8570c10d16927199245d9eb96880289af27b;p=deb_libcec.git diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp index 3c371f4..1fca4a5 100644 --- a/src/lib/devices/CECBusDevice.cpp +++ b/src/lib/devices/CECBusDevice.cpp @@ -40,15 +40,18 @@ 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_vendor(CEC_VENDOR_UNKNOWN), + m_menuState(CEC_MENU_STATE_ACTIVATED), m_bActiveSource(false), - m_iVendorClass(CEC_VENDOR_UNKNOWN), m_iLastCommandSent(0), m_iLastActive(0), m_cecVersion(CEC_VERSION_UNKNOWN) @@ -60,9 +63,7 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi m_menuLanguage.language[3] = 0; m_menuLanguage.device = iLogicalAddress; - m_vendor.vendor = CEC_VENDOR_UNKNOWN; - m_type = CEC_DEVICE_TYPE_RESERVED; - m_strDeviceName = CCECCommandHandler::ToString(m_iLogicalAddress); + m_strDeviceName = ToString(m_iLogicalAddress); } CCECBusDevice::~CCECBusDevice(void) @@ -89,7 +90,7 @@ void CCECBusDevice::PollVendorId(void) { CLockObject lock(&m_mutex); if (m_iLastActive > 0 && m_iLogicalAddress != CECDEVICE_BROADCAST && - m_vendor.vendor == CEC_VENDOR_UNKNOWN && + m_vendor == CEC_VENDOR_UNKNOWN && GetTimeMs() - m_iLastCommandSent > 5000 && !m_processor->IsMonitoring()) { @@ -99,7 +100,7 @@ void CCECBusDevice::PollVendorId(void) 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); } @@ -107,14 +108,23 @@ void CCECBusDevice::PollVendorId(void) 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) @@ -124,7 +134,7 @@ bool CCECBusDevice::Standby(void) 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); } @@ -141,7 +151,7 @@ cec_version CCECBusDevice::GetCecVersion(void) 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); + 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); @@ -153,7 +163,7 @@ cec_version CCECBusDevice::GetCecVersion(void) const char* CCECBusDevice::GetLogicalAddressName(void) const { - return CCECCommandHandler::ToString(m_iLogicalAddress); + return ToString(m_iLogicalAddress); } cec_menu_language &CCECBusDevice::GetMenuLanguage(void) @@ -166,7 +176,7 @@ cec_menu_language &CCECBusDevice::GetMenuLanguage(void) 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); + 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); @@ -196,7 +206,7 @@ cec_power_status CCECBusDevice::GetPowerStatus(void) 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); + 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); @@ -206,9 +216,9 @@ cec_power_status CCECBusDevice::GetPowerStatus(void) 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) { if (!MyLogicalAddressContains(m_iLogicalAddress)) { @@ -216,7 +226,7 @@ const cec_vendor &CCECBusDevice::GetVendor(void) 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); + cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID); CLockObject lock(&m_mutex); if (m_processor->Transmit(command)) @@ -227,6 +237,12 @@ const cec_vendor &CCECBusDevice::GetVendor(void) 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); @@ -238,28 +254,10 @@ bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const //@{ void CCECBusDevice::SetCecVersion(const cec_version newVersion) { - CStdString strLog; m_cecVersion = newVersion; - switch (newVersion) - { - case CEC_VERSION_1_2: - strLog.Format("%s (%X): CEC version 1.2", GetLogicalAddressName(), m_iLogicalAddress); - break; - case CEC_VERSION_1_2A: - strLog.Format("%s (%X): CEC version 1.2a", GetLogicalAddressName(), m_iLogicalAddress); - break; - case CEC_VERSION_1_3: - strLog.Format("%s (%X): CEC version 1.3", GetLogicalAddressName(), m_iLogicalAddress); - break; - case CEC_VERSION_1_3A: - strLog.Format("%s (%X): CEC version 1.3a", GetLogicalAddressName(), m_iLogicalAddress); - break; - default: - strLog.Format("%s (%X): unknown CEC version", GetLogicalAddressName(), 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); } @@ -274,6 +272,17 @@ void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language) } } +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) @@ -295,6 +304,9 @@ void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* AddLog(CEC_LOG_DEBUG, strLog.c_str()); m_iStreamPath = iNewAddress; + + if (iNewAddress > 0) + SetPowerStatus(CEC_POWER_STATUS_ON); } } @@ -303,16 +315,15 @@ void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus) 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, ToString(m_powerStatus), ToString(powerStatus)); m_processor->AddLog(CEC_LOG_DEBUG, strLog); m_powerStatus = powerStatus; } } -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) { @@ -347,7 +358,7 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 } CStdString strLog; - strLog.Format("%s (%X): vendor = %s (%06x) class = %2x", GetLogicalAddressName(), 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()); } //@} @@ -356,16 +367,22 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 //@{ 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); AddLog(CEC_LOG_NOTICE, strLog); 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)); + 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)); return m_processor->Transmit(command); } @@ -379,62 +396,19 @@ bool CCECBusDevice::TransmitActiveSource(void) 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; - strLog.Format("<< %s (%X) -> %s (%X): cec version ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest); - switch (m_cecVersion) - { - case CEC_VERSION_1_2: - strLog.append("1.2"); - break; - case CEC_VERSION_1_2A: - strLog.append("1.2a"); - break; - case CEC_VERSION_1_3: - strLog.append("1.3"); - break; - case CEC_VERSION_1_3A: - strLog.append("1.3a"); - break; - default: - strLog.append("unknown"); - break; - } + 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 - 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; @@ -442,9 +416,9 @@ bool CCECBusDevice::TransmitInactiveView(void) 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); } @@ -452,16 +426,12 @@ bool CCECBusDevice::TransmitInactiveView(void) bool CCECBusDevice::TransmitMenuState(cec_logical_address dest) { CStdString strLog; - strLog.Format("<< %s (%X) -> %s (%X): ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest); - if (m_bMenuActive) - strLog.append("menu active"); - else - strLog.append("menu inactive"); + 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); } @@ -469,13 +439,13 @@ bool CCECBusDevice::TransmitMenuState(cec_logical_address dest) bool CCECBusDevice::TransmitOSDName(cec_logical_address dest) { CStdString strLog; - strLog.Format("<< %s (%X) -> %s (%X): OSD name '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest, 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); } @@ -483,18 +453,18 @@ bool CCECBusDevice::TransmitOSDName(cec_logical_address dest) bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage) { CStdString strLog; - strLog.Format("<< %s (%X) -> %s (%X): display OSD message '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest, 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); } @@ -506,10 +476,10 @@ bool CCECBusDevice::TransmitPhysicalAddress(void) 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) (m_type)); + 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); } @@ -522,11 +492,11 @@ bool CCECBusDevice::TransmitPoll(cec_logical_address dest) dest = m_iLogicalAddress; CStdString strLog; - strLog.Format("<< %s (%X) -> %s (%X): POLL", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest); + 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); @@ -537,45 +507,41 @@ bool CCECBusDevice::TransmitPoll(cec_logical_address dest) 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, ToString(dest), dest, 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); + 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) { - CStdString strLog; - strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest); - AddLog(CEC_LOG_NOTICE, strLog); + 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; + 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, CECDEVICE_BROADCAST, CEC_OPCODE_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); + } } //@}