X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmeter.h;h=ddc1e5e48f1c83507199b545ee1944ace94b94ba;hb=6626723880e6d464bf8d59178120d191a8423c93;hp=ae0a1672dbf59609a3fe358a1b911146e979807e;hpb=8dab33c609bdf588aa33cd4e34019f7319f078d6;p=ardour.git

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index ae0a1672db..ddc1e5e48f 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -20,51 +20,40 @@
 #define __ardour_meter_h__
 
 #include <vector>
-#include <sigc++/slot.h>
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #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;
 class ChanCount;
 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);
-
-  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 {
+class LIBARDOUR_API 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 ();
 	void reset_max ();
 
-	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
+	bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
 	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&);
+	void set_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
@@ -72,38 +61,51 @@ public:
 	*/
 
 	void reflect_inputs (const ChanCount& in);
+	void emit_configuration_changed ();
 
 	/** Compute peaks */
-	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
-
-	float peak_power (uint32_t n) {
-		if (n < _visible_peak_power.size()) {
-			return _visible_peak_power[n];
-		} else {
-			return minus_infinity();
-		}
-	}
-
-	float max_peak_power (uint32_t n) {
-		if (n < _max_peak_power.size()) {
-			return _max_peak_power[n];
-		} else {
-			return minus_infinity();
-		}
-	}
+	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool);
+
+	void activate ()   { }
+	void deactivate () { }
+
+	ChanCount input_streams () const { return current_meters; }
+	ChanCount output_streams () const { return current_meters; }
+
+	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;
-	std::vector<float> _visible_peak_power;
-	std::vector<float> _max_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;
+
+	bool               _reset_dpm;
+	bool               _reset_max;
+
+	uint32_t           _bufcnt;
+	std::vector<float> _peak_buffer; // internal, integrate
+	std::vector<float> _peak_power;  // includes accurate falloff, hence dB
+	std::vector<float> _max_peak_signal; // dB calculation is done on demand
+	float _combined_peak; // Mackie surfaces expect the highest peak of all track channels
+
+	std::vector<Kmeterdsp *> _kmeter;
+	std::vector<Iec1ppmdsp *> _iec1meter;
+	std::vector<Iec2ppmdsp *> _iec2meter;
+	std::vector<Vumeterdsp *> _vumeter;
+
+	MeterType _meter_type;
+};
 
 } // namespace ARDOUR