cec: buffer up commands that are received while waiting for an ack. only send 'active...

[deb_libcec.git] / src / lib / CECProcessor.cpp

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index b9f2c5188c6f72a89db86286ad42b4c1119012bc..c179e82837e12e3113fe5a1fd73fc41da531b9d5 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -34,6 +34,11 @@
 
 #include "AdapterCommunication.h"
 #include "devices/CECBusDevice.h"
+#include "devices/CECAudioSystem.h"
+#include "devices/CECPlaybackDevice.h"
+#include "devices/CECRecordingDevice.h"
+#include "devices/CECTuner.h"
+#include "devices/CECTV.h"
 #include "LibCEC.h"
 #include "util/StdString.h"
 #include "platform/timeutils.h"
@@ -65,7 +70,36 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm
 {
   m_logicalAddresses.clear();
   for (int iPtr = 0; iPtr < 16; iPtr++)
-    m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0);
+  {
+    switch(iPtr)
+    {
+    case CECDEVICE_AUDIOSYSTEM:
+      m_busDevices[iPtr] = new CCECAudioSystem(this, (cec_logical_address) iPtr, 0xFFFF);
+      break;
+    case CECDEVICE_PLAYBACKDEVICE1:
+    case CECDEVICE_PLAYBACKDEVICE2:
+    case CECDEVICE_PLAYBACKDEVICE3:
+      m_busDevices[iPtr] = new CCECPlaybackDevice(this, (cec_logical_address) iPtr, 0xFFFF);
+      break;
+    case CECDEVICE_RECORDINGDEVICE1:
+    case CECDEVICE_RECORDINGDEVICE2:
+    case CECDEVICE_RECORDINGDEVICE3:
+      m_busDevices[iPtr] = new CCECRecordingDevice(this, (cec_logical_address) iPtr, 0xFFFF);
+      break;
+    case CECDEVICE_TUNER1:
+    case CECDEVICE_TUNER2:
+    case CECDEVICE_TUNER3:
+    case CECDEVICE_TUNER4:
+      m_busDevices[iPtr] = new CCECTuner(this, (cec_logical_address) iPtr, 0xFFFF);
+      break;
+    case CECDEVICE_TV:
+      m_busDevices[iPtr] = new CCECTV(this, (cec_logical_address) iPtr, 0);
+      break;
+    default:
+      m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0xFFFF);
+      break;
+    }
+  }
 }
 
 CCECProcessor::~CCECProcessor(void)
@@ -102,25 +136,30 @@ bool CCECProcessor::Start(void)
   return false;
 }
 
-bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *strLabel)
+bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *strLabel, unsigned int iIndex)
 {
   CStdString strLog;
   strLog.Format("trying logical address '%s'", strLabel);
   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);
 
-    /* only set our OSD name for the primary device */
+    /* only set our OSD name and active source for the primary device */
     if (m_logicalAddresses.empty())
+    {
       m_busDevices[address]->m_strDeviceName = m_strDeviceName;
+      m_busDevices[address]->m_bActiveSource = true;
+    }
+    m_busDevices[address]->m_powerStatus = (m_types[0] == m_busDevices[address]->m_type) ? CEC_POWER_STATUS_ON : CEC_POWER_STATUS_STANDBY;
+    m_busDevices[address]->m_cecVersion = CEC_VERSION_1_3A;
     m_logicalAddresses.set(address);
 
     // TODO
-    m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS);
+    m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS + (iIndex * 0x100));
 
     return true;
   }
@@ -130,35 +169,35 @@ bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *s
   return false;
 }
 
-bool CCECProcessor::FindLogicalAddressRecordingDevice(void)
+bool CCECProcessor::FindLogicalAddressRecordingDevice(unsigned int iIndex)
 {
   AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'recording device'");
-  return TryLogicalAddress(CECDEVICE_RECORDINGDEVICE1, "recording 1") ||
-      TryLogicalAddress(CECDEVICE_RECORDINGDEVICE2, "recording 2") ||
-      TryLogicalAddress(CECDEVICE_RECORDINGDEVICE3, "recording 3");
+  return TryLogicalAddress(CECDEVICE_RECORDINGDEVICE1, "recording 1", iIndex) ||
+      TryLogicalAddress(CECDEVICE_RECORDINGDEVICE2, "recording 2", iIndex) ||
+      TryLogicalAddress(CECDEVICE_RECORDINGDEVICE3, "recording 3", iIndex);
 }
 
-bool CCECProcessor::FindLogicalAddressTuner(void)
+bool CCECProcessor::FindLogicalAddressTuner(unsigned int iIndex)
 {
   AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'tuner'");
-  return TryLogicalAddress(CECDEVICE_TUNER1, "tuner 1") ||
-      TryLogicalAddress(CECDEVICE_TUNER2, "tuner 2") ||
-      TryLogicalAddress(CECDEVICE_TUNER3, "tuner 3") ||
-      TryLogicalAddress(CECDEVICE_TUNER4, "tuner 4");
+  return TryLogicalAddress(CECDEVICE_TUNER1, "tuner 1", iIndex) ||
+      TryLogicalAddress(CECDEVICE_TUNER2, "tuner 2", iIndex) ||
+      TryLogicalAddress(CECDEVICE_TUNER3, "tuner 3", iIndex) ||
+      TryLogicalAddress(CECDEVICE_TUNER4, "tuner 4", iIndex);
 }
 
