X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=8e5349accccc86f97b3f51e98d985b0e6ee27787;hb=f46dc8465450028c44c7cb0c253ab8b06dc1bcf4;hp=178978e116228550852e9aae325e11a8adefa159;hpb=04e637f9e37a0bcbd6aacc51746bb548293007ef;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index 178978e..8e5349a 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -62,6 +62,7 @@ namespace CEC 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; } @@ -77,17 +78,19 @@ namespace CEC virtual bool SetActiveSource(cec_logical_address iAddress); virtual bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); virtual bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); - virtual bool SetHDMIPort(uint8_t iPort); - virtual bool SetInactiveView(void); + virtual bool SetHDMIPort(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); virtual bool SetStreamPath(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 uint8_t VolumeUp(bool bWait = true); + virtual uint8_t VolumeDown(bool bWait = true); + virtual uint8_t MuteAudio(bool bWait = true); + virtual bool SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = false); + virtual bool SendKeyRelease(cec_logical_address iDestination, bool bWait = false); virtual bool Transmit(const cec_command &data); virtual bool Transmit(CCECAdapterMessage *output); @@ -105,6 +108,7 @@ namespace CEC CCECBusDevice *m_busDevices[16]; private: + void ScanCECBus(void); bool CheckPhysicalAddress(uint16_t iPhysicalAddress); bool TryLogicalAddress(cec_logical_address address); bool FindLogicalAddressRecordingDevice(void); @@ -129,5 +133,18 @@ namespace CEC CLibCEC* m_controller; bool m_bMonitor; CecBuffer m_commandBuffer; + cec_keypress m_previousKey; + CThread * m_busScan; + }; + + class CCECBusScan : public CThread + { + public: + CCECBusScan(CCECProcessor *processor) { m_processor = processor; } + virtual ~CCECBusScan(void) {} + virtual void *Process(void); + + private: + CCECProcessor *m_processor; }; };