cec: more consistent log messages + cosmetics

[deb_libcec.git] / src / lib / CECProcessor.h

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index ad444480ff1e3f5f6259b48e212ea84ab4a0e9d7..8baf726904dd3a4d0f4512f199f131d3cf58ce34 100644 (file)
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -56,14 +56,16 @@ namespace CEC
       virtual bool Start(void);
       virtual void *Process(void);
 
-      virtual cec_version         GetDeviceCecVersion(cec_logical_address iAddress);
-      virtual bool                GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language);
-      virtual const std::string & GetDeviceName(void) { return m_strDeviceName; }
-      virtual uint64_t            GetDeviceVendorId(cec_logical_address iAddress);
-      virtual cec_power_status    GetDevicePowerStatus(cec_logical_address iAddress);
-      virtual cec_logical_address GetLogicalAddress(void) const { return m_logicalAddresses.primary; }
-      virtual bool                HasLogicalAddress(cec_logical_address address) const { return m_logicalAddresses.isset(address); }
-      virtual uint16_t            GetPhysicalAddress(void) const;
+      virtual bool                  IsMonitoring(void) const { return m_bMonitor; }
+      virtual cec_version           GetDeviceCecVersion(cec_logical_address iAddress);
+      virtual bool                  GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language);
+      virtual const std::string &   GetDeviceName(void) { return m_strDeviceName; }
+      virtual uint64_t              GetDeviceVendorId(cec_logical_address iAddress);
+      virtual cec_power_status      GetDevicePowerStatus(cec_logical_address iAddress);
+      virtual cec_logical_address   GetLogicalAddress(void) const { return m_logicalAddresses.primary; }
+      virtual cec_logical_addresses GetLogicalAddresses(void) const { return m_logicalAddresses; }
+      virtual bool                  HasLogicalAddress(cec_logical_address address) const { return m_logicalAddresses.isset(address); }
+      virtual uint16_t              GetPhysicalAddress(void) const;
 
       virtual bool SetActiveView(void);
       virtual bool SetInactiveView(void);
@@ -87,7 +89,7 @@ namespace CEC
       CCECBusDevice *m_busDevices[16];
 
   private:
-      bool TryLogicalAddress(cec_logical_address address, const char *strLabel, unsigned int iIndex);
+      bool TryLogicalAddress(cec_logical_address address, unsigned int iIndex);
       bool FindLogicalAddressRecordingDevice(unsigned int iIndex);
       bool FindLogicalAddressTuner(unsigned int iIndex);
       bool FindLogicalAddressPlaybackDevice(unsigned int iIndex);
@@ -109,5 +111,6 @@ namespace CEC
       CAdapterCommunication* m_communication;
       CLibCEC*               m_controller;
       bool                   m_bMonitor;
+      CecBuffer<cec_command> m_commandBuffer;
   };
 };