X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=bd616df6edb598b48e0fd62b6319e8679c606941;hb=271e7778636b66aa854b31288c351b774d91bd79;hp=5ff3e6270cb1dff29a102d90688ee959b83e6a32;hpb=8b7e5ff605864004b8a66520202bf05aecb4fc6c;p=deb_libcec.git

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index 5ff3e62..bd616df 100644
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -33,8 +33,10 @@
 
 #include <string>
 #include <cectypes.h>
+#include "AdapterCommunication.h"
 #include "platform/threads.h"
 #include "util/buffer.h"
+#include "util/StdString.h"
 
 class CSerialPort;
 
@@ -42,6 +44,7 @@ namespace CEC
 {
   class CLibCEC;
   class CAdapterCommunication;
+  class CCECBusDevice;
 
   class CCECProcessor : public CThread
   {
@@ -52,46 +55,39 @@ 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 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);
 
-      static const char *CECVendorIdToString(const uint64_t iVendorId);
+      virtual cec_logical_address GetLogicalAddress(void) const { return m_iLogicalAddress; }
+      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);
 
-    protected:
-      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);
+
+      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);
-      void ParseVendorId(cec_logical_address device, const cec_datapacket &data);
 
-      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;
-      uint64_t                       m_vendorIds[16];
-      uint8_t                        m_vendorClasses[16];
-      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;
   };
 };