X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmeter.cc;h=6cdcffb8b65ba807ded984d5aad545206224c01c;hb=62e730b57ab30bb8642c5682b53b7c534d923a24;hp=0104de4bbddaae772fc5504cecfccd9d340b895e;hpb=2726184f42652a84816096887948658177ea24f8;p=ardour.git

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 0104de4bbd..6cdcffb8b6 100644
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -39,14 +39,16 @@ PBD::Signal0<void> Metering::Meter;
  * be set to 0.
  */
 void
-PeakMeter::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes, bool)
+PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
 {
 	if (!_active && !_pending_active) {
 		return;
 	}
 
-	const uint32_t n_audio = min(_configured_input.n_audio(), bufs.count().n_audio());
-	const uint32_t n_midi  = min(_configured_input.n_midi(), bufs.count().n_midi());
+	// cerr << "meter " << name() << " runs with " << bufs.available() << " inputs\n";
+
+	const uint32_t n_audio = min (current_meters.n_audio(), bufs.count().n_audio());
+	const uint32_t n_midi  = min (current_meters.n_midi(), bufs.count().n_midi());
 
 	uint32_t n = 0;
 
@@ -54,7 +56,7 @@ PeakMeter::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_fram
 	for (uint32_t i = 0; i < n_midi; ++i, ++n) {
 		float val = 0.0f;
 		for (MidiBuffer::iterator e = bufs.get_midi(i).begin(); e != bufs.get_midi(i).end(); ++e) {
-			const Evoral::MIDIEvent<nframes_t> ev(*e, false);
+			const Evoral::MIDIEvent<framepos_t> ev(*e, false);
 			if (ev.is_note_on()) {
 				const float this_vel = log(ev.buffer()[2] / 127.0 * (M_E*M_E-M_E) + M_E) - 1.0;
 				if (this_vel > val) {
@@ -67,7 +69,7 @@ PeakMeter::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_fram
 				}
 			}
 		}
-		_peak_power[n] = val;
+		_peak_power[n] = max (val, _peak_power[n]);
 	}
 
 	// Meter audio in to the rest of the peaks
@@ -115,6 +117,8 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
 
 	current_meters = in;
 
+	reset_max_channels (in);
+
 	return Processor::configure_io (in, out);
 }
 
@@ -127,7 +131,7 @@ PeakMeter::reflect_inputs (const ChanCount& in)
 void
 PeakMeter::reset_max_channels (const ChanCount& chn)
 {
-	uint32_t limit = chn.n_total();
+	uint32_t const limit = chn.n_total();
 
 	while (_peak_power.size() > limit) {
 		_peak_power.pop_back();