X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=d5571046202caacc27b158d27af8be09c58cf5a9;hb=e186a8436089dfa0f8a7cb65b00cbeb056923467;hp=ce5909806fc64a6fa5921d6c6f917f20a329623a;hpb=c37545cf1873b9e4f735b227206ba57ad3b20a93;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index ce59098..d557104 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -102,69 +102,64 @@ namespace CEC CCECProcessor(CLibCEC *controller, libcec_configuration *configuration); 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, bool bSuppressPoll = 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 CStdString GetDeviceName(void) const - { - CStdString strName; - strName = m_configuration.strDeviceName; - return strName; - } - 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_configuration.logicalAddresses.primary; } - virtual cec_logical_addresses GetLogicalAddresses(void) const { return m_configuration.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_configuration.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 cec_client_version GetClientVersion(void) const { return (cec_client_version)m_configuration.clientVersion; }; - virtual bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); - virtual bool PowerOnDevices(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 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); + bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000); + void *Process(void); + void Close(void); + + bool OnCommandReceived(const cec_command &command); + + bool IsMonitoring(void) const { return m_bMonitor; } + CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bRefresh = false, bool bSuppressPoll = false) const; + CCECBusDevice * GetDeviceByType(cec_device_type type) const; + CCECBusDevice * GetPrimaryDevice(void) const; + cec_version GetDeviceCecVersion(cec_logical_address iAddress); + bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); + CStdString GetDeviceName(void) const; + cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); + uint64_t GetDeviceVendorId(cec_logical_address iAddress); + cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); + cec_logical_address GetLogicalAddress(void) const { return m_configuration.logicalAddresses.primary; } + cec_logical_addresses GetLogicalAddresses(void) const { return m_configuration.logicalAddresses; } + cec_logical_addresses GetActiveDevices(void); + uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); + bool HasLogicalAddress(cec_logical_address address) const { return m_configuration.logicalAddresses.IsSet(address); } + bool IsPresentDevice(cec_logical_address address); + bool IsPresentDeviceType(cec_device_type type); + uint16_t GetPhysicalAddress(void) const; + uint64_t GetLastTransmission(void) const { return m_iLastTransmission; } + cec_logical_address GetActiveSource(void); + bool IsActiveSource(cec_logical_address iAddress); + bool IsInitialised(void); + bool SetStreamPath(uint16_t iPhysicalAddress); + cec_client_version GetClientVersion(void) const { return (cec_client_version)m_configuration.clientVersion; }; + bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); + bool PowerOnDevices(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 SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce = false); + bool TransmitInactiveSource(void); + bool SetLogicalAddress(cec_logical_address iLogicalAddress); + bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); + bool SetPhysicalAddress(uint16_t iPhysicalAddress, bool bSendUpdate = true); + bool SetActiveSource(uint16_t iStreamPath); + bool SwitchMonitoring(bool bEnable); + bool PollDevice(cec_logical_address iAddress); + uint8_t VolumeUp(bool bSendRelease = true); + uint8_t VolumeDown(bool bSendRelease = true); + uint8_t MuteAudio(bool bSendRelease = true); + bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); + bool TransmitKeyRelease(cec_logical_address iDestination, bool bWait = true); + bool EnablePhysicalAddressDetection(void); void SetStandardLineTimeout(uint8_t iTimeout); void SetRetryLineTimeout(uint8_t iTimeout); - virtual bool GetCurrentConfiguration(libcec_configuration *configuration); - virtual bool SetConfiguration(const libcec_configuration *configuration); - virtual bool CanPersistConfiguration(void); - virtual bool PersistConfiguration(libcec_configuration *configuration); - virtual void RescanActiveDevices(void); + bool GetCurrentConfiguration(libcec_configuration *configuration); + bool SetConfiguration(const libcec_configuration *configuration); + bool CanPersistConfiguration(void); + bool PersistConfiguration(libcec_configuration *configuration); + void RescanActiveDevices(void); bool SetLineTimeout(uint8_t iTimeout); @@ -182,19 +177,19 @@ namespace CEC const char *ToString(const cec_client_version version); const char *ToString(const cec_server_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); + bool Transmit(const cec_command &data); + 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); + bool ChangeDeviceType(cec_device_type from, cec_device_type to); + bool FindLogicalAddresses(void); + bool SetAckMask(uint16_t iMask); - virtual bool StartBootloader(const char *strPort = NULL); - virtual bool PingAdapter(void); - virtual void HandlePoll(cec_logical_address initiator, cec_logical_address destination); - virtual bool HandleReceiveFailed(cec_logical_address initiator); + 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); - virtual bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000); + bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000); bool TransmitPendingActiveSourceCommands(void);