cec: use the local cec.h/cectypes.h instead of system wide when compiling libCEC...

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

diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h
index 20b6ccd6f8cd0879bfe8d083a8cbe9c42a60a26a..ad2eca97571deafe022bbd564f02ca2c242324ce 100644 (file)
--- a/src/lib/LibCEC.h
+++ b/src/lib/LibCEC.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.
@@ -32,8 +32,8 @@
  */
 
 #include <string>
-#include <cec.h>
-#include "platform/os.h"
+#include "../../include/cec.h"
+#include "platform/util/buffer.h"
 
 namespace CEC
 {
@@ -99,6 +99,9 @@ namespace CEC
       virtual bool EnablePhysicalAddressDetection(void);
       virtual cec_logical_address GetActiveSource(void);
       virtual bool IsActiveSource(cec_logical_address iAddress);
+      virtual bool SetStreamPath(cec_logical_address iAddress);
+      virtual bool SetStreamPath(uint16_t iPhysicalAddress);
+      virtual cec_logical_addresses GetLogicalAddresses(void);
 
       const char *ToString(const cec_menu_state state);
       const char *ToString(const cec_version version);
@@ -112,12 +115,15 @@ namespace CEC
       const char *ToString(const cec_vendor_id vendor);
     //@}
 
-      virtual void AddLog(cec_log_level level, const std::string &strMessage);
-      virtual void AddKey(void);
-      virtual void AddKey(cec_keypress &key);
-      virtual void AddCommand(const cec_command &command);
+      static void AddLog(cec_log_level level, const char *strFormat, ...);
+      static void AddKey(void);
+      static void AddKey(cec_keypress &key);
+      static void AddCommand(const cec_command &command);
+      static void SetCurrentButton(cec_user_control_code iButtonCode);
       virtual void CheckKeypressTimeout(void);
-      virtual void SetCurrentButton(cec_user_control_code iButtonCode);
+
+      static CLibCEC *GetInstance(void);
+      static void SetInstance(CLibCEC *instance);
 
     protected:
       int64_t                                 m_iStartTime;