X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FCECCommandHandler.h;h=32c0d5462881033d352def1ea402e6de233819bc;hb=3a590d6a4652d1c47026446dcdc44ac9852f8af3;hp=f3d3d0c5fa4cb2bb06609bc1c823d7b01a2abf3d;hpb=6f14b51266d3af3f215171a4a5fca5be011c023e;p=deb_libcec.git

diff --git a/src/lib/implementations/CECCommandHandler.h b/src/lib/implementations/CECCommandHandler.h
index f3d3d0c..32c0d54 100644
--- a/src/lib/implementations/CECCommandHandler.h
+++ b/src/lib/implementations/CECCommandHandler.h
@@ -2,7 +2,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -33,8 +33,8 @@
 
 #include <cectypes.h>
 #include <vector>
-#include "../util/StdString.h"
-#include "../platform/os-dependent.h"
+#include "../platform/threads/mutex.h"
+#include "../platform/util/StdString.h"
 
 namespace CEC
 {
@@ -135,17 +135,17 @@ namespace CEC
 
     virtual bool Transmit(cec_command &command, bool bExpectResponse = true, cec_opcode expectedResponse = CEC_OPCODE_NONE);
 
-    CCECBusDevice *m_busDevice;
-    CCECProcessor *m_processor;
-    int32_t        m_iTransmitTimeout;
-    int32_t        m_iTransmitWait;
-    int8_t         m_iTransmitRetries;
-    bool           m_bHandlerInited;
-    uint8_t        m_iUseCounter;
-    cec_opcode     m_expectedResponse;
-    bool           m_bOPTSendDeckStatusUpdateOnActiveSource;
-    cec_vendor_id  m_vendorId;
-    CMutex         m_receiveMutex;
-    CCondition     m_condition;
+    CCECBusDevice *      m_busDevice;
+    CCECProcessor *      m_processor;
+    int32_t              m_iTransmitTimeout;
+    int32_t              m_iTransmitWait;
+    int8_t               m_iTransmitRetries;
+    bool                 m_bHandlerInited;
+    uint8_t              m_iUseCounter;
+    cec_opcode           m_expectedResponse;
+    bool                 m_bOPTSendDeckStatusUpdateOnActiveSource;
+    cec_vendor_id        m_vendorId;
+    PLATFORM::CMutex     m_receiveMutex;
+    PLATFORM::CCondition m_condition;
   };
 };