X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FLibCEC.h;h=9241a2c3f8336ce602ee353367f4ca7f52eeb4e7;hb=be54289b785d3318dd644223cacb9f281f3e2d3d;hp=c3d044e0230287d742c22fd6a523cdd285f811b4;hpb=4f362964f02515f4011eb5db6b4f2f989fc6d0a5;p=deb_libcec.git diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h index c3d044e..9241a2c 100644 --- a/src/lib/LibCEC.h +++ b/src/lib/LibCEC.h @@ -48,6 +48,7 @@ namespace CEC */ //@{ CLibCEC(const char *strDeviceName, cec_device_type_list types, uint16_t iPhysicalAddress = 0); + CLibCEC(libcec_configuration *configuration); virtual ~CLibCEC(void); virtual bool Open(const char *strPort, uint32_t iTimeout = 10000); @@ -57,7 +58,7 @@ namespace CEC virtual bool PingAdapter(void); virtual bool StartBootloader(void); - virtual int8_t GetMinLibVersion(void) const{ return CEC_MIN_LIB_VERSION; }; + virtual int8_t GetMinLibVersion(void) const { return CEC_MIN_LIB_VERSION; }; virtual int8_t GetLibVersionMajor(void) const { return CEC_LIB_VERSION_MAJOR; }; virtual int8_t GetLibVersionMinor(void) const { return CEC_LIB_VERSION_MINOR; }; @@ -101,6 +102,12 @@ namespace CEC virtual bool SetStreamPath(cec_logical_address iAddress); virtual bool SetStreamPath(uint16_t iPhysicalAddress); virtual cec_logical_addresses GetLogicalAddresses(void); + virtual bool GetCurrentConfiguration(libcec_configuration *configuration); + virtual bool SetConfiguration(const libcec_configuration *configuration); + virtual bool CanPersistConfiguration(void); + virtual bool PersistConfiguration(libcec_configuration *configuration); + virtual void RescanActiveDevices(void); + virtual bool IsLibCECActiveSource(void); const char *ToString(const cec_menu_state state); const char *ToString(const cec_version version); @@ -112,23 +119,26 @@ 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); + const char *ToString(const cec_server_version version); //@} - static void AddLog(cec_log_level level, const char *strFormat, ...); + static void AddLog(const cec_log_level level, const char *strFormat, ...); static void AddKey(void); - static void AddKey(cec_keypress &key); + static void AddKey(const cec_keypress &key); static void AddCommand(const cec_command &command); + static void ConfigurationChanged(const libcec_configuration &config); static void SetCurrentButton(cec_user_control_code iButtonCode); virtual void CheckKeypressTimeout(void); static CLibCEC *GetInstance(void); static void SetInstance(CLibCEC *instance); + CCECProcessor * m_cec; protected: int64_t m_iStartTime; cec_user_control_code m_iCurrentButton; int64_t m_buttontime; - CCECProcessor * m_cec; PLATFORM::SyncedBuffer m_logBuffer; PLATFORM::SyncedBuffer m_keyBuffer; PLATFORM::SyncedBuffer m_commandBuffer;