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 c574ff0bdb7482dbb4a2eefb7e67728156506344..5dee1d98451d9089d80c44e1e34ccac3aecad3ce 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -28,17 +28,44 @@ namespace ARDOUR {
 
 
 /** Get peaks from @a bufs
- * Input acceptance is lenient - the first n audio buffers from @a bufs will
+ * Input acceptance is lenient - the first n buffers from @a bufs will
  * be metered, where n was set by the last call to setup(), excess meters will
  * be set to 0.
  */
 void
-PeakMeter::run (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset)
+PeakMeter::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
 {
-       size_t meterable = std::min(bufs.count().get(DataType::AUDIO), _peak_power.size());
+       size_t meterable = std::min((size_t)bufs.count().n_total(), _peak_power.size());
 
-       // Meter what we have
-       for (size_t n = 0; n < meterable; ++n) {
+       size_t n = 0;
+
+       // Meter what we have (midi)
+       for ( ; n < meterable && n < bufs.count().n_midi(); ++n) {
+       
+               float val = 0;
+               
+               // 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 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);
+                               if (this_vel > val)
+                                       val = this_vel;
+                       } else {
+                               val += 1.0 / bufs.get_midi(n).capacity();
+                               if (val > 1.0)
+                                       val = 1.0;
+                       }
+               }
+                       
+               _peak_power[n] = val;
+
+       }
+       
+       // Meter what we have (audio)
+       for ( ; n < meterable && n < bufs.count().n_audio(); ++n) {
                _peak_power[n] = compute_peak (bufs.get_audio(n).data(nframes, offset), nframes, _peak_power[n]); 
        }
 
@@ -57,17 +84,40 @@ PeakMeter::reset ()
 }
 
 void
-PeakMeter::setup (const ChanCount& in)
+PeakMeter::reset_max ()
+{
+       for (size_t i = 0; i < _max_peak_power.size(); ++i) {
+               _max_peak_power[i] = -INFINITY;
+       }
+}
+
+bool
+PeakMeter::configure_io (ChanCount in, ChanCount out)
 {
-       uint32_t limit = in.get(DataType::AUDIO);
+       /* we're transparent no matter what.  fight the power. */
+       if (out != in) {
+               return false;
+       }
+
+       uint32_t limit = in.n_total();
+
+       while (_peak_power.size() > limit) {
+               _peak_power.pop_back();
+               _visible_peak_power.pop_back();
+               _max_peak_power.pop_back();
+       }
 
        while (_peak_power.size() < limit) {
-               _peak_power.push_back (0);
-               _visible_peak_power.push_back (0);
+               _peak_power.push_back(0);
+               _visible_peak_power.push_back(minus_infinity());
+               _max_peak_power.push_back(minus_infinity());
        }
 
        assert(_peak_power.size() == limit);
        assert(_visible_peak_power.size() == limit);
+       assert(_max_peak_power.size() == limit);
+
+       return Processor::configure_io (in, out);
 }
 
 /** To be driven by the Meter signal from IO.
@@ -97,11 +147,15 @@ PeakMeter::meter ()
                        new_peak = minus_infinity();
                }
                
-               if (_session.meter_falloff() == 0.0f || new_peak > _visible_peak_power[n]) {
+               /* update max peak */
+               
+               _max_peak_power[n] = std::max (new_peak, _max_peak_power[n]);
+               
+               if (Config->get_meter_falloff() == 0.0f || new_peak > _visible_peak_power[n]) {
                        _visible_peak_power[n] = new_peak;
                } else {
                        // do falloff
-                       new_peak = _visible_peak_power[n] - _session.meter_falloff();
+                       new_peak = _visible_peak_power[n] - (Config->get_meter_falloff() * 0.01f);
                        _visible_peak_power[n] = std::max (new_peak, -INFINITY);
                }
        }