X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=e3f75173f7ca619e184582e11bb6f9fe0792d3c2;hb=465ab2f15fbb14a26f0f7a3139e0fe981fabc8f0;hp=b5cd540fb9135d26a1685a47f3c20406e87a41d8;hpb=3f9b82aa7229403771e0b5d33087e75084631891;p=deb_libcec.git

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index b5cd540..e3f7517 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -46,7 +46,8 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm
     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);
@@ -54,6 +55,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm
 
 CCECProcessor::~CCECProcessor(void)
 {
+  m_startCondition.Broadcast();
   StopThread();
   m_communication = NULL;
   m_controller = NULL;
@@ -63,6 +65,7 @@ CCECProcessor::~CCECProcessor(void)
 
 bool CCECProcessor::Start(void)
 {
+  CLockObject lock(&m_mutex);
   if (!m_communication || !m_communication->IsOpen())
   {
     m_controller->AddLog(CEC_LOG_ERROR, "connection is closed");
@@ -76,7 +79,14 @@ bool CCECProcessor::Start(void)
   }
 
   if (CreateThread())
+  {
+    if (!m_startCondition.Wait(&m_mutex))
+    {
+      m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+      return false;
+    }
     return true;
+  }
   else
     m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
 
@@ -85,10 +95,17 @@ bool CCECProcessor::Start(void)
 
 void *CCECProcessor::Process(void)
 {
-  m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+  {
+    CLockObject lock(&m_mutex);
+    m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+    m_startCondition.Signal();
+  }
 
-  cec_command command;
-  CCECAdapterMessage msg;
+  cec_command           command;
+  CCECAdapterMessage    msg;
+  CCECAdapterMessagePtr msgPtr;
+
+  m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
 
   while (!IsStopped())
   {
@@ -98,8 +115,13 @@ void *CCECProcessor::Process(void)
 
     {
       CLockObject lock(&m_mutex);
-      if (m_communication->IsOpen() && m_communication->Read(msg, 50))
-        bParseFrame = ParseMessage(msg);
+      if (m_frameBuffer.Pop(msgPtr))
+        bParseFrame = ParseMessage(msgPtr);
+      else if (m_communication->IsOpen() && m_communication->Read(msg, 50))
+      {
+        msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
+        bParseFrame = ParseMessage(msgPtr);
+      }
 
       bParseFrame &= !IsStopped();
       if (bParseFrame)
@@ -126,7 +148,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)
@@ -134,7 +158,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)
@@ -147,20 +173,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 */)
 {
-  CStdString strLog;
-  strLog.Format("<< setting logical address to %1x", iLogicalAddress);
-  m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+  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;
+    m_bLogicalAddressSet = false;
+  }
 
-  m_iLogicalAddress = iLogicalAddress;
-  return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+  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)
@@ -176,26 +213,69 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable)
     return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
 }
 
-bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true */)
+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);
 
-  CCECAdapterMessage output(data);
+  CCECAdapterMessagePtr output(new CCECAdapterMessage(data));
 
   CLockObject lock(&m_mutex);
-  if (!m_communication || !m_communication->Write(output))
-    return bReturn;
-
-  if (bWaitForAck)
   {
-    bool bError(false);
-    if ((bReturn = WaitForAck(&bError, output.size(), 1000)) == false)
-      m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
-  }
-  else
-  {
-    bReturn = true;
+    CLockObject msgLock(&output->mutex);
+    if (!m_communication || !m_communication->Write(output))
+      return bReturn;
+    else
+    {
+      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;
+    }
   }
 
   return bReturn;
@@ -288,7 +368,8 @@ bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout
       *bError = true;
       break;
     default:
-      m_frameBuffer.Push(msg);
+      CCECAdapterMessagePtr msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
+      m_frameBuffer.Push(msgPtr);
       break;
     }
 
@@ -298,16 +379,16 @@ bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout
   return bTransmitSucceeded && !*bError;
 }
 
-bool CCECProcessor::ParseMessage(CCECAdapterMessage &msg)
+bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr 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");
@@ -316,15 +397,15 @@ bool CCECProcessor::ParseMessage(CCECAdapterMessage &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[1] << 8) | (msg[2]) : 0;
-      uint32_t iTime = (msg.size() >= 7) ? (msg[3] << 24) | (msg[4] << 16) | (msg[5] << 8) | (msg[6]) : 0;
+      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;
       logStr.AppendFormat(" line:%i", iLine);
       logStr.AppendFormat(" time:%u", iTime);
       m_controller->AddLog(CEC_LOG_WARNING, logStr.c_str());
@@ -334,13 +415,13 @@ bool CCECProcessor::ParseMessage(CCECAdapterMessage &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:%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();
       }
       m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
     }
@@ -348,16 +429,16 @@ bool CCECProcessor::ParseMessage(CCECAdapterMessage &msg)
   case MSGCODE_FRAME_DATA:
     {
       logStr = "MSGCODE_FRAME_DATA";
-      if (msg.size() >= 2)
+      if (msg->size() >= 2)
       {
-        uint8_t iData = msg[1];
+        uint8_t iData = msg->at(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:
@@ -405,7 +486,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)