X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.h;h=01b74c2de6b57fac04477f6f2e5569a4d01fdbd9;hb=9bc8934c6dac8efcd2f636b6f68798049f84deac;hp=67a816f0e6c3468ca34f991113747c6856075c93;hpb=a3269a0a9e8973e29cfe073dd8e558aad173f984;p=deb_libcec.git

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index 67a816f..01b74c2 100644
--- a/src/lib/devices/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -42,64 +42,92 @@ namespace CEC
 
   class CCECBusDevice
   {
+    friend class CCECProcessor;
+
   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 cec_logical_address GetMyLogicalAddress(void) const;
-    virtual uint16_t GetMyPhysicalAddress(void) const;
-
-    virtual void SetCecVersion(cec_version newVersion);
-    virtual void SetMenuLanguage(const cec_menu_language &menuLanguage);
-    virtual void SetVendorId(const cec_datapacket &data);
-    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 uint64_t GetLastActive(void) const { return m_iLastActive; }
-
-    virtual bool HandleCommand(const cec_command &command);
-
     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; };
-
-    virtual cec_version GetCecVersion(void);
-    virtual cec_menu_language &GetMenuLanguage(void);
-    virtual void PollVendorId(void);
+    virtual bool HandleCommand(const cec_command &command);
     virtual bool PowerOn(void);
     virtual bool Standby(void);
-    virtual bool SetOSDString(cec_display_control duration, const char *strMessage);
-    virtual bool ReportCECVersion(void);
-    virtual bool ReportDeckStatus(void);
-    virtual bool ReportMenuState(bool bActive = true);
-    virtual bool ReportOSDName(void);
-    virtual bool ReportPowerState(bool bOn = true);
-    virtual bool ReportVendorID(void);
 
-    virtual bool BroadcastActiveView(void);
-    virtual bool BroadcastInactiveView(void);
-    virtual bool BroadcastPhysicalAddress(void);
-    virtual bool BroadcastActiveSource(void);
+    virtual cec_version           GetCecVersion(void);
+    virtual CCECCommandHandler *  GetHandler(void) const { return m_handler; };
+    virtual uint64_t              GetLastCommandSent(void) const;
+    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(void);
+    virtual cec_logical_address   GetMyLogicalAddress(void) const;
+    virtual uint16_t              GetMyPhysicalAddress(void) const;
+    virtual CStdString            GetOSDName(void);
+    virtual uint16_t              GetPhysicalAddress(bool bRefresh = true);
+    virtual cec_power_status      GetPowerStatus(void);
+    virtual CCECProcessor *       GetProcessor(void) const { return m_processor; }
+    virtual cec_device_type       GetType(void) const { return m_type; }
+    virtual cec_vendor_id         GetVendorId(void);
+    virtual const char *          GetVendorName(void);
+    virtual bool                  MyLogicalAddressContains(cec_logical_address address) const;
+    virtual cec_bus_device_status GetStatus(bool bForcePoll = false);
 
-    static const char *CECVendorIdToString(const uint64_t iVendorId);
+    bool RequestCecVersion(void);
+    bool RequestMenuLanguage(void);
+    bool RequestPowerStatus(void);
+    bool RequestVendorId(void);
+    bool RequestPhysicalAddress(void);
+    bool RequestOSDName(void);
+
+    virtual void SetInactiveDevice(void);
+    virtual void SetActiveDevice(void);
+    virtual bool TryLogicalAddress(void);
+
+    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 void SetVendorId(uint64_t iVendorId);
+    virtual void SetPowerStatus(const cec_power_status powerStatus);
+
+    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);
+    virtual bool SendKeypress(cec_user_control_code key, bool bWait = true);
+    virtual bool SendKeyRelease(bool bWait = true);
 
   protected:
-    uint16_t            m_iPhysicalAddress;
-    cec_logical_address m_iLogicalAddress;
-    cec_menu_language   m_menuLanguage;
-    CCECProcessor      *m_processor;
-    CCECCommandHandler *m_handler;
-    uint64_t            m_iVendorId;
-    uint8_t             m_iVendorClass;
-    uint64_t            m_iLastActive;
-    cec_version         m_cecVersion;
-    CMutex              m_mutex;
-    CCondition          m_condition;
+    bool NeedsPoll(void);
+
+    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;
+    cec_menu_state        m_menuState;
+    bool                  m_bActiveSource;
+    uint64_t              m_iLastCommandSent;
+    uint64_t              m_iLastActive;
+    cec_version           m_cecVersion;
+    cec_bus_device_status m_deviceStatus;
+    CMutex                m_transmitMutex;
+    CMutex                m_writeMutex;
+    CMutex                m_mutex;
+    CCondition            m_condition;
   };
 };