X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=5b5ba4ba1b09276eaf1379c8b22ea9dd5bb31bd7;hb=93fff5c18f5e39ffbee143b4d01e89cc02d6fd99;hp=39f1a2efc362b753db1aeb0f26902e300ec56f0c;hpb=761dcc45a8a0fb5480c3d0898b7b7ffadd4a479c;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index 39f1a2e..5b5ba4b 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -33,8 +33,10 @@ #include #include +#include "AdapterCommunication.h" #include "platform/threads.h" #include "util/buffer.h" +#include "util/StdString.h" class CSerialPort; @@ -42,52 +44,80 @@ namespace CEC { class CLibCEC; class CAdapterCommunication; + class CCECBusDevice; class CCECProcessor : public CThread { public: CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS); + CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, const cec_device_type_list &types); virtual ~CCECProcessor(void); virtual bool Start(void); - void *Process(void); + virtual void *Process(void); + + virtual bool IsMonitoring(void) const { return m_bMonitor; } + virtual CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress) const; + virtual CCECBusDevice * GetDeviceByType(cec_device_type type) 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 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 bool HasLogicalAddress(cec_logical_address address) const { return m_logicalAddresses.IsSet(address); } + virtual uint16_t GetPhysicalAddress(void) const; - 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 Transmit(const cec_command &data, bool bWaitForAck = true); 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 SetStreamPath(uint16_t iStreamPath); + virtual bool SwitchMonitoring(bool bEnable); + virtual bool PollDevice(cec_logical_address iAddress); + + 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 FindLogicalAddresses(void); + virtual bool SetAckMask(uint16_t iMask); - static const char *CECVendorIdToString(const uint64_t iVendorId); + CCECBusDevice *m_busDevices[16]; - protected: - virtual bool TransmitFormatted(const cec_adapter_message &data, bool bWaitForAck = true); - virtual void TransmitAbort(cec_logical_address address, cec_opcode opcode, ECecAbortReason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); - virtual void ReportCECVersion(cec_logical_address address = CECDEVICE_TV); - virtual void ReportPowerState(cec_logical_address address = CECDEVICE_TV, bool bOn = true); - virtual void ReportMenuState(cec_logical_address address = CECDEVICE_TV, bool bActive = true); - virtual void ReportVendorID(cec_logical_address address = CECDEVICE_TV); - virtual void ReportOSDName(cec_logical_address address = CECDEVICE_TV); - virtual void ReportPhysicalAddress(void); - virtual void BroadcastActiveSource(void); + private: + bool TryLogicalAddress(cec_logical_address address, unsigned int iIndex); + bool FindLogicalAddressRecordingDevice(unsigned int iIndex); + bool FindLogicalAddressTuner(unsigned int iIndex); + bool FindLogicalAddressPlaybackDevice(unsigned int iIndex); + bool FindLogicalAddressAudioSystem(unsigned int iIndex); - private: void LogOutput(const cec_command &data); - bool WaitForAck(bool *bError, uint32_t iTimeout = 1000); - bool ParseMessage(cec_adapter_message &msg); + bool WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout = 1000); + bool ParseMessage(const CCECAdapterMessage &msg); void ParseCommand(cec_command &command); - void ParseVendorId(cec_logical_address device, const cec_datapacket &data); - cec_command m_currentframe; - uint16_t m_physicaladdress; - cec_logical_address m_iLogicalAddress; - CecBuffer m_frameBuffer; - std::string m_strDeviceName; - CMutex m_mutex; - CAdapterCommunication *m_communication; - CLibCEC *m_controller; - uint64_t m_vendorIds[16]; - uint8_t m_vendorClasses[16]; + bool m_bStarted; + cec_command m_currentframe; + cec_logical_addresses m_logicalAddresses; + 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; }; };