-bool CCECProcessor::FindLogicalAddressPlaybackDevice(void)
+bool CCECProcessor::FindLogicalAddressPlaybackDevice(unsigned int iIndex)
 {
   AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'playback device'");
-  return TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE1, "playback 1") ||
-      TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE2, "playback 2") ||
-      TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE3, "playback 3");
+  return TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE1, "playback 1", iIndex) ||
+      TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE2, "playback 2", iIndex) ||
+      TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE3, "playback 3", iIndex);
 }
 
-bool CCECProcessor::FindLogicalAddressAudioSystem(void)
+bool CCECProcessor::FindLogicalAddressAudioSystem(unsigned int iIndex)
 {
   AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'audio'");
-  return TryLogicalAddress(CECDEVICE_AUDIOSYSTEM, "audio");
+  return TryLogicalAddress(CECDEVICE_AUDIOSYSTEM, "audio", iIndex);
 }
 
 bool CCECProcessor::FindLogicalAddresses(void)
@@ -176,13 +215,13 @@ bool CCECProcessor::FindLogicalAddresses(void)
     AddLog(CEC_LOG_DEBUG, strLog);
 
     if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RECORDING_DEVICE)
-      bReturn &= FindLogicalAddressRecordingDevice();
+      bReturn &= FindLogicalAddressRecordingDevice(iPtr);
     if (m_types.types[iPtr] == CEC_DEVICE_TYPE_TUNER)
-      bReturn &= FindLogicalAddressTuner();
+      bReturn &= FindLogicalAddressTuner(iPtr);
     if (m_types.types[iPtr] == CEC_DEVICE_TYPE_PLAYBACK_DEVICE)
-      bReturn &= FindLogicalAddressPlaybackDevice();
+      bReturn &= FindLogicalAddressPlaybackDevice(iPtr);
     if (m_types.types[iPtr] == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
-      bReturn &= FindLogicalAddressAudioSystem();
+      bReturn &= FindLogicalAddressAudioSystem(iPtr);
   }
 
   return bReturn;
@@ -190,6 +229,7 @@ bool CCECProcessor::FindLogicalAddresses(void)
 
 void *CCECProcessor::Process(void)
 {
+  bool                  bParseFrame(false);
   cec_command           command;
   CCECAdapterMessage    msg;
 
@@ -214,24 +254,26 @@ void *CCECProcessor::Process(void)
 
   while (!IsStopped())
   {
-    bool bParseFrame(false);
     command.clear();
     msg.clear();
 
     {
       CLockObject lock(&m_mutex);
-      if (m_communication->IsOpen() && m_communication->Read(msg, 50))
+      if (m_commandBuffer.Pop(command))
+      {
+        bParseFrame = true;
+      }
+      else if (m_communication->IsOpen() && m_communication->Read(msg, 50))
       {
         m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
-        bParseFrame = ParseMessage(msg) && !IsStopped();
+        if ((bParseFrame = (ParseMessage(msg) && !IsStopped())))
+          command = m_currentframe;
       }
-
-      if (bParseFrame)
-        command = m_currentframe;
     }
 
     if (bParseFrame)
       ParseCommand(command);
+    bParseFrame = false;
 
     Sleep(5);
 
@@ -252,7 +294,7 @@ bool CCECProcessor::SetActiveView(void)
     return false;
 
   if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
-    return m_busDevices[m_logicalAddresses.primary]->BroadcastActiveView();
+    return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
   return false;
 }
 
@@ -262,7 +304,7 @@ bool CCECProcessor::SetInactiveView(void)
     return false;
 
   if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
-    return m_busDevices[m_logicalAddresses.primary]->BroadcastInactiveView();
+    return m_busDevices[m_logicalAddresses.primary]->TransmitInactiveView();
   return false;
 }
 
@@ -298,7 +340,7 @@ bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
   if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
   {
     m_busDevices[m_logicalAddresses.primary]->SetPhysicalAddress(iPhysicalAddress);
-    return m_busDevices[m_logicalAddresses.primary]->BroadcastActiveView();
+    return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
   }
   return false;
 }
@@ -319,7 +361,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;
 }
 
@@ -385,7 +427,7 @@ bool CCECProcessor::Transmit(CCECAdapterMessage *output)
     if (output->transmit_timeout > 0)
     {
       if ((bReturn = WaitForTransmitSucceeded(output->size(), output->transmit_timeout)) == false)
-        m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
+        m_controller->AddLog(CEC_LOG_DEBUG, "did not receive ack");
     }
     else
       bReturn = true;
@@ -441,7 +483,8 @@ bool CCECProcessor::WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout
         bError = !bTransmitSucceeded;
         break;
       default:
-        ParseMessage(msg);
+        if (ParseMessage(msg))
+          m_commandBuffer.Push(m_currentframe);
       }
 
       iNow = GetTimeMs();