From 93729720051398d8fd686495b1a30ff852abe03b Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Sun, 6 Nov 2011 13:47:36 +0100 Subject: [PATCH] cec: cosmetics --- src/lib/CECProcessor.cpp | 4 +- src/lib/devices/CECBusDevice.cpp | 410 ++++++++++++++++--------------- src/lib/devices/CECBusDevice.h | 2 +- 3 files changed, 213 insertions(+), 203 deletions(-) diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 8238de7..1ac2e42 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -143,7 +143,7 @@ bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *s AddLog(CEC_LOG_DEBUG, strLog); SetAckMask(0x1 << address); - if (!m_busDevices[address]->PollDevice(address)) + if (!m_busDevices[address]->TransmitPoll(address)) { strLog.Format("using logical address '%s'", strLabel); AddLog(CEC_LOG_NOTICE, strLog); @@ -354,7 +354,7 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable) bool CCECProcessor::PollDevice(cec_logical_address iAddress) { if (iAddress != CECDEVICE_UNKNOWN && m_busDevices[iAddress]) - return m_busDevices[iAddress]->PollDevice(); + return m_busDevices[m_logicalAddresses.primary]->TransmitPoll(iAddress); return false; } diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp index bfdda91..66916d5 100644 --- a/src/lib/devices/CECBusDevice.cpp +++ b/src/lib/devices/CECBusDevice.cpp @@ -67,14 +67,95 @@ CCECBusDevice::~CCECBusDevice(void) delete m_handler; } -cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const +void CCECBusDevice::AddLog(cec_log_level level, const CStdString &strMessage) { - return m_processor->GetLogicalAddress(); + m_processor->AddLog(level, strMessage); } -bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const +bool CCECBusDevice::HandleCommand(const cec_command &command) { - return m_processor->HasLogicalAddress(address); + CLockObject lock(&m_mutex); + m_iLastActive = GetTimeMs(); + m_handler->HandleCommand(command); + m_condition.Signal(); + return true; +} + +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) + { + m_iLastActive = GetTimeMs(); + + cec_command 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); + } +} + +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_command command; + cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON); + + return m_processor->Transmit(command); +} + +bool CCECBusDevice::Standby(void) +{ + CStdString strLog; + strLog.Format("<< putting device with logical address %d in standby mode", (int8_t)m_iLogicalAddress); + AddLog(CEC_LOG_DEBUG, strLog.c_str()); + + cec_command command; + cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY); + + return m_processor->Transmit(command); +} + +/** @name Getters */ +//@{ +cec_version CCECBusDevice::GetCecVersion(bool bRefresh /* = true */) +{ + if (bRefresh || 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); + } + + return m_cecVersion; +} + +cec_menu_language &CCECBusDevice::GetMenuLanguage(bool bRefresh /* = true */) +{ + if (bRefresh || !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); + } + + return m_menuLanguage; +} + +cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const +{ + return m_processor->GetLogicalAddress(); } uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const @@ -82,22 +163,46 @@ uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const return m_processor->GetPhysicalAddress(); } -void CCECBusDevice::AddLog(cec_log_level level, const CStdString &strMessage) +cec_power_status CCECBusDevice::GetPowerStatus(bool bRefresh /* = true */) { - m_processor->AddLog(level, strMessage); + if (bRefresh || 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); + } + + return m_powerStatus; } -void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language) +const cec_vendor &CCECBusDevice::GetVendor(void) { - if (language.device == m_iLogicalAddress) + if (m_vendor.vendor == CEC_VENDOR_UNKNOWN) { - CStdString strLog; - strLog.Format("device %d menu language set to '%s'", m_iLogicalAddress, language.language); - m_processor->AddLog(CEC_LOG_DEBUG, strLog); - m_menuLanguage = language; + 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); } + + return m_vendor; +} + +bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const +{ + return m_processor->HasLogicalAddress(address); } +//@} + +/** @name Setters */ +//@{ void CCECBusDevice::SetCecVersion(const cec_version newVersion) { CStdString strLog; @@ -125,6 +230,48 @@ void CCECBusDevice::SetCecVersion(const cec_version newVersion) AddLog(CEC_LOG_DEBUG, strLog); } +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); + m_processor->AddLog(CEC_LOG_DEBUG, strLog); + m_menuLanguage = language; + } +} + +bool CCECBusDevice::SetOSDString(cec_display_control duration, const char *strMessage) +{ + CStdString strLog; + strLog.Format("<< display message '%s'", strMessage); + AddLog(CEC_LOG_NOTICE, strLog.c_str()); + + cec_command command; + cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_SET_OSD_STRING); + command.parameters.push_back((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]); + + return m_processor->Transmit(command); +} + +void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */) +{ + if (iNewAddress > 0) + { + CStdString strLog; + 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; + } +} + void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus) { if (m_powerStatus != powerStatus) @@ -185,99 +332,30 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 strLog.Format("device %d: vendor = %s (%06x) class = %2x", m_iLogicalAddress, GetVendorName(), GetVendorId(), GetVendorClass()); m_processor->AddLog(CEC_LOG_DEBUG, strLog.c_str()); } +//@} -bool CCECBusDevice::HandleCommand(const cec_command &command) -{ - CLockObject lock(&m_mutex); - m_iLastActive = GetTimeMs(); - m_handler->HandleCommand(command); - m_condition.Signal(); - return true; -} - -const cec_vendor &CCECBusDevice::GetVendor(void) -{ - if (m_vendor.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); - } - - return m_vendor; -} - -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) - { - m_iLastActive = GetTimeMs(); - - cec_command 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); - } -} - -void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */) -{ - if (iNewAddress > 0) - { - CStdString strLog; - 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; - } -} - -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_command command; - cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON); - - return m_processor->Transmit(command); -} - -bool CCECBusDevice::Standby(void) +/** @name Transmit methods */ +//@{ +bool CCECBusDevice::TransmitActiveSource(void) { - CStdString strLog; - strLog.Format("<< putting device with logical address %d in standby mode", (int8_t)m_iLogicalAddress); - AddLog(CEC_LOG_DEBUG, strLog.c_str()); + AddLog(CEC_LOG_NOTICE, "<< broadcasting active source"); cec_command command; - cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY); + 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); } -bool CCECBusDevice::SetOSDString(cec_display_control duration, const char *strMessage) +bool CCECBusDevice::TransmitActiveView(void) { - CStdString strLog; - strLog.Format("<< display message '%s'", strMessage); - AddLog(CEC_LOG_NOTICE, strLog.c_str()); + AddLog(CEC_LOG_DEBUG, "<< setting active view"); cec_command command; - cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_SET_OSD_STRING); - command.parameters.push_back((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]); + 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); } @@ -301,6 +379,18 @@ bool CCECBusDevice::TransmitDeckStatus(cec_logical_address dest) return false; } +bool CCECBusDevice::TransmitInactiveView(void) +{ + AddLog(CEC_LOG_DEBUG, "<< setting inactive view"); + + 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); + + return m_processor->Transmit(command); +} + bool CCECBusDevice::TransmitMenuState(cec_logical_address dest) { if (m_bMenuActive) @@ -329,50 +419,6 @@ bool CCECBusDevice::TransmitOSDName(cec_logical_address dest) return 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); - - cec_command command; - cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS); - command.parameters.push_back((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; -} - -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.push_back((m_iPhysicalAddress >> 8) & 0xFF); - command.parameters.push_back(m_iPhysicalAddress & 0xFF); - - return m_processor->Transmit(command); -} - -bool CCECBusDevice::TransmitInactiveView(void) -{ - AddLog(CEC_LOG_DEBUG, "<< setting inactive view"); - - 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); - - return m_processor->Transmit(command); -} - bool CCECBusDevice::TransmitPhysicalAddress(void) { CStdString strLog; @@ -388,79 +434,43 @@ bool CCECBusDevice::TransmitPhysicalAddress(void) return m_processor->Transmit(command); } -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); -} - -cec_version CCECBusDevice::GetCecVersion(bool bRefresh /* = true */) -{ - if (bRefresh || 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); - } - - return m_cecVersion; -} - -cec_menu_language &CCECBusDevice::GetMenuLanguage(bool bRefresh /* = true */) -{ - if (bRefresh || !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); - } - - return m_menuLanguage; -} - -cec_power_status CCECBusDevice::GetPowerStatus(bool bRefresh /* = true */) -{ - if (bRefresh || 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); - } - - return m_powerStatus; -} - -bool CCECBusDevice::PollDevice(cec_logical_address source /* = CECDEVICE_UNKNOWN */) +bool CCECBusDevice::TransmitPoll(cec_logical_address dest) { bool bReturn(false); - if (source == CECDEVICE_UNKNOWN) - source = GetMyLogicalAddress(); + if (dest == CECDEVICE_UNKNOWN) + dest = m_iLogicalAddress; CStdString strLog; - strLog.Format("<< sending POLL from device %1x to device %1x", (int8_t)source, m_iLogicalAddress); + strLog.Format("<< sending POLL from device %1x to device %1x", m_iLogicalAddress, (int8_t)dest); AddLog(CEC_LOG_DEBUG, strLog); cec_command command; - cec_command::format(command, source, m_iLogicalAddress, CEC_OPCODE_NONE); + cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE); CLockObject lock(&m_mutex); bReturn = m_processor->Transmit(command); AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent"); return bReturn; } + +bool CCECBusDevice::TransmitPowerState(cec_logical_address dest) +{ + CStdString strLog; + 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); + + 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; +} +//@} diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h index 4c7e540..333d299 100644 --- a/src/lib/devices/CECBusDevice.h +++ b/src/lib/devices/CECBusDevice.h @@ -61,7 +61,6 @@ namespace CEC virtual cec_version GetCecVersion(bool bRefresh = true); virtual cec_menu_language & GetMenuLanguage(bool bRefresh = true); virtual cec_power_status GetPowerStatus(bool bRefresh = true); - virtual bool PollDevice(cec_logical_address source = CECDEVICE_UNKNOWN); virtual bool PowerOn(void); virtual bool Standby(void); @@ -86,6 +85,7 @@ namespace CEC virtual bool TransmitMenuState(cec_logical_address dest); virtual bool TransmitOSDName(cec_logical_address dest); virtual bool TransmitPowerState(cec_logical_address dest); + virtual bool TransmitPoll(cec_logical_address dest); virtual bool TransmitVendorID(cec_logical_address dest); virtual bool TransmitActiveView(void); -- 2.34.1