X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FLibCEC.h;h=0ef3e832d3d318218eda23c4beeccceefd40947e;hb=c0152c0940ee81c79150dbafafd6621f576c3ccb;hp=c6bf62903ceec9614055c36b0fd807494e2733af;hpb=d2f1c15733e3f6f2c8a17abfd3c6612ea93ce734;p=deb_libcec.git diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h index c6bf629..0ef3e83 100644 --- 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,68 +32,83 @@ */ #include -#include -#include "util/buffer.h" +#include "../../include/cec.h" +#include "platform/util/buffer.h" namespace CEC { class CAdapterCommunication; class CCECProcessor; + class CCECClient; class CLibCEC : public ICECAdapter { public: + CLibCEC(const char *strDeviceName, cec_device_type_list types, uint16_t iPhysicalAddress = 0); + CLibCEC(libcec_configuration *configuration); + virtual ~CLibCEC(void); + /*! * ICECAdapter implementation */ //@{ - CLibCEC(const char *strDeviceName, cec_device_type_list types); - CLibCEC(const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS); - virtual ~CLibCEC(void); + bool Open(const char *strPort, uint32_t iTimeout = CEC_DEFAULT_CONNECT_TIMEOUT); + void Close(void); + bool EnableCallbacks(void *cbParam, ICECCallbacks *callbacks); + int8_t FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL); + bool PingAdapter(void); + bool StartBootloader(void); + + int8_t GetMinLibVersion(void) const { return CEC_MIN_LIB_VERSION; }; + int8_t GetLibVersionMajor(void) const { return CEC_LIB_VERSION_MAJOR; }; + int8_t GetLibVersionMinor(void) const { return CEC_LIB_VERSION_MINOR; }; + + bool GetNextLogMessage(cec_log_message *message); + bool GetNextKeypress(cec_keypress *key); + bool GetNextCommand(cec_command *command); + + bool Transmit(const cec_command &data); + bool SetLogicalAddress(cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1); + bool SetPhysicalAddress(uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS); - virtual bool Open(const char *strPort, uint32_t iTimeout = 10000); - virtual void Close(void); - virtual int8_t FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL); - virtual bool PingAdapter(void); - virtual bool StartBootloader(void); - - 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; }; - - virtual bool GetNextLogMessage(cec_log_message *message); - virtual bool GetNextKeypress(cec_keypress *key); - virtual bool GetNextCommand(cec_command *command); - - virtual bool Transmit(const cec_command &data); - virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1); - virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS); - - virtual bool PowerOnDevices(cec_logical_address address = CECDEVICE_TV); - virtual bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); - virtual bool SetActiveView(void); - virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); - virtual bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); - virtual bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); - virtual bool SetInactiveView(void); - virtual bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); - virtual bool SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage); - virtual bool SwitchMonitoring(bool bEnable); - virtual cec_version GetDeviceCecVersion(cec_logical_address iAddress); - virtual bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); - virtual uint64_t GetDeviceVendorId(cec_logical_address iAddress); - virtual cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); - virtual bool PollDevice(cec_logical_address iAddress); - virtual cec_logical_addresses GetActiveDevices(void); - virtual bool IsActiveDevice(cec_logical_address iAddress); - virtual bool IsActiveDeviceType(cec_device_type type); - virtual bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort = CEC_DEFAULT_HDMI_PORT); - virtual uint8_t VolumeUp(bool bWait = true); - virtual uint8_t VolumeDown(bool bWait = true); - virtual uint8_t MuteAudio(bool bWait = true); - virtual bool SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = false); - virtual bool SendKeyRelease(cec_logical_address iDestination, bool bWait = false); - virtual cec_osd_name GetOSDName(cec_logical_address iAddress); + bool PowerOnDevices(cec_logical_address address = CECDEVICE_TV); + bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); + bool SetActiveView(void); + bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); + bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); + bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); + bool SetInactiveView(void); + bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); + bool SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage); + bool SwitchMonitoring(bool bEnable); + cec_version GetDeviceCecVersion(cec_logical_address iAddress); + bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); + uint64_t GetDeviceVendorId(cec_logical_address iAddress); + uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); + cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); + bool PollDevice(cec_logical_address iAddress); + cec_logical_addresses GetActiveDevices(void); + bool IsActiveDevice(cec_logical_address iAddress); + bool IsActiveDeviceType(cec_device_type type); + bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort = CEC_DEFAULT_HDMI_PORT); + uint8_t VolumeUp(bool bSendRelease = true); + uint8_t VolumeDown(bool bSendRelease = true); + uint8_t MuteAudio(bool bSendRelease = true); + bool SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); + bool SendKeyRelease(cec_logical_address iDestination, bool bWait = true); + cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); + bool EnablePhysicalAddressDetection(void); + cec_logical_address GetActiveSource(void); + bool IsActiveSource(cec_logical_address iAddress); + bool SetStreamPath(cec_logical_address iAddress); + bool SetStreamPath(uint16_t iPhysicalAddress); + cec_logical_addresses GetLogicalAddresses(void); + bool GetCurrentConfiguration(libcec_configuration *configuration); + bool SetConfiguration(const libcec_configuration *configuration); + bool CanPersistConfiguration(void); + bool PersistConfiguration(libcec_configuration *configuration); + void RescanActiveDevices(void); + bool IsLibCECActiveSource(void); const char *ToString(const cec_menu_state state); const char *ToString(const cec_version version); @@ -105,23 +120,48 @@ 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); + const char *ToString(const cec_device_type type); + + static cec_device_type GetType(cec_logical_address address); + static uint16_t GetMaskForType(cec_logical_address address); + static uint16_t GetMaskForType(cec_device_type type); + + bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT); //@} - 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); - virtual void CheckKeypressTimeout(void); - virtual void SetCurrentButton(cec_user_control_code iButtonCode); + void AddLog(const cec_log_level level, const char *strFormat, ...); + static void AddKey(void) {} //UNUSED + static void AddKey(const cec_keypress &key); //UNUSED + static void AddCommand(const cec_command &command); //UNUSED + static void ConfigurationChanged(const libcec_configuration &config); //UNUSED + static void SetCurrentButton(cec_user_control_code iButtonCode); //UNUSED + void CheckKeypressTimeout(void); + void Alert(const libcec_alert type, const libcec_parameter ¶m); + static CLibCEC *GetInstance(void); //UNUSED + static void SetInstance(CLibCEC *instance); //UNUSED + + static bool IsValidPhysicalAddress(uint16_t iPhysicalAddress); + CCECClient *RegisterClient(libcec_configuration &configuration); + void UnregisterClients(void); + std::vector GetClients(void) { return m_clients; }; + + CCECProcessor * m_cec; protected: - int64_t m_iStartTime; - cec_user_control_code m_iCurrentButton; - int64_t m_buttontime; - CCECProcessor *m_cec; - CAdapterCommunication *m_comm; - CecBuffer m_logBuffer; - CecBuffer m_keyBuffer; - CecBuffer m_commandBuffer; + int64_t m_iStartTime; + cec_user_control_code m_iCurrentButton; //UNUSED + int64_t m_buttontime; //UNUSED + PLATFORM::SyncedBuffer m_logBuffer; //UNUSED + PLATFORM::SyncedBuffer m_keyBuffer; //UNUSED + PLATFORM::SyncedBuffer m_commandBuffer; //UNUSED + ICECCallbacks * m_callbacks; //UNUSED + void * m_cbParam; //UNUSED + PLATFORM::CMutex m_mutex; + PLATFORM::CMutex m_logMutex; //UNUSED + + CCECClient * m_client; + std::vector m_clients; }; };