X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.cpp;h=d852969daff419ddfcc172fbf53ade78ce5dedc7;hb=81a1e39d2fd283af39f1552e3c812e239f15b64b;hp=26b964b9c7cc74ee8c7d7863e8839f39cc292df8;hpb=28fa6c976a4c91b515be4cb119f92e2000bbd90e;p=deb_libcec.git diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp index 26b964b..d852969 100644 --- a/src/lib/devices/CECBusDevice.cpp +++ b/src/lib/devices/CECBusDevice.cpp @@ -50,7 +50,7 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi m_powerStatus(CEC_POWER_STATUS_UNKNOWN), m_processor(processor), m_vendor(CEC_VENDOR_UNKNOWN), - m_menuState(CEC_MENU_STATE_DEACTIVATED), + m_menuState(CEC_MENU_STATE_ACTIVATED), m_bActiveSource(false), m_iLastCommandSent(0), m_iLastActive(0), @@ -79,7 +79,7 @@ void CCECBusDevice::AddLog(cec_log_level level, const CStdString &strMessage) bool CCECBusDevice::HandleCommand(const cec_command &command) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_transmitMutex); m_iLastActive = GetTimeMs(); m_handler->HandleCommand(command); m_condition.Signal(); @@ -88,7 +88,7 @@ bool CCECBusDevice::HandleCommand(const cec_command &command) void CCECBusDevice::PollVendorId(void) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_transmitMutex); if (m_iLastActive > 0 && m_iLogicalAddress != CECDEVICE_BROADCAST && m_vendor == CEC_VENDOR_UNKNOWN && GetTimeMs() - m_iLastCommandSent > 5000 && @@ -100,9 +100,9 @@ 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); + m_condition.Wait(&m_transmitMutex, 1000); } } @@ -119,7 +119,7 @@ bool CCECBusDevice::PowerOn(void) SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); cec_command command; - cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON); + cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON); return m_processor->Transmit(command); } @@ -134,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); } @@ -143,21 +143,19 @@ bool CCECBusDevice::Standby(void) //@{ cec_version CCECBusDevice::GetCecVersion(void) { - if (m_cecVersion == CEC_VERSION_UNKNOWN) + if (!MyLogicalAddressContains(m_iLogicalAddress)) { - 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); - } + 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_transmitMutex); + if (m_processor->Transmit(command)) + m_condition.Wait(&m_transmitMutex, 1000); } + CLockObject lock(&m_mutex); return m_cecVersion; } @@ -168,21 +166,19 @@ const char* CCECBusDevice::GetLogicalAddressName(void) const cec_menu_language &CCECBusDevice::GetMenuLanguage(void) { - if (!strcmp(m_menuLanguage.language, "???")) + if (!MyLogicalAddressContains(m_iLogicalAddress)) { - 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); - } + 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_transmitMutex); + if (m_processor->Transmit(command)) + m_condition.Wait(&m_transmitMutex, 1000); } + CLockObject lock(&m_mutex); return m_menuLanguage; } @@ -198,48 +194,44 @@ uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const cec_power_status CCECBusDevice::GetPowerStatus(void) { - if (m_powerStatus == CEC_POWER_STATUS_UNKNOWN) + if (!MyLogicalAddressContains(m_iLogicalAddress)) { - 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); - } + 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_transmitMutex); + if (m_processor->Transmit(command)) + m_condition.Wait(&m_transmitMutex, 1000); } + CLockObject lock(&m_mutex); return m_powerStatus; } -const cec_vendor_id CCECBusDevice::GetVendorId(void) +cec_vendor_id CCECBusDevice::GetVendorId(void) { - if (m_vendor == CEC_VENDOR_UNKNOWN) + if (!MyLogicalAddressContains(m_iLogicalAddress)) { - 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); - } + 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_transmitMutex); + + if (m_processor->Transmit(command)) + m_condition.Wait(&m_transmitMutex, 1000); } + CLockObject lock(&m_mutex); return m_vendor; } const char *CCECBusDevice::GetVendorName(void) { - GetVendorId(); + CLockObject lock(&m_mutex); return ToString(m_vendor); } @@ -263,6 +255,7 @@ void CCECBusDevice::SetCecVersion(const cec_version newVersion) void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language) { + CLockObject lock(&m_mutex); if (language.device == m_iLogicalAddress) { CStdString strLog; @@ -274,6 +267,7 @@ void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language) void CCECBusDevice::SetMenuState(const cec_menu_state state) { + CLockObject lock(&m_mutex); if (m_menuState != state) { CStdString strLog; @@ -283,8 +277,27 @@ void CCECBusDevice::SetMenuState(const cec_menu_state state) } } +void CCECBusDevice::SetInactiveDevice(void) +{ + CLockObject lock(&m_mutex); + m_bActiveSource = false; +} + +void CCECBusDevice::SetActiveDevice(void) +{ + CLockObject lock(&m_mutex); + + for (int iPtr = 0; iPtr < 16; iPtr++) + if (iPtr != m_iLogicalAddress) + m_processor->m_busDevices[iPtr]->SetInactiveDevice(); + + m_bActiveSource = true; + m_powerStatus = CEC_POWER_STATUS_ON; +} + void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress) { + CLockObject lock(&m_mutex); if (iNewAddress > 0) { CStdString strLog; @@ -297,6 +310,7 @@ void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress) void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */) { + CLockObject lock(&m_mutex); if (iNewAddress > 0) { CStdString strLog; @@ -306,12 +320,16 @@ void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* m_iStreamPath = iNewAddress; if (iNewAddress > 0) + { + lock.Leave(); SetPowerStatus(CEC_POWER_STATUS_ON); + } } } void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus) { + CLockObject lock(&m_mutex); if (m_powerStatus != powerStatus) { CStdString strLog; @@ -323,42 +341,45 @@ void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus) void CCECBusDevice::SetVendorId(uint64_t iVendorId) { - m_vendor = (cec_vendor_id)iVendorId; - - switch (iVendorId) { - case CEC_VENDOR_SAMSUNG: - if (m_handler->GetVendorId() != CEC_VENDOR_SAMSUNG) - { - delete m_handler; - m_handler = new CANCommandHandler(this); - } - break; - case CEC_VENDOR_LG: - if (m_handler->GetVendorId() != CEC_VENDOR_LG) - { - delete m_handler; - m_handler = new CSLCommandHandler(this); - } - break; - case CEC_VENDOR_PANASONIC: - if (m_handler->GetVendorId() != CEC_VENDOR_PANASONIC) - { - delete m_handler; - m_handler = new CVLCommandHandler(this); - } - break; - default: - if (m_handler->GetVendorId() != CEC_VENDOR_UNKNOWN) + CLockObject lock(&m_mutex); + m_vendor = (cec_vendor_id)iVendorId; + + switch (iVendorId) { - delete m_handler; - m_handler = new CCECCommandHandler(this); + case CEC_VENDOR_SAMSUNG: + if (m_handler->GetVendorId() != CEC_VENDOR_SAMSUNG) + { + delete m_handler; + m_handler = new CANCommandHandler(this); + } + break; + case CEC_VENDOR_LG: + if (m_handler->GetVendorId() != CEC_VENDOR_LG) + { + delete m_handler; + m_handler = new CSLCommandHandler(this); + } + break; + case CEC_VENDOR_PANASONIC: + if (m_handler->GetVendorId() != CEC_VENDOR_PANASONIC) + { + delete m_handler; + m_handler = new CVLCommandHandler(this); + } + break; + default: + if (m_handler->GetVendorId() != CEC_VENDOR_UNKNOWN) + { + delete m_handler; + m_handler = new CCECCommandHandler(this); + } + break; } - break; } CStdString strLog; - strLog.Format("%s (%X): vendor = %s (%06x)", GetLogicalAddressName(), m_iLogicalAddress, GetVendorName(), GetVendorId()); + strLog.Format("%s (%X): vendor = %s (%06x)", GetLogicalAddressName(), m_iLogicalAddress, GetVendorName(), m_vendor); m_processor->AddLog(CEC_LOG_DEBUG, strLog.c_str()); } //@} @@ -367,6 +388,7 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId) //@{ bool CCECBusDevice::TransmitActiveSource(void) { + CLockObject lock(&m_mutex); if (m_powerStatus != CEC_POWER_STATUS_ON) { CStdString strLog; @@ -380,10 +402,11 @@ bool CCECBusDevice::TransmitActiveSource(void) 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)); + lock.Leave(); return m_processor->Transmit(command); } else @@ -398,14 +421,16 @@ bool CCECBusDevice::TransmitActiveSource(void) bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest) { + CLockObject lock(&m_mutex); 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((uint8_t)m_cecVersion); + cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION); + command.parameters.PushBack((uint8_t)m_cecVersion); + lock.Leave(); return m_processor->Transmit(command); } @@ -416,9 +441,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); } @@ -430,64 +455,69 @@ bool CCECBusDevice::TransmitMenuState(cec_logical_address dest) AddLog(CEC_LOG_NOTICE, strLog); cec_command command; - cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_MENU_STATUS); - command.parameters.push_back((uint8_t)m_menuState); + 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) { + CLockObject lock(&m_mutex); CStdString strLog; 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)); + lock.Leave(); return m_processor->Transmit(command); } bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage) { + CLockObject lock(&m_mutex); CStdString strLog; 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]); + lock.Leave(); return m_processor->Transmit(command); } bool CCECBusDevice::TransmitPhysicalAddress(void) { + CLockObject lock(&m_mutex); CStdString strLog; 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) (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)); + lock.Leave(); return m_processor->Transmit(command); } bool CCECBusDevice::TransmitPoll(cec_logical_address dest) { bool bReturn(false); - if (dest == CECDEVICE_UNKNOWN) dest = m_iLogicalAddress; @@ -496,8 +526,8 @@ bool CCECBusDevice::TransmitPoll(cec_logical_address dest) AddLog(CEC_LOG_NOTICE, strLog.c_str()); cec_command command; - cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE); - CLockObject lock(&m_mutex); + cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE); + CLockObject lock(&m_transmitMutex); bReturn = m_processor->Transmit(command); AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent"); @@ -506,25 +536,29 @@ bool CCECBusDevice::TransmitPoll(cec_logical_address dest) bool CCECBusDevice::TransmitPowerState(cec_logical_address dest) { + CLockObject lock(&m_mutex); CStdString 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); + lock.Leave(); return m_processor->Transmit(command); } bool CCECBusDevice::TransmitVendorID(cec_logical_address dest) { + CLockObject lock(&m_mutex); 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); + lock.Leave(); m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID); return false; } @@ -535,12 +569,13 @@ bool CCECBusDevice::TransmitVendorID(cec_logical_address dest) AddLog(CEC_LOG_NOTICE, strLog); cec_command command; - cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID); + cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_DEVICE_VENDOR_ID); - command.parameters.push_back((uint8_t) (((uint64_t)m_vendor >> 16) & 0xFF)); - command.parameters.push_back((uint8_t) (((uint64_t)m_vendor >> 8) & 0xFF)); - command.parameters.push_back((uint8_t) ((uint64_t)m_vendor & 0xFF)); + 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)); + lock.Leave(); return m_processor->Transmit(command); } }