X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FUSBCECAdapterCommunication.h;h=227a7e2625c3753a05a3034510d896e103aaa93e;hb=924a6975e6c7d16db127c6815125e5c420605505;hp=5db5a1a0674310a9b4fe94a9fc517fe211eea94f;hpb=26516f2f0df6ed29be8c94f70247b9d0d6748042;p=deb_libcec.git diff --git a/src/lib/adapter/USBCECAdapterCommunication.h b/src/lib/adapter/USBCECAdapterCommunication.h index 5db5a1a..227a7e2 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.h +++ b/src/lib/adapter/USBCECAdapterCommunication.h @@ -46,30 +46,13 @@ namespace CEC { class CCECProcessor; - class CUSBCECAdapterProcessor: public PLATFORM::CThread - { - public: - CUSBCECAdapterProcessor(IAdapterCommunicationCallback *cb) : - m_callback(cb) {}; - virtual ~CUSBCECAdapterProcessor(void) - { - StopThread(); - } - - void *Process(void); - void AddCommand(cec_command command); - private: - IAdapterCommunicationCallback * m_callback; - PLATFORM::SyncedBuffer m_inBuffer; - }; - class CUSBCECAdapterCommunication : public IAdapterCommunication, private PLATFORM::CThread { public: CUSBCECAdapterCommunication(CCECProcessor *processor, const char *strPort, uint16_t iBaudRate = 38400); virtual ~CUSBCECAdapterCommunication() {}; - virtual bool Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs = 10000, bool bSkipChecks = false); + virtual bool Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs = 10000, bool bSkipChecks = false, bool bStartListening = true); virtual void Close(void); virtual bool IsOpen(void); virtual CStdString GetError(void) const; @@ -143,7 +126,6 @@ namespace CEC bool m_bNextIsEscaped; bool m_bGotStart; IAdapterCommunicationCallback * m_callback; - CUSBCECAdapterProcessor * m_messageProcessor; bool m_bInitialised; bool m_bWaitingForAck[15]; };