X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=d865167e114ff6e9332682a665c8873e31e30c9d;hb=f7febb0e8d28a15658f3b53477cc5051e50be9a1;hp=2d5c3127052da5d9dd84cae5ffd5ff6946eab42e;hpb=e41b06f9e1fc5c8af372eabf338dbb691ee7ac4c;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index 2d5c312..d865167 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -65,23 +65,26 @@ namespace CEC virtual bool SetActiveView(void); virtual bool SetInactiveView(void); - virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress = CECDEVICE_UNKNOWN); + virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress); virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress); virtual bool SwitchMonitoring(bool bEnable); - virtual bool Transmit(const cec_command &data); + virtual bool Transmit(const cec_command &data); + virtual bool Transmit(CCECAdapterMessage *output); virtual void TransmitAbort(cec_logical_address address, cec_opcode opcode, ECecAbortReason 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); CCECBusDevice *m_busDevices[16]; private: + bool SetAckMask(uint16_t iMask); void LogOutput(const cec_command &data); - bool WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout = 1000); + bool WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout = 1000); bool ParseMessage(const CCECAdapterMessage &msg); void ParseCommand(cec_command &command); @@ -93,6 +96,5 @@ namespace CEC CAdapterCommunication *m_communication; CLibCEC *m_controller; bool m_bMonitor; - bool m_bLogicalAddressSet; }; };