#include <string>
#include <cectypes.h>
+#include "AdapterCommunication.h"
#include "platform/threads.h"
#include "util/buffer.h"
#include "util/StdString.h"
virtual bool SetActiveView(void);
virtual bool SetInactiveView(void);
- virtual bool Transmit(const cec_command &data, bool bWaitForAck = true);
+ virtual bool Transmit(const cec_command &data);
virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress);
virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress);
virtual bool SwitchMonitoring(bool bEnable);
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];
private:
void LogOutput(const cec_command &data);
- bool WaitForAck(bool *bError, uint32_t iTimeout = 1000);
- void ParseMessage(cec_adapter_message &msg, bool *bError, bool *bTransmitSucceeded, bool *bEom, bool bProcessMessages = true);
+ bool WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout = 1000);
+ bool ParseMessage(CCECAdapterMessagePtr msg);
void ParseCommand(cec_command &command);
- cec_command m_currentframe;
- cec_logical_address m_iLogicalAddress;
- CecBuffer<cec_adapter_message> 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<CCECAdapterMessagePtr> m_frameBuffer;
+ std::string m_strDeviceName;
+ CMutex m_mutex;
+ CAdapterCommunication *m_communication;
+ CLibCEC *m_controller;
+ bool m_bMonitor;
};
};