X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=3d668ecba9b8faffa9270853c8d60963c61698c2;hb=3f9b82aa7229403771e0b5d33087e75084631891;hp=fc37c02a084c18e467a0843519d6a7f05b3a93b0;hpb=7ea0d55841195dc1f0397d3b77405b8f55fdde3f;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index fc37c02..3d668ec 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -33,6 +33,7 @@ #include #include +#include "AdapterCommunication.h" #include "platform/threads.h" #include "util/buffer.h" #include "util/StdString.h" @@ -70,7 +71,6 @@ namespace CEC virtual void AddKey(void); virtual void AddLog(cec_log_level level, const CStdString &strMessage); - 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); CCECBusDevice *m_busDevices[16]; @@ -78,16 +78,16 @@ namespace CEC private: void LogOutput(const cec_command &data); bool WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout = 1000); - bool ParseMessage(cec_adapter_message &msg); + bool ParseMessage(CCECAdapterMessage &msg); void ParseCommand(cec_command &command); - cec_command m_currentframe; - cec_logical_address m_iLogicalAddress; - CecBuffer m_frameBuffer; - std::string m_strDeviceName; - CMutex m_mutex; - CAdapterCommunication *m_communication; - CLibCEC *m_controller; - bool m_bMonitor; + cec_command m_currentframe; + cec_logical_address m_iLogicalAddress; + CecBuffer m_frameBuffer; + std::string m_strDeviceName; + CMutex m_mutex; + CAdapterCommunication *m_communication; + CLibCEC *m_controller; + bool m_bMonitor; }; };