Remove unused method.

[ardour.git] / libs / ardour / meter.cc

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 0104de4bbddaae772fc5504cecfccd9d340b895e..226cf417f3864f2b6987817d7a33224a26379c5e 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -39,7 +39,7 @@ 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;
@@ -54,7 +54,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 +67,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 +115,8 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
 
        current_meters = in;
 
+        reset_max_channels (in);
+
        return Processor::configure_io (in, out);
 }