cec: more of the same. bugzid: 19

[deb_libcec.git] / src / lib / devices / CECBusDevice.h

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index 5971f58718a9fe929e78bddcfeffffb71c168aa2..477109bea9100d610ec66b710ab6d34b49fcf32f 100644 (file)
--- a/src/lib/devices/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -42,64 +42,74 @@ 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 GetMyLogicalAddress(void) const;
-    virtual uint16_t            GetMyPhysicalAddress(void) const;
-    virtual const char *        GetVendorName(void) { return GetVendor().AsString(); }
-    virtual cec_vendor_id       GetVendorId(void) { return GetVendor().vendor; };
-    virtual const cec_vendor &  GetVendor(void);
-    virtual uint8_t             GetVendorClass(void) const { return m_iVendorClass; }
+    virtual void AddLog(cec_log_level level, const CStdString &strMessage);
+    virtual bool HandleCommand(const cec_command &command);
+    virtual void PollVendorId(void);
+    virtual bool PowerOn(void);
+    virtual bool Standby(void);
+
+    virtual cec_version         GetCecVersion(void);
+    virtual CCECCommandHandler *GetHandler(void) const { return m_handler; };
+    virtual uint64_t            GetCommandSent(void) const { return m_iLastCommandSent; }
     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 uint16_t            GetPhysicalAddress(void) const { return m_iPhysicalAddress; }
-    virtual cec_version         GetCecVersion(bool bRefresh = true);
-    virtual cec_menu_language & GetMenuLanguage(bool bRefresh = true);
-    virtual cec_power_status    GetPowerStatus(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 bool PowerOn(void);
-    virtual bool Standby(void);
-    virtual bool SetOSDString(cec_display_control duration, const char *strMessage);
-    virtual void PollVendorId(void);
+    virtual void SetInactiveDevice(void);
+    virtual void SetActiveDevice(void);
 
-    virtual void SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress = 0);
+    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 SetVendorId(const cec_datapacket &data);
-    virtual void SetVendorId(uint64_t iVendorId, uint8_t iVendorClass = 0);
+    virtual void SetMenuState(const cec_menu_state state);
+    virtual void SetVendorId(uint64_t iVendorId);
     virtual void SetPowerStatus(const cec_power_status powerStatus);
 
-    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 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 bool TransmitActiveSource(void);
+    virtual bool TransmitCECVersion(cec_logical_address dest);
+    virtual bool TransmitInactiveView(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);
 
   protected:
+    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          m_vendor;
-    uint8_t             m_iVendorClass;
+    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;
+    CMutex              m_transmitMutex;
     CMutex              m_mutex;
     CCondition          m_condition;
   };