X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=660fee0ffc98053507a1f5142e0f8f326a27a200;hb=403398523c7fbae86cbc527473ea54d78bb3d763;hp=339653c3bf8164fa988897d91bded8e98857468b;hpb=2abe74ebbd27d8c30060b3eebb363e10d3fbfd80;p=deb_libcec.git

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index 339653c..660fee0 100644
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -31,9 +31,10 @@
  *     http://www.pulse-eight.net/
  */
 
+#include <string>
 #include "../../include/CECExports.h"
 #include "../../include/CECTypes.h"
-#include "util/threads.h"
+#include "platform/threads.h"
 #include "util/buffer.h"
 
 class CSerialPort;
@@ -46,7 +47,7 @@ namespace CEC
   class CCECProcessor : public CThread
   {
     public:
-      CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, int iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS);
+      CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS);
       virtual ~CCECProcessor(void);
 
       virtual bool Start(void);
@@ -71,12 +72,12 @@ namespace CEC
       virtual uint8_t GetSourceDestination(cec_logical_address destination = CECDEVICE_BROADCAST) const;
 
     private:
-      bool WaitForAck(int iTimeout = 1000);
+      bool WaitForAck(uint32_t iTimeout = 1000);
       bool ParseMessage(cec_frame &msg);
-      void ParseCurrentFrame(void);
+      void ParseCurrentFrame(cec_frame &frame);
 
       cec_frame                  m_currentframe;
-      int                        m_physicaladdress;
+      uint16_t                   m_physicaladdress;
       cec_logical_address        m_iLogicalAddress;
       CecBuffer<cec_frame>       m_frameBuffer;
       std::string                m_strDeviceName;