X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmeter.h;h=a4ad8ecff466be7770f093303867c2b8537f31b9;hb=00f26394a9f4ec5264b67fc79c40bf648e0747bf;hp=1f5e3307d6079abbc28757ddd4022f32a86da143;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 1f5e3307d6..a4ad8ecff4 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -24,6 +24,11 @@
 #include "ardour/processor.h"
 #include "pbd/fastlog.h"
 
+#include "ardour/kmeterdsp.h"
+#include "ardour/iec1ppmdsp.h"
+#include "ardour/iec2ppmdsp.h"
+#include "ardour/vumeterdsp.h"
+
 namespace ARDOUR {
 
 class BufferSet;
@@ -33,24 +38,19 @@ class Session;
 class Metering {
   public:
 	static void               update_meters ();
-	static boost::signals2::signal<void()> Meter;
-
-	static boost::signals2::connection connect (boost::function<void()>);
-	static void                        disconnect (boost::signals2::connection& c);
+	static PBD::Signal0<void> Meter;
 
   private:
 	/* this object is not meant to be instantiated */
 	Metering();
-
-	static Glib::StaticMutex    m_meter_signal_lock;
 };
 
 /** 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);
+        PeakMeter(Session& s, const std::string& name);
+        ~PeakMeter();
 
 	void meter();
 	void reset ();
@@ -58,7 +58,7 @@ public:
 
 	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.
 	*/
@@ -73,7 +73,13 @@ public:
 	void reflect_inputs (const ChanCount& in);
 
 	/** Compute peaks */
-	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
+	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
+
+	void activate ()   { }
+	void deactivate () { }
+
+	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()) {
@@ -83,26 +89,36 @@ public:
 		}
 	}
 
-	float max_peak_power (uint32_t n) {
-		if (n < _max_peak_power.size()) {
-			return _max_peak_power[n];
-		} else {
-			return minus_infinity();
-		}
-	}
+	float meter_level (uint32_t n, MeterType type);
+
+	void set_type(MeterType t);
+	MeterType get_type() { return _meter_type; }
 
 	XMLNode& state (bool full);
-	
+
+	PBD::Signal1<void, MeterType> TypeChanged;
+
 private:
 	friend class IO;
-	
-	uint32_t current_meters;
-	
-	std::vector<float> _peak_power;
+
+	/** 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_signal;
 	std::vector<float> _visible_peak_power;
+	std::vector<float> _max_peak_signal;
 	std::vector<float> _max_peak_power;
-};
 
+	std::vector<Kmeterdsp *> _kmeter;
+	std::vector<Iec1ppmdsp *> _iec1meter;
+	std::vector<Iec2ppmdsp *> _iec2meter;
+	std::vector<Vumeterdsp *> _vumeter;
+
+	MeterType _meter_type;
+};
 
 } // namespace ARDOUR