Move event specific ringbuffer stuff to evoral.

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

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index e75c1d89caf5cad0ba0d428ffa9b1b90b643b2ec..5dee1d98451d9089d80c44e1e34ccac3aecad3ce 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -47,7 +47,7 @@ PeakMeter::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_f
                // GUI needs a better MIDI meter, not much information can be
                // expressed through peaks alone
                for (MidiBuffer::iterator i = bufs.get_midi(n).begin(); i != bufs.get_midi(n).end(); ++i) {
-                       const MIDI::Event& ev = *i;
+                       const Evoral::MIDIEvent& ev = *i;
                        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;
                                //printf("V %d -> %f\n", (int)((Byte)ev.buffer[2]), this_vel);
@@ -95,8 +95,9 @@ bool
 PeakMeter::configure_io (ChanCount in, ChanCount out)
 {
        /* we're transparent no matter what.  fight the power. */
-       if (out != in)
+       if (out != in) {
                return false;
+       }
 
        uint32_t limit = in.n_total();
 
@@ -116,9 +117,7 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
        assert(_visible_peak_power.size() == limit);
        assert(_max_peak_power.size() == limit);
 
-       Processor::configure_io(in, out);
-
-       return true;
+       return Processor::configure_io (in, out);
 }
 
 /** To be driven by the Meter signal from IO.