renamed: CECExports.h => cec.h, CECExportsC.h => cecc.h, CECLoader.h => cecloader...

[deb_libcec.git] / src / lib / LibCEC.h

diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h
index cb9eb8c6e6e538691a098bf3581d076cbfff7174..2ad32dafb64eb76dafb23bbbcea30a8d7f773c7a 100644 (file)
--- a/src/lib/LibCEC.h
+++ b/src/lib/LibCEC.h
@@ -31,8 +31,8 @@
  *     http://www.pulse-eight.net/
  */
 
-#include "../../include/CECExports.h"
-#include "../../include/CECTypes.h"
+#include <string>
+#include <cec.h>
 #include "util/buffer.h"
 
 namespace CEC
@@ -47,23 +47,23 @@ namespace CEC
      * ICECAdapter implementation
      */
     //@{
-      CLibCEC(const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, uint8_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS);
+      CLibCEC(const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS);
       virtual ~CLibCEC(void);
 
-      virtual bool Open(const char *strPort, uint64_t iTimeout = 10000);
+      virtual bool Open(const char *strPort, uint32_t iTimeout = 10000);
       virtual void Close(void);
-      virtual int  FindAdapters(std::vector<cec_adapter> &deviceList, const char *strDevicePath = NULL);
+      virtual int8_t FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL);
       virtual bool PingAdapter(void);
       virtual bool StartBootloader(void);
 
-      virtual int  GetMinVersion(void);
-      virtual int  GetLibVersion(void);
+      virtual int8_t GetMinVersion(void);
+      virtual int8_t GetLibVersion(void);
 
       virtual bool GetNextLogMessage(cec_log_message *message);
       virtual bool GetNextKeypress(cec_keypress *key);
       virtual bool GetNextCommand(cec_command *command);
 
-      virtual bool Transmit(const cec_frame &data, bool bWaitForAck = true);
+      virtual bool Transmit(const cec_command &data, bool bWaitForAck = true);
       virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress);
 
       virtual bool PowerOnDevices(cec_logical_address address = CECDEVICE_TV);
@@ -74,11 +74,12 @@ namespace CEC
 
       virtual void AddLog(cec_log_level level, const std::string &strMessage);
       virtual void AddKey(void);
-      virtual void AddCommand(cec_logical_address source, cec_logical_address destination, cec_opcode opcode, cec_frame *parameters);
+      virtual void AddCommand(cec_command &command);
       virtual void CheckKeypressTimeout(void);
       virtual void SetCurrentButton(cec_user_control_code iButtonCode);
 
     protected:
+      int64_t                    m_iStartTime;
       cec_user_control_code      m_iCurrentButton;
       int64_t                    m_buttontime;
       CCECProcessor             *m_cec;