Merged with trunk R1283.

NOTE: Compiles, but broken (crash on adding MIDI track).


git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 10 insertions, 0 deletions

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index f18a2e6de9..17379c3baa 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -38,6 +38,7 @@ public:
 
 	void setup (const ChanCount& in);
 	void reset ();
+	void reset_max ();
 
 	/** Compute peaks */
 	void run (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset=0);
@@ -49,6 +50,14 @@ public:
 			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();
+		}
+	}
 
 private:
 	
@@ -58,6 +67,7 @@ private:
 	Session&           _session;
 	std::vector<float> _peak_power;
 	std::vector<float> _visible_peak_power;
+	std::vector<float> _max_peak_power;
 };