X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmeter.cc;h=5913ca54773aa1b70b47454f5a6d64e9bd153ca1;hb=6c50971eba37d879f1b8690ee231bb412ee1cda6;hp=5310fd747bbf5e0ac0e4bb592122e13c94b61eff;hpb=b0e4f81eb3a38b7236ec39f11d5211840a064d15;p=ardour.git

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 5310fd747b..5913ca5477 100644
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <limits>
 
 #include "pbd/compose.h"
 
@@ -86,9 +87,9 @@ PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_fr
 	// Meter MIDI in to the first n_midi peaks
 	for (uint32_t i = 0; i < n_midi; ++i, ++n) {
 		float val = 0.0f;
-		MidiBuffer& buf (bufs.get_midi(i));
+		const MidiBuffer& buf (bufs.get_midi(i));
 		
-		for (MidiBuffer::iterator e = buf.begin(); e != buf.end(); ++e) {
+		for (MidiBuffer::const_iterator e = buf.begin(); e != buf.end(); ++e) {
 			const Evoral::MIDIEvent<framepos_t> ev(*e, false);
 			if (ev.is_note_on()) {
 				const float this_vel = ev.buffer()[2] / 127.0;
@@ -107,7 +108,11 @@ PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_fr
 
 	// Meter audio in to the rest of the peaks
 	for (uint32_t i = 0; i < n_audio; ++i, ++n) {
-		_peak_signal[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_signal[n]);
+		if (bufs.get_audio(i).silent()) {
+			_peak_signal[n] = .0f;
+		} else {
+			_peak_signal[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_signal[n]);
+		}
 		if (_meter_type & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) {
 			_kmeter[i]->process(bufs.get_audio(i).data(), nframes);
 		}
@@ -149,7 +154,7 @@ void
 PeakMeter::reset_max ()
 {
 	for (size_t i = 0; i < _max_peak_power.size(); ++i) {
-		_max_peak_power[i] = -INFINITY;
+		_max_peak_power[i] = -std::numeric_limits<float>::infinity();
 		_max_peak_signal[i] = 0;
 	}
 
@@ -159,7 +164,7 @@ PeakMeter::reset_max ()
 		if (n < n_midi) {
 			_visible_peak_power[n] = 0;
 		} else {
-			_visible_peak_power[n] = -INFINITY;
+			_visible_peak_power[n] = -std::numeric_limits<float>::infinity();
 		}
 	}
 }
@@ -298,7 +303,7 @@ PeakMeter::meter ()
 		_peak_signal[n] = 0;              /* ... to here */
 
 		if (n < n_midi) {
-			_max_peak_power[n] = -INFINITY; // std::max (new_peak, _max_peak_power[n]); // XXX
+			_max_peak_power[n] = -std::numeric_limits<float>::infinity(); // std::max (new_peak, _max_peak_power[n]); // XXX
 			_max_peak_signal[n] = 0;
 			if (midi_meter_falloff == 0.0f || new_peak > _visible_peak_power[n]) {
 				;
@@ -332,7 +337,7 @@ PeakMeter::meter ()
 		} else {
 			// do falloff
 			new_peak = _visible_peak_power[n] - (audio_meter_falloff);
-			_visible_peak_power[n] = std::max (new_peak, -INFINITY);
+			_visible_peak_power[n] = std::max (new_peak, -std::numeric_limits<float>::infinity());
 		}
 	}
 }