X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.h;h=245f829405ece5fa8cdca9c24caa3309b5b72726;hb=305500533ee1524692ceaf3cb5f38d24225c5920;hp=64d26d0ea6ee0d5b07084142149fbdf66bdf37d8;hpb=62f5527da093117c4188e8fb3dc1469802be203e;p=deb_libcec.git

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index 64d26d0..245f829 100644
--- a/src/lib/devices/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -56,6 +56,7 @@ namespace CEC
 
     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;
@@ -66,23 +67,20 @@ namespace CEC
     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 const cec_vendor_id GetVendorId(void);
+    virtual const char *        GetVendorName(void);
     virtual bool                MyLogicalAddressContains(cec_logical_address address) const;
 
     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(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 TransmitActiveSource(void);
-    virtual bool TransmitActiveView(void);
     virtual bool TransmitCECVersion(cec_logical_address dest);
-    virtual bool TransmitDeckStatus(cec_logical_address dest);
     virtual bool TransmitInactiveView(void);
     virtual bool TransmitMenuState(cec_logical_address dest);
     virtual bool TransmitOSDName(cec_logical_address dest);
@@ -102,10 +100,10 @@ namespace CEC
     cec_menu_language   m_menuLanguage;
     CCECProcessor      *m_processor;
     CCECCommandHandler *m_handler;
-    cec_vendor          m_vendor;
-    bool                m_bMenuActive;
+    cec_vendor_id       m_vendor;
+    cec_menu_state      m_menuState;
     bool                m_bActiveSource;
-    uint8_t             m_iVendorClass;
+    uint64_t            m_iLastCommandSent;
     uint64_t            m_iLastActive;
     cec_version         m_cecVersion;
     CMutex              m_mutex;