X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.h;h=6157e0a7448adf81a235d9631fc28b37f5e8718d;hb=cf4931be43a04e39ae7041e115f5a07cec530031;hp=a115346e00c1677a00cfbe6fd21ad1717cd04d3e;hpb=eafa9d4684e6298481b82923799a750b26852da1;p=deb_libcec.git

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index a115346..6157e0a 100644
--- a/src/lib/devices/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -32,6 +32,7 @@
  */
 
 #include <cectypes.h>
+#include <set>
 #include "../platform/threads.h"
 #include "../util/StdString.h"
 
@@ -39,45 +40,102 @@ namespace CEC
 {
   class CCECProcessor;
   class CCECCommandHandler;
+  class CSLCommandHandler;
 
   class CCECBusDevice
   {
+    friend class CCECProcessor;
+    friend class CSLCommandHandler;
+
   public:
     CCECBusDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0);
     virtual ~CCECBusDevice(void);
 
-    virtual cec_logical_address GetLogicalAddress(void) const { return m_iLogicalAddress; }
-    virtual uint16_t GetPhysicalAddress(void) const { return m_iPhysicalAddress; }
-    virtual void SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress = 0);
+    virtual void AddLog(cec_log_level level, const CStdString &strMessage);
+    virtual bool HandleCommand(const cec_command &command);
+    virtual bool PowerOn(void);
+    virtual bool Standby(void);
 
-    virtual cec_logical_address GetMyLogicalAddress(void) const;
-    virtual uint16_t GetMyPhysicalAddress(void) const;
+    virtual cec_version           GetCecVersion(bool bUpdate = false);
+    virtual CCECCommandHandler *  GetHandler(void) const { return m_handler; };
+    virtual uint64_t              GetLastActive(void) const { return m_iLastActive; }
+    virtual cec_logical_address   GetLogicalAddress(void) const { return m_iLogicalAddress; }
+    virtual const char*           GetLogicalAddressName(void) const;
+    virtual cec_menu_language &   GetMenuLanguage(bool bUpdate = false);
+    virtual cec_menu_state        GetMenuState(void);
+    virtual cec_logical_address   GetMyLogicalAddress(void) const;
+    virtual uint16_t              GetMyPhysicalAddress(void) const;
+    virtual CStdString            GetOSDName(bool bUpdate = false);
+    virtual uint16_t              GetPhysicalAddress(bool bUpdate = false);
+    virtual cec_power_status      GetPowerStatus(bool bUpdate = false);
+    virtual CCECProcessor *       GetProcessor(void) const { return m_processor; }
+    virtual cec_device_type       GetType(void) const { return m_type; }
+    virtual cec_vendor_id         GetVendorId(bool bUpdate = false);
+    virtual const char *          GetVendorName(bool bUpdate = false);
+    virtual bool                  MyLogicalAddressContains(cec_logical_address address) const;
+    virtual cec_bus_device_status GetStatus(bool bForcePoll = false);
+    virtual bool                  IsActiveSource(void) const { return m_bActiveSource; }
+    virtual bool                  IsUnsupportedFeature(cec_opcode opcode) const;
+    virtual void                  SetUnsupportedFeature(cec_opcode opcode);
 
-    virtual void SetVendorId(uint64_t iVendorId, uint8_t iVendorClass = 0);
-    virtual const char *GetVendorName(void) const { return CECVendorIdToString(m_iVendorId); }
-    virtual uint64_t GetVendorId(void) const { return m_iVendorId; }
-    virtual uint8_t GetVendorClass(void) const { return m_iVendorClass; }
+    virtual void SetInactiveSource(void);
+    virtual void SetActiveSource(void);
+    virtual bool TryLogicalAddress(void);
+    virtual bool ActivateSource(void);
 
-    virtual uint64_t GetLastActive(void) const { return m_iLastActive; }
+    virtual void SetDeviceStatus(const cec_bus_device_status newStatus);
+    virtual void SetPhysicalAddress(uint16_t iNewAddress);
+    virtual void SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress = 0);
+    virtual void SetCecVersion(const cec_version newVersion);
+    virtual void SetMenuLanguage(const cec_menu_language &menuLanguage);
+    virtual void SetOSDName(CStdString strName);
+    virtual void SetMenuState(const cec_menu_state state);
+    virtual bool SetVendorId(uint64_t iVendorId);
+    virtual void SetPowerStatus(const cec_power_status powerStatus);
 
-    virtual bool HandleCommand(const cec_command &command);
+    virtual bool TransmitActiveSource(void);
+    virtual bool TransmitCECVersion(cec_logical_address dest);
+    virtual bool TransmitInactiveSource(void);
+    virtual bool TransmitMenuState(cec_logical_address dest);
+    virtual bool TransmitOSDName(cec_logical_address dest);
+    virtual bool TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage);
+    virtual bool TransmitPhysicalAddress(void);
+    virtual bool TransmitPowerState(cec_logical_address dest);
+    virtual bool TransmitPoll(cec_logical_address dest);
+    virtual bool TransmitVendorID(cec_logical_address dest, bool bSendAbort = true);
+    virtual bool TransmitKeypress(cec_user_control_code key, bool bWait = true);
+    virtual bool TransmitKeyRelease(bool bWait = true);
 
-    virtual void AddLog(cec_log_level level, const CStdString &strMessage);
-    virtual CCECProcessor *GetProcessor() const { return m_processor; }
-    virtual CCECCommandHandler *GetHandler(void) const { return m_handler; };
+  protected:
+    bool ReplaceHandler(bool bInitHandler = true);
 
-    virtual void PollVendorId(void);
+    bool RequestCecVersion(void);
+    bool RequestMenuLanguage(void);
+    bool RequestPowerStatus(void);
+    bool RequestVendorId(void);
+    bool RequestPhysicalAddress(void);
+    bool RequestOSDName(void);
 
-    static const char *CECVendorIdToString(const uint64_t iVendorId);
+    bool NeedsPoll(void);
 
-  protected:
-    uint16_t            m_iPhysicalAddress;
-    cec_logical_address m_iLogicalAddress;
-    CCECProcessor      *m_processor;
-    CCECCommandHandler *m_handler;
-    uint64_t            m_iVendorId;
-    uint8_t             m_iVendorClass;
-    uint64_t            m_iLastActive;
-    CMutex              m_mutex;
+    cec_device_type       m_type;
+    CStdString            m_strDeviceName;
+    uint16_t              m_iPhysicalAddress;
+    uint16_t              m_iStreamPath;
+    cec_logical_address   m_iLogicalAddress;
+    cec_power_status      m_powerStatus;
+    cec_menu_language     m_menuLanguage;
+    CCECProcessor      *  m_processor;
+    CCECCommandHandler *  m_handler;
+    cec_vendor_id         m_vendor;
+    bool                  m_bReplaceHandler;
+    cec_menu_state        m_menuState;
+    bool                  m_bActiveSource;
+    uint64_t              m_iLastActive;
+    cec_version           m_cecVersion;
+    cec_bus_device_status m_deviceStatus;
+    std::set<cec_opcode>  m_unsupportedFeatures;
+    CMutex                m_mutex;
+    CMutex                m_handlerMutex;
   };
 };