cec: removed framebuffer in CCECProcessor. any other packet is an unexpected reply

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

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 79cee667a9bd5f497d0cfcf0229cb9688993bf76..f0f951eba37fdb66358250a7079f9c436bdde09e 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -114,13 +114,9 @@ void *CCECProcessor::Process(void)
 
     {
       CLockObject lock(&m_mutex);
-      CCECAdapterMessagePtr msgPtr;
-      if (m_frameBuffer.Pop(msgPtr))
-        bParseFrame = ParseMessage(*msgPtr.get());
-      else if (m_communication->IsOpen() && m_communication->Read(msg, 50))
-        bParseFrame = ParseMessage(msg);
+      if (m_communication->IsOpen() && m_communication->Read(msg, 50))
+        bParseFrame = ParseMessage(msg) && !IsStopped();
 
-      bParseFrame &= !IsStopped();
       if (bParseFrame)
         command = m_currentframe;
     }
@@ -365,8 +361,10 @@ bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout
       *bError = true;
       break;
     default:
-      CCECAdapterMessagePtr msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
-      m_frameBuffer.Push(msgPtr);
+      CStdString strLog;
+      strLog.Format("received unexpected reply '%2x'", msg.message());
+      m_controller->AddLog(CEC_LOG_WARNING, strLog);
+      *bError = true;
       break;
     }