X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.h;h=69591669cd883b4c5a919b6cd3c2f11cb97c928f;hb=38bdb94305cac92a7ac8ea31e2c1533dc17fb8dc;hp=362e86ed4c0d146e12455d75e79453b10093e003;hpb=f8513317a5f4bb2d9d0843193c3c98eca19f8e8a;p=deb_libcec.git

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index 362e86e..6959166 100644
--- a/src/lib/devices/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -42,29 +42,33 @@ namespace CEC
 
   class CCECBusDevice
   {
+    friend class CCECProcessor;
+
   public:
     CCECBusDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0);
     virtual ~CCECBusDevice(void);
 
-    virtual bool                MyLogicalAddressContains(cec_logical_address address) const;
-    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(bool bRefresh = true);
+    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 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_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 bool                PollDevice(cec_logical_address source = CECDEVICE_UNKNOWN);
-
-    virtual bool PowerOn(void);
-    virtual bool Standby(void);
-    virtual bool SetOSDString(cec_display_control duration, const char *strMessage);
-    virtual void PollVendorId(void);
+    virtual CCECProcessor *     GetProcessor() const { return m_processor; }
+    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 SetCecVersion(const cec_version newVersion);
@@ -73,25 +77,22 @@ namespace CEC
     virtual void SetVendorId(uint64_t iVendorId, uint8_t iVendorClass = 0);
     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(cec_logical_address dest);
-    virtual bool ReportDeckStatus(cec_logical_address dest);
-    virtual bool ReportMenuState(cec_logical_address dest, bool bActive = true);
-    virtual bool ReportOSDName(cec_logical_address dest);
-    virtual bool ReportPowerState(cec_logical_address dest);
-    virtual bool ReportVendorID(cec_logical_address dest);
-
-    virtual bool BroadcastActiveView(void);
-    virtual bool BroadcastInactiveView(void);
-    virtual bool BroadcastPhysicalAddress(void);
-    virtual bool BroadcastActiveSource(void);
+    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);
+    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;
     cec_logical_address m_iLogicalAddress;
     cec_power_status    m_powerStatus;
@@ -99,6 +100,7 @@ namespace CEC
     CCECProcessor      *m_processor;
     CCECCommandHandler *m_handler;
     cec_vendor          m_vendor;
+    bool                m_bMenuActive;
     uint8_t             m_iVendorClass;
     uint64_t            m_iLastActive;
     cec_version         m_cecVersion;