X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=5d0cfa2b53cbcab4e1d0fd7c49fa0d8d7f689f58;hb=15d01ae0b30a685aa5ca07407231dbc7c4ee8e58;hp=3e98cc0abc439d694faf4e413f52ed93db6bdaad;hpb=6c1a84b8ace46872191383eff5c61be3ccf610d4;p=deb_libcec.git

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index 3e98cc0..5d0cfa2 100644
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -32,7 +32,7 @@
  */
 
 #include <string>
-#include <cectypes.h>
+#include "../../include/cectypes.h"
 #include "platform/threads/threads.h"
 #include "platform/util/buffer.h"
 #include "adapter/AdapterCommunication.h"
@@ -46,12 +46,13 @@ namespace CEC
   class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback
   {
     public:
-      CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS);
-      CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types);
+      CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress, cec_client_version clientVersion);
+      CCECProcessor(CLibCEC *controller, const libcec_configuration *configuration);
       virtual ~CCECProcessor(void);
 
       virtual bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
       virtual void *Process(void);
+      virtual void Close(void);
 
       virtual bool                  OnCommandReceived(const cec_command &command);
 
@@ -76,7 +77,8 @@ namespace CEC
       virtual uint64_t              GetLastTransmission(void) const { return m_iLastTransmission; }
       virtual cec_logical_address   GetActiveSource(void);
       virtual bool                  IsActiveSource(cec_logical_address iAddress);
-      virtual bool                  IsInitialised(void) const { return m_bInitialised; }
+      virtual bool                  IsInitialised(void);
+      virtual bool                  SetStreamPath(uint16_t iPhysicalAddress);
 
       virtual bool SetActiveView(void);
       virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED);
@@ -98,6 +100,9 @@ namespace CEC
       virtual bool EnablePhysicalAddressDetection(void) { return false; };
       void SetStandardLineTimeout(uint8_t iTimeout);
       void SetRetryLineTimeout(uint8_t iTimeout);
+      virtual bool GetCurrentConfiguration(libcec_configuration *configuration);
+      virtual bool CanPersistConfiguration(void);
+      virtual bool PersistConfiguration(libcec_configuration *configuration);
 
       bool SetLineTimeout(uint8_t iTimeout);
 
@@ -112,6 +117,7 @@ namespace CEC
       const char *ToString(const cec_system_audio_status mode);
       const char *ToString(const cec_audio_status status);
       const char *ToString(const cec_vendor_id vendor);
+      const char *ToString(const cec_client_version version);
 
       virtual bool Transmit(const cec_command &data);
       virtual void TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE);
@@ -132,6 +138,7 @@ namespace CEC
       bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs);
       bool Initialise(void);
       void SetInitialised(bool bSetTo = true);
+      void CreateBusDevices(void);
 
       void ReplaceHandlers(void);
       void ScanCECBus(void);
@@ -146,6 +153,7 @@ namespace CEC
       void ParseCommand(const cec_command &command);
 
       bool                                m_bInitialised;
+      uint16_t                            m_iPhysicalAddress;
       uint8_t                             m_iHDMIPort;
       cec_logical_address                 m_iBaseDevice;
       cec_logical_addresses               m_logicalAddresses;
@@ -162,6 +170,7 @@ namespace CEC
       uint8_t                             m_iStandardLineTimeout;
       uint8_t                             m_iRetryLineTimeout;
       uint64_t                            m_iLastTransmission;
+      cec_client_version                  m_clientVersion;
   };
 
   class CCECBusScan : public PLATFORM::CThread