From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sun, 30 Oct 2011 22:40:48 +0000 (+0100)
Subject: cec: don't use shared_ptr when not needed in CCECProcessor
X-Git-Tag: upstream/2.2.0~1^2~153
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=0e7b6c547a0b1606c0da80c4f6c49ac37e02aaa7;p=deb_libcec.git

cec: don't use shared_ptr when not needed in CCECProcessor
---

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index e3f7517..79cee66 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -103,7 +103,6 @@ void *CCECProcessor::Process(void)
 
   cec_command           command;
   CCECAdapterMessage    msg;
-  CCECAdapterMessagePtr msgPtr;
 
   m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
 
@@ -115,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)
@@ -379,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");
@@ -397,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());
@@ -415,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());
     }
@@ -429,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:
diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index c7af22d..6c62c9f 100644
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -82,7 +82,7 @@ namespace CEC
     private:
       void LogOutput(const cec_command &data);
       bool WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout = 1000);
-      bool ParseMessage(CCECAdapterMessagePtr msg);
+      bool ParseMessage(const CCECAdapterMessage &msg);
       void ParseCommand(cec_command &command);
 
       cec_command                      m_currentframe;