cec: separate 'last command sent' and 'last active' in CCECBusDevice

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

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index 69591669cd883b4c5a919b6cd3c2f11cb97c928f..04026489023c0c1a1cf299a80f01a325d09ff36d 100644 (file)
--- a/src/lib/devices/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -54,26 +54,29 @@ namespace CEC
     virtual bool PowerOn(void);
     virtual bool Standby(void);
 
-    virtual cec_version         GetCecVersion(bool bRefresh = true);
+    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 cec_menu_language & GetMenuLanguage(bool bRefresh = true);
+    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_power_status    GetPowerStatus(bool bRefresh = true);
-    virtual CCECProcessor *     GetProcessor() const { return m_processor; }
+    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 const cec_vendor &  GetVendor(void);
     virtual uint8_t             GetVendorClass(void) const { return m_iVendorClass; }
     virtual cec_vendor_id       GetVendorId(void) { return GetVendor().vendor; };
     virtual const char *        GetVendorName(void) { return GetVendor().AsString(); }
     virtual bool                MyLogicalAddressContains(cec_logical_address address) const;
 
-    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 SetPowerStatus(const cec_power_status powerStatus);
 
@@ -94,6 +97,7 @@ namespace CEC
     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;
@@ -101,7 +105,9 @@ namespace CEC
     CCECCommandHandler *m_handler;
     cec_vendor          m_vendor;
     bool                m_bMenuActive;
+    bool                m_bActiveSource;
     uint8_t             m_iVendorClass;
+    uint64_t            m_iLastCommandSent;
     uint64_t            m_iLastActive;
     cec_version         m_cecVersion;
     CMutex              m_mutex;