X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.h;h=fcb2817a67b3b4d7dc431bdbdbfd4010827bad3a;hb=4a75b661e3c3b1f6c15f81b5d7dd277db30ed94e;hp=8ce9c5b790d82dab14cdc13d01c0a585c67d9f8e;hpb=25701fa60407a0fc0bc1dfcd4049fc01ad9e4fd1;p=deb_libcec.git

diff --git a/src/lib/AdapterCommunication.h b/src/lib/AdapterCommunication.h
index 8ce9c5b..fcb2817 100644
--- a/src/lib/AdapterCommunication.h
+++ b/src/lib/AdapterCommunication.h
@@ -31,7 +31,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#include "../../include/CECExports.h"
+#include <cectypes.h>
 #include "platform/threads.h"
 #include <string>
 
@@ -40,25 +40,27 @@ namespace CEC
   class CSerialPort;
   class CLibCEC;
 
-  class CAdapterCommunication : CThread
+  class CAdapterCommunication : private CThread
   {
   public:
     CAdapterCommunication(CLibCEC *controller);
     virtual ~CAdapterCommunication();
 
     bool Open(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
-    bool Read(cec_frame &msg, uint32_t iTimeout = 1000);
-    bool Write(const cec_frame &frame);
+    bool Read(cec_adapter_message &msg, uint32_t iTimeout = 1000);
+    bool Write(const cec_adapter_message &frame);
     bool PingAdapter(void);
     void Close(void);
-    bool IsOpen(void) const { return !m_bStop && m_bStarted; }
+    bool IsOpen(void) const;
     std::string GetError(void) const;
 
     void *Process(void);
 
     bool StartBootloader(void);
     bool SetAckMask(uint16_t iMask);
-    static void PushEscaped(cec_frame &vec, uint8_t byte);
+    static void PushEscaped(cec_adapter_message &vec, uint8_t byte);
+    static void FormatAdapterMessage(const cec_command &command, cec_adapter_message &packet);
+
   private:
     void AddData(uint8_t *data, uint8_t iLen);
     bool ReadFromDevice(uint32_t iTimeout);
@@ -68,9 +70,8 @@ namespace CEC
     uint8_t*             m_inbuf;
     int16_t              m_iInbufSize;
     int16_t              m_iInbufUsed;
-    bool                 m_bStarted;
-    bool                 m_bStop;
-    CMutex               m_mutex;
+    CMutex               m_bufferMutex;
+    CMutex               m_commMutex;
     CCondition           m_rcvCondition;
   };
 };