X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fmeter.h;h=eea240f82145e138802960ec9f220ab3e9a832e0;hb=04eaf7b418c674d5babb4ecfe1312059daf899d4;hp=be8472b170f52e8a0161dbaac4d358214cd89884;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index be8472b170..eea240f821 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -20,7 +20,6 @@
 #define __ardour_meter_h__
 
 #include <vector>
-#include <sigc++/slot.h>
 #include "ardour/types.h"
 #include "ardour/processor.h"
 #include "pbd/fastlog.h"
@@ -34,37 +33,44 @@ class Session;
 class Metering {
   public:
 	static void               update_meters ();
-	static sigc::signal<void> Meter;
-
-	static sigc::connection   connect (sigc::slot<void> the_slot);
-	static void               disconnect (sigc::connection& c);
+	static PBD::Signal0<void> Meter;
 
   private:
 	/* this object is not meant to be instantiated */
-	virtual void foo() = 0;
-
-	static Glib::StaticMutex    m_meter_signal_lock;
+	Metering();
 };
 
 /** Meters peaks on the input and stores them for access.
  */
 class PeakMeter : public Processor {
 public:
-	PeakMeter(Session& s) : Processor(s, "Meter") {}
-	PeakMeter(Session&s, const XMLNode& node);
-
-	bool visible() const;
+        PeakMeter(Session& s, const std::string& name);
 
 	void meter();
-
 	void reset ();
 	void reset_max ();
 
 	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
 	bool configure_io (ChanCount in, ChanCount out);
 
+	/* special method for meter, to ensure that it can always handle the maximum
+	   number of streams in the route, no matter where we put it.
+	*/
+
+	void reset_max_channels (const ChanCount&);
+
+	/* tell the meter than no matter how many channels it can handle,
+	   `in' is the number it is actually going be handling from
+	   now on.
+	*/
+
+	void reflect_inputs (const ChanCount& in);
+
 	/** Compute peaks */
-	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
+
+	ChanCount input_streams () const { return current_meters; }
+	ChanCount output_streams () const { return current_meters; }
 
 	float peak_power (uint32_t n) {
 		if (n < _visible_peak_power.size()) {
@@ -87,6 +93,12 @@ public:
 private:
 	friend class IO;
 
+	/** The number of meters that we are currently handling;
+	 *  may be different to _configured_input and _configured_output
+	 *  as it can be altered outside a ::configure_io by ::reflect_inputs.
+	 */
+	ChanCount current_meters;
+
 	std::vector<float> _peak_power;
 	std::vector<float> _visible_peak_power;
 	std::vector<float> _max_peak_power;