cec: renamed all Broadcast...() and Report...() methods to Transmit...()

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

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index db89f40bc5571eeac20ba6e3540818d398b1f66f..4c7e54066c9ae4f41c70b23a6085f0d6a5ddbc9b 100644 (file)
--- a/src/lib/devices/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -42,21 +42,26 @@ 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) const { return CECVendorIdToString(m_iVendorId); }
-    virtual uint64_t            GetVendorId(void);
+    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 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(void);
-    virtual cec_menu_language & GetMenuLanguage(void);
-    virtual cec_power_status    GetPowerStatus(void);
+    virtual cec_version         GetCecVersion(bool bRefresh = true);
+    virtual cec_menu_language & GetMenuLanguage(bool bRefresh = true);
+    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);
@@ -76,28 +81,29 @@ namespace CEC
     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 TransmitCECVersion(cec_logical_address dest);
+    virtual bool TransmitDeckStatus(cec_logical_address dest);
+    virtual bool TransmitMenuState(cec_logical_address dest);
+    virtual bool TransmitOSDName(cec_logical_address dest);
+    virtual bool TransmitPowerState(cec_logical_address dest);
+    virtual bool TransmitVendorID(cec_logical_address dest);
 
-    static const char *CECVendorIdToString(const uint64_t iVendorId);
+    virtual bool TransmitActiveView(void);
+    virtual bool TransmitInactiveView(void);
+    virtual bool TransmitPhysicalAddress(void);
+    virtual bool TransmitActiveSource(void);
 
   protected:
+    cec_device_type     m_type;
+    CStdString          m_strDeviceName;
     uint16_t            m_iPhysicalAddress;
     cec_logical_address m_iLogicalAddress;
     cec_power_status    m_powerStatus;
     cec_menu_language   m_menuLanguage;
     CCECProcessor      *m_processor;
     CCECCommandHandler *m_handler;
-    uint64_t            m_iVendorId;
+    cec_vendor          m_vendor;
+    bool                m_bMenuActive;
     uint8_t             m_iVendorClass;
     uint64_t            m_iLastActive;
     cec_version         m_cecVersion;