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

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 8ed1ade50d..ddc1e5e48f 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -36,16 +36,6 @@ class BufferSet;
 class ChanCount;
 class Session;
 
-class LIBARDOUR_API Metering {
-  public:
-	static void               update_meters ();
-	static PBD::Signal0<void> Meter;
-
-  private:
-	/* this object is not meant to be instantiated */
-	Metering();
-};
-
 /** Meters peaks on the input and stores them for access.
  */
 class LIBARDOUR_API PeakMeter : public Processor {
@@ -53,7 +43,6 @@ public:
         PeakMeter(Session& s, const std::string& name);
         ~PeakMeter();
 
-	void meter();
 	void reset ();
 	void reset_max ();
 
@@ -64,7 +53,7 @@ public:
 	   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,9 +61,10 @@ public:
 	*/
 
 	void reflect_inputs (const ChanCount& in);
+	void emit_configuration_changed ();
 
 	/** Compute peaks */
-	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
+	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool);
 
 	void activate ()   { }
 	void deactivate () { }
@@ -82,14 +72,6 @@ public:
 	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()) {
-			return _visible_peak_power[n];
-		} else {
-			return minus_infinity();
-		}
-	}
-
 	float meter_level (uint32_t n, MeterType type);
 
 	void set_type(MeterType t);
@@ -108,10 +90,14 @@ private:
 	 */
 	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;
+	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;