X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=48154fe9842de770fe692dbe73789bf313e7f970;hb=99aeafb929fa132a096c236c4ae1eb78c2a595ec;hp=50d6bf253b6376d8e3d9be90e8e1a77148d30a63;hpb=d40928b571290a0d7d9191adc1c847608cca55e2;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index 50d6bf2..48154fe 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -33,154 +33,122 @@ #include #include "../../include/cectypes.h" + #include "platform/threads/threads.h" #include "platform/util/buffer.h" + #include "adapter/AdapterCommunication.h" +#include "devices/CECDeviceMap.h" +#include "CECInputBuffer.h" namespace CEC { class CLibCEC; - struct IAdapterCommunication; + class IAdapterCommunication; class CCECBusDevice; + class CCECAudioSystem; + class CCECPlaybackDevice; + class CCECRecordingDevice; + class CCECTuner; + class CCECTV; + class CCECClient; class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback { public: - 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); + CCECProcessor(CLibCEC *libcec); 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); - - 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; } - virtual cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); - virtual uint64_t GetDeviceVendorId(cec_logical_address iAddress); - virtual cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); - virtual cec_logical_address GetLogicalAddress(void) const { return m_logicalAddresses.primary; } - virtual cec_logical_addresses GetLogicalAddresses(void) const { return m_logicalAddresses; } - virtual cec_logical_addresses GetActiveDevices(void); - virtual uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); - virtual bool HasLogicalAddress(cec_logical_address address) const { return m_logicalAddresses.IsSet(address); } - virtual bool IsPresentDevice(cec_logical_address address); - virtual bool IsPresentDeviceType(cec_device_type type); - virtual uint16_t GetPhysicalAddress(void) const; - 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); - virtual bool SetStreamPath(uint16_t iPhysicalAddress); - - 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 SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce = false); - 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, 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(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; }; + bool Start(const char *strPort, uint16_t iBaudRate = CEC_SERIAL_DEFAULT_BAUDRATE, uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT); + void *Process(void); + void Close(void); + + bool RegisterClient(CCECClient *client); + void UnregisterClient(CCECClient *client); + void UnregisterClients(void); + CCECClient *GetPrimaryClient(void); + CCECClient *GetClient(const cec_logical_address address); + + bool OnCommandReceived(const cec_command &command); + + bool IsMonitoring(void) const { return m_bMonitor; } + CCECBusDevice * GetDevice(cec_logical_address address) const; + CCECAudioSystem * GetAudioSystem(void) const; + CCECPlaybackDevice * GetPlaybackDevice(cec_logical_address address) const; + CCECRecordingDevice * GetRecordingDevice(cec_logical_address address) const; + CCECTuner * GetTuner(cec_logical_address address) const; + CCECTV * GetTV(void) const; + + CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bSuppressUpdate = true); + CCECBusDevice * GetPrimaryDevice(void) const; + cec_logical_address GetLogicalAddress(void) const; + cec_logical_addresses GetLogicalAddresses(void) const; + bool IsPresentDevice(cec_logical_address address); + bool IsPresentDeviceType(cec_device_type type); + uint16_t GetDetectedPhysicalAddress(void) const; + uint64_t GetLastTransmission(void) const { return m_iLastTransmission; } + cec_logical_address GetActiveSource(bool bRequestActiveSource = true); + bool IsActiveSource(cec_logical_address iAddress); + bool CECInitialised(void); + bool SetStreamPath(uint16_t iPhysicalAddress); + + bool StandbyDevices(const cec_logical_address initiator, const CECDEVICEVEC &devices); + bool StandbyDevice(const cec_logical_address initiator, cec_logical_address address); + bool PowerOnDevices(const cec_logical_address initiator, const CECDEVICEVEC &devices); + bool PowerOnDevice(const cec_logical_address initiator, cec_logical_address address); + + bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); + bool SetActiveSource(uint16_t iStreamPath); + bool SwitchMonitoring(bool bEnable); + bool PollDevice(cec_logical_address iAddress); void SetStandardLineTimeout(uint8_t iTimeout); void SetRetryLineTimeout(uint8_t iTimeout); - virtual bool GetCurrentConfiguration(libcec_configuration *configuration); + bool CanPersistConfiguration(void); + bool PersistConfiguration(libcec_configuration *configuration); + void RescanActiveDevices(void); 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); - const char *ToString(const cec_logical_address address); - const char *ToString(const cec_deck_control_mode mode); - const char *ToString(const cec_deck_info status); - const char *ToString(const cec_opcode opcode); - 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); - - 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]; - PLATFORM::CMutex m_transmitMutex; + bool Transmit(const cec_command &data); + void TransmitAbort(cec_logical_address source, cec_logical_address destination, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); + + bool StartBootloader(const char *strPort = NULL); + bool PingAdapter(void); + void HandlePoll(cec_logical_address initiator, cec_logical_address destination); + bool HandleReceiveFailed(cec_logical_address initiator); + + bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT); + bool TransmitPendingActiveSourceCommands(void); + + CCECDeviceMap *GetDevices(void) const { return m_busDevices; } + CLibCEC *GetLib(void) const { return m_libcec; } + + bool IsHandledByLibCEC(const cec_logical_address address) const; + + bool TryLogicalAddress(cec_logical_address address); private: - bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs); - bool Initialise(void); - void SetInitialised(bool bSetTo = true); - void CreateBusDevices(void); + bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs, bool bStartListening = true); + void SetCECInitialised(bool bSetTo = true); void ReplaceHandlers(void); - void ScanCECBus(void); bool PhysicalAddressInUse(uint16_t iPhysicalAddress); - bool TryLogicalAddress(cec_logical_address address); - bool FindLogicalAddressRecordingDevice(void); - bool FindLogicalAddressTuner(void); - bool FindLogicalAddressPlaybackDevice(void); - bool FindLogicalAddressAudioSystem(void); + bool SetAckMask(uint16_t iMask); void LogOutput(const cec_command &data); 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; - 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; - cec_client_version m_clientVersion; - }; - - class CCECBusScan : public PLATFORM::CThread - { - public: - CCECBusScan(CCECProcessor *processor) { m_processor = processor; } - virtual ~CCECBusScan(void) { StopThread(true); } - virtual void *Process(void); - - private: - void WaitUntilIdle(void); - - CCECProcessor *m_processor; + bool m_bInitialised; + PLATFORM::CMutex m_mutex; + IAdapterCommunication * m_communication; + CLibCEC* m_libcec; + bool m_bMonitor; + uint16_t m_iPreviousAckMask; + uint8_t m_iStandardLineTimeout; + uint8_t m_iRetryLineTimeout; + uint64_t m_iLastTransmission; + CCECInputBuffer m_inBuffer; + CCECDeviceMap * m_busDevices; + std::map m_clients; }; };