X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=fc9a2fa99123c18ddb6edbd07cead37e4d909356;hb=8b0ee2cc959ab9d0b30c21615c25f6447d1f8566;hp=c9028a8d823a7002d977258a68c7ec7820c579d9;hpb=e9de9629478f63b357b69314d7935c6539c3ad71;p=deb_libcec.git

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index c9028a8..fc9a2fa 100644
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -33,6 +33,7 @@
 
 #include <string>
 #include <cectypes.h>
+#include "AdapterCommunication.h"
 #include "platform/threads.h"
 #include "util/buffer.h"
 #include "util/StdString.h"
@@ -54,50 +55,40 @@ namespace CEC
       virtual bool Start(void);
       void *Process(void);
 
-      virtual bool PowerOnDevices(cec_logical_address address = CECDEVICE_TV);
-      virtual bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST);
       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 SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage);
       virtual bool SwitchMonitoring(bool bEnable);
 
       virtual cec_logical_address GetLogicalAddress(void) const { return m_iLogicalAddress; }
-      virtual uint16_t GetPhysicalAddress(void) const { return m_iPhysicalAddress; }
+      virtual uint16_t GetPhysicalAddress(void) const;
+      virtual const std::string &GetDeviceName(void) { return m_strDeviceName; }
 
       virtual void SetCurrentButton(cec_user_control_code iButtonCode);
       virtual void AddCommand(const cec_command &command);
       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);
-      virtual void ReportCECVersion(cec_logical_address address = CECDEVICE_TV);
-      virtual void ReportPowerState(cec_logical_address address = CECDEVICE_TV, bool bOn = true);
-      virtual void ReportMenuState(cec_logical_address address = CECDEVICE_TV, bool bActive = true);
-      virtual void ReportVendorID(cec_logical_address address = CECDEVICE_TV);
-      virtual void ReportOSDName(cec_logical_address address = CECDEVICE_TV);
-      virtual void ReportPhysicalAddress(void);
-      virtual void BroadcastActiveSource(void);
-      virtual void ParseVendorId(cec_logical_address device, const cec_datapacket &data);
+
+      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;
-      uint16_t                       m_iPhysicalAddress;
-      cec_logical_address            m_iLogicalAddress;
-      CecBuffer<cec_adapter_message> m_frameBuffer;
-      std::string                    m_strDeviceName;
-      CMutex                         m_mutex;
-      CAdapterCommunication         *m_communication;
-      CLibCEC                       *m_controller;
-      CCECBusDevice                 *m_busDevices[16];
-      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;
   };
 };