X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=79cee667a9bd5f497d0cfcf0229cb9688993bf76;hb=0e7b6c547a0b1606c0da80c4f6c49ac37e02aaa7;hp=277009b83a9621de3a645d78ab195a7f9f03eb34;hpb=8b0ee2cc959ab9d0b30c21615c25f6447d1f8566;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 277009b..79cee66 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -42,11 +42,12 @@ using namespace CEC; using namespace std; CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) : - m_iLogicalAddress(CECDEVICE_UNKNOWN), + m_iLogicalAddress(iLogicalAddress), m_strDeviceName(strDeviceName), m_communication(serComm), m_controller(controller), - m_bMonitor(false) + m_bMonitor(false), + m_bLogicalAddressSet(false) { for (int iPtr = 0; iPtr < 16; iPtr++) m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, iPtr == iLogicalAddress ? iPhysicalAddress : 0); @@ -102,7 +103,6 @@ void *CCECProcessor::Process(void) cec_command command; CCECAdapterMessage msg; - CCECAdapterMessagePtr msgPtr; m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress); @@ -114,13 +114,11 @@ void *CCECProcessor::Process(void) { CLockObject lock(&m_mutex); + CCECAdapterMessagePtr msgPtr; if (m_frameBuffer.Pop(msgPtr)) - bParseFrame = ParseMessage(msgPtr); + bParseFrame = ParseMessage(*msgPtr.get()); else if (m_communication->IsOpen() && m_communication->Read(msg, 50)) - { - msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg)); - bParseFrame = ParseMessage(msgPtr); - } + bParseFrame = ParseMessage(msg); bParseFrame &= !IsStopped(); if (bParseFrame) @@ -147,7 +145,9 @@ bool CCECProcessor::SetActiveView(void) if (!IsRunning()) return false; - return m_busDevices[m_iLogicalAddress]->BroadcastActiveView(); + if (m_iLogicalAddress != CECDEVICE_UNKNOWN && m_busDevices[m_iLogicalAddress]) + return m_busDevices[m_iLogicalAddress]->BroadcastActiveView(); + return false; } bool CCECProcessor::SetInactiveView(void) @@ -155,7 +155,9 @@ bool CCECProcessor::SetInactiveView(void) if (!IsRunning()) return false; - return m_busDevices[m_iLogicalAddress]->BroadcastInactiveView(); + if (m_iLogicalAddress != CECDEVICE_UNKNOWN && m_busDevices[m_iLogicalAddress]) + return m_busDevices[m_iLogicalAddress]->BroadcastInactiveView(); + return false; } void CCECProcessor::LogOutput(const cec_command &data) @@ -168,25 +170,31 @@ void CCECProcessor::LogOutput(const cec_command &data) m_controller->AddLog(CEC_LOG_TRAFFIC, strTx.c_str()); } -bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress) +bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress /* = CECDEVICE_UNKNOWN */) { - if (m_iLogicalAddress != iLogicalAddress) + if (iLogicalAddress != CECDEVICE_UNKNOWN) { CStdString strLog; strLog.Format("<< setting logical address to %1x", iLogicalAddress); m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str()); - m_iLogicalAddress = iLogicalAddress; - return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress); + m_bLogicalAddressSet = false; } - return true; + if (!m_bLogicalAddressSet && m_iLogicalAddress != CECDEVICE_UNKNOWN) + m_bLogicalAddressSet = m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress); + + return m_bLogicalAddressSet; } bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress) { - m_busDevices[m_iLogicalAddress]->SetPhysicalAddress(iPhysicalAddress); - return m_busDevices[m_iLogicalAddress]->BroadcastActiveView(); + if (m_iLogicalAddress != CECDEVICE_UNKNOWN && m_busDevices[m_iLogicalAddress]) + { + m_busDevices[m_iLogicalAddress]->SetPhysicalAddress(iPhysicalAddress); + return m_busDevices[m_iLogicalAddress]->BroadcastActiveView(); + } + return false; } bool CCECProcessor::SwitchMonitoring(bool bEnable) @@ -202,8 +210,39 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable) return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress); } +cec_version CCECProcessor::GetDeviceCecVersion(cec_logical_address iAddress) +{ + return m_busDevices[iAddress]->GetCecVersion(); +} + +bool CCECProcessor::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language) +{ + if (m_busDevices[iAddress]) + { + *language = m_busDevices[iAddress]->GetMenuLanguage(); + return (strcmp(language->language, "???") == 0); + } + return false; +} + +uint64_t CCECProcessor::GetDeviceVendorId(cec_logical_address iAddress) +{ + if (m_busDevices[iAddress]) + return m_busDevices[iAddress]->GetVendorId(); + return false; +} + +cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddress) +{ + if (m_busDevices[iAddress]) + return m_busDevices[iAddress]->GetPowerStatus(); + return CEC_POWER_STATUS_UNKNOWN; +} + bool CCECProcessor::Transmit(const cec_command &data) { + SetLogicalAddress(); + bool bReturn(false); LogOutput(data); @@ -216,24 +255,24 @@ bool CCECProcessor::Transmit(const cec_command &data) return bReturn; else { - output->condition.Wait(&output->mutex); + output->condition.Wait(&output->mutex, 1000); if (output->state != ADAPTER_MESSAGE_STATE_SENT) { m_controller->AddLog(CEC_LOG_ERROR, "command was not sent"); return bReturn; } } - } - if (data.ack_timeout > 0) - { - bool bError(false); - if ((bReturn = WaitForAck(&bError, output->size(), data.ack_timeout)) == false) - m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack"); - } - else - { - bReturn = true; + if (data.ack_timeout > 0) + { + bool bError(false); + if ((bReturn = WaitForAck(&bError, output->size(), data.ack_timeout)) == false) + m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack"); + } + else + { + bReturn = true; + } } return bReturn; @@ -337,16 +376,16 @@ bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout return bTransmitSucceeded && !*bError; } -bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr msg) +bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg) { bool bEom = false; - if (msg->empty()) + if (msg.empty()) return bEom; CStdString logStr; - switch(msg->message()) + switch(msg.message()) { case MSGCODE_NOTHING: m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_NOTHING"); @@ -355,15 +394,15 @@ bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr msg) case MSGCODE_HIGH_ERROR: case MSGCODE_LOW_ERROR: { - if (msg->message() == MSGCODE_TIMEOUT_ERROR) + if (msg.message() == MSGCODE_TIMEOUT_ERROR) logStr = "MSGCODE_TIMEOUT"; - else if (msg->message() == MSGCODE_HIGH_ERROR) + else if (msg.message() == MSGCODE_HIGH_ERROR) logStr = "MSGCODE_HIGH_ERROR"; else logStr = "MSGCODE_LOW_ERROR"; - int iLine = (msg->size() >= 3) ? (msg->at(1) << 8) | (msg->at(2)) : 0; - uint32_t iTime = (msg->size() >= 7) ? (msg->at(3) << 24) | (msg->at(4) << 16) | (msg->at(5) << 8) | (msg->at(6)) : 0; + int iLine = (msg.size() >= 3) ? (msg[1] << 8) | (msg[2]) : 0; + uint32_t iTime = (msg.size() >= 7) ? (msg[3] << 24) | (msg[4] << 16) | (msg[5] << 8) | (msg[6]) : 0; logStr.AppendFormat(" line:%i", iLine); logStr.AppendFormat(" time:%u", iTime); m_controller->AddLog(CEC_LOG_WARNING, logStr.c_str()); @@ -373,13 +412,13 @@ bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr msg) { logStr = "MSGCODE_FRAME_START"; m_currentframe.clear(); - if (msg->size() >= 2) + if (msg.size() >= 2) { - logStr.AppendFormat(" initiator:%u destination:%u ack:%s %s", msg->initiator(), msg->destination(), msg->ack() ? "high" : "low", msg->eom() ? "eom" : ""); - m_currentframe.initiator = msg->initiator(); - m_currentframe.destination = msg->destination(); - m_currentframe.ack = msg->ack(); - m_currentframe.eom = msg->eom(); + logStr.AppendFormat(" initiator:%1x destination:%1x ack:%s %s", msg.initiator(), msg.destination(), msg.ack() ? "high" : "low", msg.eom() ? "eom" : ""); + m_currentframe.initiator = msg.initiator(); + m_currentframe.destination = msg.destination(); + m_currentframe.ack = msg.ack(); + m_currentframe.eom = msg.eom(); } m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str()); } @@ -387,16 +426,16 @@ bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr msg) case MSGCODE_FRAME_DATA: { logStr = "MSGCODE_FRAME_DATA"; - if (msg->size() >= 2) + if (msg.size() >= 2) { - uint8_t iData = msg->at(1); + uint8_t iData = msg[1]; logStr.AppendFormat(" %02x", iData); m_currentframe.push_back(iData); - m_currentframe.eom = msg->eom(); + m_currentframe.eom = msg.eom(); } m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str()); - bEom = msg->eom(); + bEom = msg.eom(); } break; case MSGCODE_COMMAND_ACCEPTED: @@ -444,7 +483,9 @@ void CCECProcessor::ParseCommand(cec_command &command) uint16_t CCECProcessor::GetPhysicalAddress(void) const { - return m_busDevices[m_iLogicalAddress]->GetPhysicalAddress(); + if (m_iLogicalAddress != CECDEVICE_UNKNOWN && m_busDevices[m_iLogicalAddress]) + return m_busDevices[m_iLogicalAddress]->GetPhysicalAddress(); + return false; } void CCECProcessor::SetCurrentButton(cec_user_control_code iButtonCode)