X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=2c0f287c07c03ce37b5c39e16e18cb77aa915f39;hb=0e51267bc52437d3ae878c5d3beb6ad1e8be4276;hp=a0e0e73b8b5e95113305d0f1473acbf326bbf787;hpb=37b0c5724f06a98e14686695b5089f66ac657f11;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index a0e0e73..2c0f287 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -33,10 +33,8 @@ #include #include -#include "AdapterCommunication.h" -#include "platform/threads.h" -#include "util/buffer.h" -#include "util/StdString.h" +#include "adapter/AdapterCommunication.h" +#include "platform/util/buffer.h" class CSerialPort; @@ -46,7 +44,7 @@ namespace CEC class CAdapterCommunication; class CCECBusDevice; - class CCECProcessor : public CThread + class CCECProcessor : public PLATFORM::CThread { public: CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS); @@ -59,6 +57,7 @@ namespace CEC virtual bool IsMonitoring(void) const { return m_bMonitor; } virtual CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bRefresh = false) const; virtual CCECBusDevice * GetDeviceByType(cec_device_type type) const; + virtual CCECBusDevice * GetPrimaryDevice(void) const; virtual cec_version GetDeviceCecVersion(cec_logical_address iAddress); virtual bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); virtual const std::string & GetDeviceName(void) { return m_strDeviceName; } @@ -77,6 +76,7 @@ namespace CEC virtual bool IsStarted(void) const { return m_bStarted; } virtual cec_logical_address GetActiveSource(void); virtual bool IsActiveSource(cec_logical_address iAddress); + virtual bool IsInitialised(void) const { return m_bInitialised; } virtual bool SetActiveView(void); virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); @@ -86,21 +86,22 @@ namespace CEC virtual bool TransmitInactiveSource(void); virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress); virtual bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); - virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress); + virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress, bool bSendUpdate = true); virtual bool SetActiveSource(uint16_t iStreamPath); virtual bool SwitchMonitoring(bool bEnable); virtual bool PollDevice(cec_logical_address iAddress); - virtual uint8_t VolumeUp(void); - virtual uint8_t VolumeDown(void); - virtual uint8_t MuteAudio(void); - virtual bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key); - virtual bool TransmitKeyRelease(cec_logical_address iDestination); + virtual uint8_t VolumeUp(bool bSendRelease = true); + virtual uint8_t VolumeDown(bool bSendRelease = true); + virtual uint8_t MuteAudio(bool bSendRelease = true); + virtual bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); + virtual bool TransmitKeyRelease(cec_logical_address iDestination, bool bWait = true); virtual bool EnablePhysicalAddressDetection(void) { return false; }; void SetStandardLineTimeout(uint8_t iTimeout); void SetRetryLineTimeout(uint8_t iTimeout); bool SetLineTimeout(uint8_t iTimeout); + const char *ToString(const cec_device_type type); const char *ToString(const cec_menu_state state); const char *ToString(const cec_version version); const char *ToString(const cec_power_status status); @@ -116,22 +117,24 @@ namespace CEC virtual bool Transmit(CCECAdapterMessage *output); virtual void TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); - virtual void SetCurrentButton(cec_user_control_code iButtonCode); - virtual void AddCommand(const cec_command &command); - virtual void AddKey(cec_keypress &key); - virtual void AddKey(void); - virtual void AddLog(cec_log_level level, const CStdString &strMessage); - + virtual bool ChangeDeviceType(cec_device_type from, cec_device_type to); virtual bool FindLogicalAddresses(void); virtual bool SetAckMask(uint16_t iMask); virtual bool StartBootloader(void); virtual bool PingAdapter(void); + virtual void HandlePoll(cec_logical_address initiator, cec_logical_address destination); + virtual bool HandleReceiveFailed(void); - CCECBusDevice *m_busDevices[16]; - CMutex m_transmitMutex; + CCECBusDevice * m_busDevices[16]; + PLATFORM::CMutex m_transmitMutex; private: + bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs); + bool Initialise(void); + void SetInitialised(bool bSetTo = true); + + void ReplaceHandlers(void); void ScanCECBus(void); bool PhysicalAddressInUse(uint16_t iPhysicalAddress); bool TryLogicalAddress(cec_logical_address address); @@ -141,33 +144,33 @@ namespace CEC bool FindLogicalAddressAudioSystem(void); void LogOutput(const cec_command &data); - bool WaitForTransmitSucceeded(CCECAdapterMessage *message); bool ParseMessage(const CCECAdapterMessage &msg); void ParseCommand(cec_command &command); - bool m_bStarted; - uint8_t m_iHDMIPort; - cec_logical_address m_iBaseDevice; - cec_command m_currentframe; - cec_logical_addresses m_logicalAddresses; - cec_logical_address m_lastInitiator; - std::string m_strDeviceName; - cec_device_type_list m_types; - CMutex m_mutex; - CCondition m_startCondition; - CAdapterCommunication* m_communication; - CLibCEC* m_controller; - bool m_bMonitor; - CecBuffer m_commandBuffer; - cec_keypress m_previousKey; - CThread * m_busScan; - uint8_t m_iLineTimeout; - uint8_t m_iStandardLineTimeout; - uint8_t m_iRetryLineTimeout; - uint64_t m_iLastTransmission; + bool m_bStarted; + bool m_bInitialised; + uint8_t m_iHDMIPort; + cec_logical_address m_iBaseDevice; + cec_command m_currentframe; + cec_logical_addresses m_logicalAddresses; + cec_logical_address m_lastInitiator; + std::string m_strDeviceName; + cec_device_type_list m_types; + PLATFORM::CMutex m_mutex; + PLATFORM::CCondition m_startCondition; + CAdapterCommunication* m_communication; + CLibCEC* m_controller; + bool m_bMonitor; + PLATFORM::SyncedBuffer m_commandBuffer; + cec_keypress m_previousKey; + PLATFORM::CThread * m_busScan; + uint8_t m_iLineTimeout; + uint8_t m_iStandardLineTimeout; + uint8_t m_iRetryLineTimeout; + uint64_t m_iLastTransmission; }; - class CCECBusScan : public CThread + class CCECBusScan : public PLATFORM::CThread { public: CCECBusScan(CCECProcessor *processor) { m_processor = processor; }