cec: fixed - wait for the processor thread to start before continueing

[deb_libcec.git] / src / lib / CECProcessor.h

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index f635cd7d5e87df66ac8355af0713adeb19ad0c91..fc9a2fa99123c18ddb6edbd07cead37e4d909356 100644 (file)
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -57,7 +57,7 @@ namespace CEC
 
       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);
@@ -71,7 +71,6 @@ namespace CEC
       virtual void AddKey(void);
       virtual void AddLog(cec_log_level level, const CStdString &strMessage);
 
-      virtual bool TransmitFormatted(const CCECAdapterMessage &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];
@@ -79,16 +78,17 @@ namespace CEC
     private:
       void LogOutput(const cec_command &data);
       bool WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout = 1000);
-      bool ParseMessage(CCECAdapterMessage &msg);
+      bool ParseMessage(CCECAdapterMessagePtr msg);
       void ParseCommand(cec_command &command);
 
-      cec_command                   m_currentframe;
-      cec_logical_address           m_iLogicalAddress;
-      CecBuffer<CCECAdapterMessage> 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;
+      CCondition                       m_startCondition;
+      CAdapterCommunication           *m_communication;
+      CLibCEC                         *m_controller;
+      bool                             m_bMonitor;
   };
 };