X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.h;h=29b716a078553fbb63cefa6cce57e7f67fd09d17;hb=271e7778636b66aa854b31288c351b774d91bd79;hp=c9a8e8c1155de1132d85c324c702182b5123e538;hpb=220537f268251d7f12ccb0b0058be1eccf1bc214;p=deb_libcec.git

diff --git a/src/lib/AdapterCommunication.h b/src/lib/AdapterCommunication.h
index c9a8e8c..29b716a 100644
--- a/src/lib/AdapterCommunication.h
+++ b/src/lib/AdapterCommunication.h
@@ -35,60 +35,17 @@
 #include "platform/threads.h"
 #include "util/buffer.h"
 #include <string>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace CEC
 {
-  class CCECAdapterMessage
+  class CCECAdapterMessage : public boost::enable_shared_from_this<CCECAdapterMessage>
   {
   public:
     CCECAdapterMessage(void) {}
-    CCECAdapterMessage(const cec_command &command)
-    {
-      clear();
-
-      //set ack polarity to high when transmitting to the broadcast address
-      //set ack polarity low when transmitting to any other address
-      push_back(MSGSTART);
-      push_escaped(MSGCODE_TRANSMIT_ACK_POLARITY);
-      if (command.destination == CECDEVICE_BROADCAST)
-        push_escaped(CEC_TRUE);
-      else
-        push_escaped(CEC_FALSE);
-      push_back(MSGEND);
-
-      // add source and destination
-      push_back(MSGSTART);
-      push_escaped(MSGCODE_TRANSMIT);
-      push_back(((uint8_t)command.initiator << 4) + (uint8_t)command.destination);
-      push_back(MSGEND);
-
-      // add opcode
-      push_back(MSGSTART);
-      push_escaped(command.parameters.empty() ? (uint8_t)MSGCODE_TRANSMIT_EOM : (uint8_t)MSGCODE_TRANSMIT);
-      push_back((uint8_t) command.opcode);
-      push_back(MSGEND);
-
-      // add parameters
-      for (int8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
-      {
-        push_back(MSGSTART);
-
-        if (iPtr == command.parameters.size - 1)
-          push_escaped( MSGCODE_TRANSMIT_EOM);
-        else
-          push_escaped(MSGCODE_TRANSMIT);
-
-        push_escaped(command.parameters[iPtr]);
-
-        push_back(MSGEND);
-      }
-    }
-
-    CCECAdapterMessage &operator =(const CCECAdapterMessage &msg)
-    {
-      packet = msg.packet;
-      return *this;
-    }
+    CCECAdapterMessage(const cec_command &command);
+    CCECAdapterMessage &operator =(const CCECAdapterMessage &msg);
 
     bool                    empty(void) const             { return packet.empty(); }
     uint8_t                 operator[](uint8_t pos) const { return packet[pos]; }
@@ -102,19 +59,11 @@ namespace CEC
     bool                    ack(void) const               { return packet.size >= 1 ? (packet.at(0) & MSGCODE_FRAME_ACK) != 0 : false; }
     cec_logical_address     initiator(void) const         { return packet.size >= 2 ? (cec_logical_address) (packet.at(1) >> 4)  : CECDEVICE_UNKNOWN; };
     cec_logical_address     destination(void) const       { return packet.size >= 2 ? (cec_logical_address) (packet.at(1) & 0xF) : CECDEVICE_UNKNOWN; };
-    void                    push_escaped(int16_t byte)
-    {
-      if (byte >= MSGESC && byte != MSGSTART)
-      {
-        push_back(MSGESC);
-        push_back(byte - ESCOFFSET);
-      }
-      else
-         push_back(byte);
-    }
+    void                    push_escaped(int16_t byte);
 
     cec_datapacket packet;
   };
+  typedef boost::shared_ptr<CCECAdapterMessage> CCECAdapterMessagePtr;
 
   class CSerialPort;
   class CLibCEC;
@@ -127,7 +76,7 @@ namespace CEC
 
     bool Open(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
     bool Read(CCECAdapterMessage &msg, uint32_t iTimeout = 1000);
-    bool Write(const CCECAdapterMessage &frame);
+    bool Write(CCECAdapterMessagePtr data);
     bool PingAdapter(void);
     void Close(void);
     bool IsOpen(void) const;
@@ -143,12 +92,11 @@ namespace CEC
     void AddData(uint8_t *data, uint8_t iLen);
     bool ReadFromDevice(uint32_t iTimeout);
 
-    CSerialPort *                 m_port;
-    CLibCEC *                     m_controller;
-    CecBuffer<uint8_t>            m_inBuffer;
-    CecBuffer<CCECAdapterMessage> m_outBuffer;
-    CMutex                        m_bufferMutex;
-    CMutex                        m_commMutex;
-    CCondition                    m_rcvCondition;
+    CSerialPort *                    m_port;
+    CLibCEC *                        m_controller;
+    CecBuffer<uint8_t>               m_inBuffer;
+    CecBuffer<CCECAdapterMessagePtr> m_outBuffer;
+    CMutex                           m_mutex;
+    CCondition                       m_rcvCondition;
   };
 };