X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.cpp;h=c241ed766aca4aafe94db80e6ce7fa4151762ca0;hb=1674de3796d7c1ae6a3aa600b5194c426dfa7e47;hp=3eeb295af5a34ba2c3ab5b6ec8f754a0c0fc6305;hpb=c409848208093a15758c91e3fab9fbe806a62e12;p=deb_libcec.git diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp index 3eeb295..c241ed7 100644 --- a/src/lib/devices/CECBusDevice.cpp +++ b/src/lib/devices/CECBusDevice.cpp @@ -50,11 +50,12 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi m_powerStatus(CEC_POWER_STATUS_UNKNOWN), m_processor(processor), m_vendor(CEC_VENDOR_UNKNOWN), - m_bMenuActive(true), + m_menuState(CEC_MENU_STATE_ACTIVATED), m_bActiveSource(false), m_iLastCommandSent(0), m_iLastActive(0), - m_cecVersion(CEC_VERSION_UNKNOWN) + m_cecVersion(CEC_VERSION_UNKNOWN), + m_deviceStatus(CEC_DEVICE_STATUS_UNKNOWN) { m_handler = new CCECCommandHandler(this); @@ -79,16 +80,18 @@ 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); + if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC) + m_deviceStatus = CEC_DEVICE_STATUS_PRESENT; m_condition.Signal(); return true; } 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,31 +103,27 @@ 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); } } bool CCECBusDevice::PowerOn(void) { - 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()); - - SetPowerStatus(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); - - return m_processor->Transmit(command); + cec_command command; + cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON); + if (m_processor->Transmit(command)) + { + GetPowerStatus(); + return true; } - return true; + return false; } bool CCECBusDevice::Standby(void) @@ -134,7 +133,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,24 +142,34 @@ bool CCECBusDevice::Standby(void) //@{ cec_version CCECBusDevice::GetCecVersion(void) { + CLockObject lock(&m_mutex); if (m_cecVersion == CEC_VERSION_UNKNOWN) { - 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); - } + lock.Leave(); + RequestCecVersion(); + lock.Lock(); } return m_cecVersion; } +bool CCECBusDevice::RequestCecVersion(void) +{ + bool bReturn(false); + 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_transmitMutex); + if (m_processor->Transmit(command)) + bReturn = m_condition.Wait(&m_transmitMutex, 1000); + } + return bReturn; +} + const char* CCECBusDevice::GetLogicalAddressName(void) const { return ToString(m_iLogicalAddress); @@ -168,24 +177,33 @@ const char* CCECBusDevice::GetLogicalAddressName(void) const cec_menu_language &CCECBusDevice::GetMenuLanguage(void) { + CLockObject lock(&m_mutex); if (!strcmp(m_menuLanguage.language, "???")) { - 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); - } + lock.Leave(); + RequestMenuLanguage(); + lock.Lock(); } - return m_menuLanguage; } +bool CCECBusDevice::RequestMenuLanguage(void) +{ + bool bReturn(false); + 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_transmitMutex); + if (m_processor->Transmit(command)) + bReturn = m_condition.Wait(&m_transmitMutex, 1000); + } + return bReturn; +} + cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const { return m_processor->GetLogicalAddress(); @@ -198,49 +216,66 @@ uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const cec_power_status CCECBusDevice::GetPowerStatus(void) { + CLockObject lock(&m_mutex); if (m_powerStatus == CEC_POWER_STATUS_UNKNOWN) { - 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); - } + lock.Leave(); + RequestPowerStatus(); + lock.Lock(); } - return m_powerStatus; } -const cec_vendor_id CCECBusDevice::GetVendorId(void) +bool CCECBusDevice::RequestPowerStatus(void) { - if (m_vendor == CEC_VENDOR_UNKNOWN) + bool bReturn(false); + 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 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)) + bReturn = m_condition.Wait(&m_transmitMutex, 1000); } + return bReturn; +} +cec_vendor_id CCECBusDevice::GetVendorId(void) +{ + CLockObject lock(&m_mutex); + if (m_vendor == CEC_VENDOR_UNKNOWN) + { + lock.Leave(); + RequestVendorId(); + lock.Lock(); + } return m_vendor; } +bool CCECBusDevice::RequestVendorId(void) +{ + bool bReturn(false); + 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_transmitMutex); + if (m_processor->Transmit(command)) + bReturn = m_condition.Wait(&m_transmitMutex, 1000); + } + return bReturn; +} + const char *CCECBusDevice::GetVendorName(void) { - GetVendorId(); - return ToString(m_vendor); + return ToString(GetVendorId()); } bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const @@ -248,6 +283,20 @@ bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const return m_processor->HasLogicalAddress(address); } +cec_bus_device_status CCECBusDevice::GetStatus(void) +{ + CLockObject lock(&m_mutex); + if (m_deviceStatus == CEC_DEVICE_STATUS_UNKNOWN) + { + if (m_processor->PollDevice(m_iLogicalAddress)) + m_deviceStatus = CEC_DEVICE_STATUS_PRESENT; + else + m_deviceStatus = CEC_DEVICE_STATUS_NOT_PRESENT; + } + + return m_deviceStatus; +} + //@} /** @name Setters */ @@ -263,6 +312,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; @@ -272,8 +322,107 @@ void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language) } } +void CCECBusDevice::SetOSDName(CStdString strName) +{ + CLockObject lock(&m_mutex); + if (m_strDeviceName != strName) + { + CStdString strLog; + strLog.Format(">> %s (%X): osd name set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, strName); + m_processor->AddLog(CEC_LOG_DEBUG, strLog); + m_strDeviceName = strName; + } +} + +void CCECBusDevice::SetMenuState(const cec_menu_state state) +{ + CLockObject lock(&m_mutex); + 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::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; +} + +bool CCECBusDevice::TryLogicalAddress(void) +{ + CStdString strLog; + strLog.Format("trying logical address '%s'", GetLogicalAddressName()); + AddLog(CEC_LOG_DEBUG, strLog); + + m_processor->SetAckMask(0x1 << m_iLogicalAddress); + if (!TransmitPoll(m_iLogicalAddress)) + { + strLog.Format("using logical address '%s'", GetLogicalAddressName()); + AddLog(CEC_LOG_NOTICE, strLog); + SetDeviceStatus(CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC); + + return true; + } + + strLog.Format("logical address '%s' already taken", GetLogicalAddressName()); + AddLog(CEC_LOG_DEBUG, strLog); + SetDeviceStatus(CEC_DEVICE_STATUS_PRESENT); + return false; +} + +void CCECBusDevice::SetDeviceStatus(const cec_bus_device_status newStatus) +{ + CLockObject lock(&m_mutex); + switch (newStatus) + { + case CEC_DEVICE_STATUS_UNKNOWN: + m_iStreamPath = 0; + m_powerStatus = CEC_POWER_STATUS_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_UNKNOWN; + m_deviceStatus = newStatus; + break; + case CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC: + m_iStreamPath = 0; + m_powerStatus = CEC_POWER_STATUS_ON; + 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_deviceStatus = newStatus; + break; + case CEC_DEVICE_STATUS_PRESENT: + case CEC_DEVICE_STATUS_NOT_PRESENT: + m_deviceStatus = newStatus; + break; + } +} + void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress) { + CLockObject lock(&m_mutex); if (iNewAddress > 0) { CStdString strLog; @@ -286,6 +435,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; @@ -295,12 +445,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; @@ -312,42 +466,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()); } //@} @@ -356,6 +513,7 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId) //@{ bool CCECBusDevice::TransmitActiveSource(void) { + CLockObject lock(&m_mutex); if (m_powerStatus != CEC_POWER_STATUS_ON) { CStdString strLog; @@ -369,10 +527,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 @@ -387,14 +546,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); } @@ -405,9 +566,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); } @@ -415,72 +576,73 @@ bool CCECBusDevice::TransmitInactiveView(void) bool CCECBusDevice::TransmitMenuState(cec_logical_address dest) { CStdString strLog; - strLog.Format("<< %s (%X) -> %s (%X): ", GetLogicalAddressName(), m_iLogicalAddress, 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); } 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; @@ -489,35 +651,49 @@ 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); + } - bReturn = m_processor->Transmit(command); AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent"); + + if (bReturn) + { + CLockObject lock(&m_mutex); + m_iLastActive = GetTimeMs(); + } + return bReturn; } 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; } @@ -528,12 +704,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); } }