X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.cpp;h=5123ef0e8ad128ea51d76ffdd3e9df978b8ab0e9;hb=58c1f6f50ae4a5483e43fc9ec80233508adfe099;hp=64b084a7da24be73b037505c04d93d2ef288e4db;hpb=315ff809364552f6faee215b56ecacb2efaea8e4;p=deb_libcec.git diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp index 64b084a..5123ef0 100644 --- a/src/lib/devices/CECBusDevice.cpp +++ b/src/lib/devices/CECBusDevice.cpp @@ -47,9 +47,11 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi m_powerStatus(CEC_POWER_STATUS_UNKNOWN), m_processor(processor), m_bMenuActive(true), + m_bActiveSource(false), m_iVendorClass(CEC_VENDOR_UNKNOWN), + m_iLastCommandSent(0), m_iLastActive(0), - m_cecVersion(CEC_VERSION_1_3A) + m_cecVersion(CEC_VERSION_UNKNOWN) { m_handler = new CCECCommandHandler(this); @@ -60,7 +62,7 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi m_vendor.vendor = CEC_VENDOR_UNKNOWN; m_type = CEC_DEVICE_TYPE_RESERVED; - m_strDeviceName = "Unknown"; + m_strDeviceName = CCECCommandHandler::ToString(m_iLogicalAddress); } CCECBusDevice::~CCECBusDevice(void) @@ -88,10 +90,13 @@ void CCECBusDevice::PollVendorId(void) CLockObject lock(&m_mutex); if (m_iLastActive > 0 && m_iLogicalAddress != CECDEVICE_BROADCAST && m_vendor.vendor == CEC_VENDOR_UNKNOWN && - GetTimeMs() - m_iLastActive > 5000 && + 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); @@ -102,20 +107,29 @@ void CCECBusDevice::PollVendorId(void) 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; @@ -132,7 +146,9 @@ cec_version CCECBusDevice::GetCecVersion(void) { if (!MyLogicalAddressContains(m_iLogicalAddress)) { - AddLog(CEC_LOG_NOTICE, "<< requesting CEC version"); + 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); @@ -144,13 +160,20 @@ cec_version CCECBusDevice::GetCecVersion(void) return m_cecVersion; } +const char* CCECBusDevice::GetLogicalAddressName(void) const +{ + return CCECCommandHandler::ToString(m_iLogicalAddress); +} + cec_menu_language &CCECBusDevice::GetMenuLanguage(void) { if (!strcmp(m_menuLanguage.language, "???")) { if (!MyLogicalAddressContains(m_iLogicalAddress)) { - AddLog(CEC_LOG_NOTICE, "<< requesting menu language"); + 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); @@ -178,7 +201,9 @@ cec_power_status CCECBusDevice::GetPowerStatus(void) { if (!MyLogicalAddressContains(m_iLogicalAddress)) { - AddLog(CEC_LOG_NOTICE, "<< requesting power status"); + 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); @@ -196,7 +221,9 @@ const cec_vendor &CCECBusDevice::GetVendor(void) { if (!MyLogicalAddressContains(m_iLogicalAddress)) { - AddLog(CEC_LOG_NOTICE, "<< requesting vendor ID"); + 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); @@ -226,19 +253,19 @@ void CCECBusDevice::SetCecVersion(const cec_version newVersion) switch (newVersion) { case CEC_VERSION_1_2: - strLog.Format("device %d reports CEC version 1.2", m_iLogicalAddress); + strLog.Format("%s (%X): CEC version 1.2", GetLogicalAddressName(), m_iLogicalAddress); break; case CEC_VERSION_1_2A: - strLog.Format("device %d reports CEC version 1.2a", m_iLogicalAddress); + strLog.Format("%s (%X): CEC version 1.2a", GetLogicalAddressName(), m_iLogicalAddress); break; case CEC_VERSION_1_3: - strLog.Format("device %d reports CEC version 1.3", m_iLogicalAddress); + strLog.Format("%s (%X): CEC version 1.3", GetLogicalAddressName(), m_iLogicalAddress); break; case CEC_VERSION_1_3A: - strLog.Format("device %d reports CEC version 1.3a", m_iLogicalAddress); + strLog.Format("%s (%X): CEC version 1.3a", GetLogicalAddressName(), m_iLogicalAddress); break; default: - strLog.Format("device %d reports an unknown CEC version", m_iLogicalAddress); + strLog.Format("%s (%X): unknown CEC version", GetLogicalAddressName(), m_iLogicalAddress); m_cecVersion = CEC_VERSION_UNKNOWN; break; } @@ -250,7 +277,7 @@ void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language) 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; } @@ -261,7 +288,7 @@ 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; @@ -273,10 +300,13 @@ void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* if (iNewAddress > 0) { CStdString strLog; - strLog.Format(">> %i stream path from %04x to %04x", m_iLogicalAddress, iOldAddress, iNewAddress); + 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); } } @@ -285,27 +315,12 @@ void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus) if (m_powerStatus != powerStatus) { CStdString strLog; - strLog.Format("device %d power status changed from %2x to %2x", m_iLogicalAddress, m_powerStatus, powerStatus); + strLog.Format(">> %s (%X): power status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(m_powerStatus), CCECCommandHandler::ToString(powerStatus)); m_processor->AddLog(CEC_LOG_DEBUG, strLog); m_powerStatus = powerStatus; } } -void CCECBusDevice::SetVendorId(const cec_datapacket &data) -{ - if (data.size < 3) - { - AddLog(CEC_LOG_WARNING, "invalid vendor ID received"); - return; - } - - 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 */) { m_vendor.vendor = (cec_vendor_id)iVendorId; @@ -344,7 +359,7 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 } CStdString strLog; - strLog.Format("device %d: vendor = %s (%06x) class = %2x", m_iLogicalAddress, GetVendorName(), GetVendorId(), GetVendorClass()); + strLog.Format("%s (%X): vendor = %s (%06x) class = %2x", GetLogicalAddressName(), m_iLogicalAddress, GetVendorName(), GetVendorId(), GetVendorClass()); m_processor->AddLog(CEC_LOG_DEBUG, strLog.c_str()); } //@} @@ -353,36 +368,39 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 //@{ bool CCECBusDevice::TransmitActiveSource(void) { - CStdString strLog; - strLog.Format("<< %x -> broadcast: active source (%4x)", 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)); - - 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) -{ - CStdString strLog; - strLog.Format("<< %x -> broadcast: active view (%4x)", 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 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) { CStdString strLog; - strLog.Format("<< %x -> %x: cec version ", m_iLogicalAddress, dest); + strLog.Format("<< %s (%X) -> %s (%X): cec version ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest); switch (m_cecVersion) { case CEC_VERSION_1_2: @@ -410,21 +428,10 @@ bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest) 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("<< %x -> %x: deck status feature abort", m_iLogicalAddress, dest); - AddLog(CEC_LOG_NOTICE, strLog); - - m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DECK_STATUS); - return false; -} - bool CCECBusDevice::TransmitInactiveView(void) { CStdString strLog; - strLog.Format("<< %x -> broadcast: inactive view", m_iLogicalAddress); + strLog.Format("<< %s (%X) -> broadcast (F): inactive view", GetLogicalAddressName(), m_iLogicalAddress); AddLog(CEC_LOG_NOTICE, strLog); cec_command command; @@ -438,7 +445,7 @@ bool CCECBusDevice::TransmitInactiveView(void) bool CCECBusDevice::TransmitMenuState(cec_logical_address dest) { CStdString strLog; - strLog.Format("<< %x -> %x: ", m_iLogicalAddress, dest); + strLog.Format("<< %s (%X) -> %s (%X): ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest); if (m_bMenuActive) strLog.append("menu active"); else @@ -455,7 +462,7 @@ bool CCECBusDevice::TransmitMenuState(cec_logical_address dest) bool CCECBusDevice::TransmitOSDName(cec_logical_address dest) { CStdString strLog; - strLog.Format("<< %x -> %x: OSD name '%s'", m_iLogicalAddress, dest, m_strDeviceName.c_str()); + strLog.Format("<< %s (%X) -> %s (%X): OSD name '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest, m_strDeviceName.c_str()); AddLog(CEC_LOG_NOTICE, strLog.c_str()); cec_command command; @@ -469,7 +476,7 @@ 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("<< %x -> %x: display OSD message '%s'", m_iLogicalAddress, dest, strMessage); + strLog.Format("<< %s (%X) -> %s (%X): display OSD message '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest, strMessage); AddLog(CEC_LOG_NOTICE, strLog.c_str()); cec_command command; @@ -488,7 +495,7 @@ bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_cont bool CCECBusDevice::TransmitPhysicalAddress(void) { CStdString strLog; - strLog.Format("<< %x -> broadcast: physical adddress %4x", m_iLogicalAddress, 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; @@ -508,7 +515,7 @@ bool CCECBusDevice::TransmitPoll(cec_logical_address dest) dest = m_iLogicalAddress; CStdString strLog; - strLog.Format("<< %x -> %x: POLL", m_iLogicalAddress, dest); + strLog.Format("<< %s (%X) -> %s (%X): POLL", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest); AddLog(CEC_LOG_NOTICE, strLog.c_str()); cec_command command; @@ -523,31 +530,9 @@ bool CCECBusDevice::TransmitPoll(cec_logical_address dest) bool CCECBusDevice::TransmitPowerState(cec_logical_address dest) { CStdString strLog; - strLog.Format("<< %x -> %x: ", m_iLogicalAddress, 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, CCECCommandHandler::ToString(dest), dest, CCECCommandHandler::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); @@ -558,7 +543,7 @@ bool CCECBusDevice::TransmitPowerState(cec_logical_address dest) bool CCECBusDevice::TransmitVendorID(cec_logical_address dest) { CStdString strLog; - strLog.Format("<< %x -> %x: vendor id feature abort", m_iLogicalAddress, dest); + strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest); AddLog(CEC_LOG_NOTICE, strLog); m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);