X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=0d2446acd065fa57a0b69cfbc6ab1a1cc83c7207;hb=ded7e7cea9571381bef47bb2f2fb0e5266671914;hp=a688befb290ac5ea1fe0a4b29807902c8fe7d01f;hpb=3e61b35032f69fb93869796e2f985de8cff2ae33;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index a688bef..0d2446a 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.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. @@ -33,20 +33,17 @@ #include #include -#include "AdapterCommunication.h" -#include "platform/threads.h" -#include "util/buffer.h" -#include "util/StdString.h" - -class CSerialPort; +#include "platform/threads/threads.h" +#include "platform/util/buffer.h" +#include "adapter/AdapterCommunication.h" namespace CEC { class CLibCEC; - class CAdapterCommunication; + struct IAdapterCommunication; class CCECBusDevice; - class CCECProcessor : public CThread + 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); @@ -56,6 +53,8 @@ namespace CEC virtual bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000); virtual void *Process(void); + virtual bool OnCommandReceived(const cec_command &command); + 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; @@ -75,10 +74,9 @@ namespace CEC virtual bool IsPresentDeviceType(cec_device_type type); virtual uint16_t GetPhysicalAddress(void) const; virtual uint64_t GetLastTransmission(void) const { return m_iLastTransmission; } - 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 IsInitialised(void); virtual bool SetActiveView(void); virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); @@ -88,7 +86,7 @@ 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); @@ -116,26 +114,25 @@ namespace CEC const char *ToString(const cec_vendor_id vendor); virtual bool Transmit(const cec_command &data); - 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(cec_logical_address initiator); - 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); @@ -146,34 +143,28 @@ 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; - 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; - 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; + void ParseCommand(const cec_command &command); + + bool m_bInitialised; + uint8_t m_iHDMIPort; + cec_logical_address m_iBaseDevice; + cec_logical_addresses m_logicalAddresses; + std::string m_strDeviceName; + cec_device_type_list m_types; + PLATFORM::CMutex m_mutex; + IAdapterCommunication * 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; }