fix compiler warning

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

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 383a5bdfad7ccb96d592a92855416c1a919f8935..3c2d28ef1b8aef4d538a9302238ef62c9207b994 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -106,13 +106,13 @@ 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 (_meter_type & MeterKrms) {
+               if (_meter_type & (MeterKrms | MeterK20 | MeterK14)) {
                        _kmeter[i]->process(bufs.get_audio(i).data(), nframes);
                }
-               if (_meter_type & MeterIEC1) {
+               if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) {
                        _iec1meter[i]->process(bufs.get_audio(i).data(), nframes);
                }
-               if (_meter_type & MeterIEC2) {
+               if (_meter_type & (MeterIEC2BBC | MeterIEC2EBU)) {
                        _iec2meter[i]->process(bufs.get_audio(i).data(), nframes);
                }
                if (_meter_type & MeterVU) {
@@ -134,6 +134,13 @@ PeakMeter::reset ()
        for (size_t i = 0; i < _peak_signal.size(); ++i) {
                _peak_signal[i] = 0.0f;
        }
+
+       for (size_t n = 0; n < _kmeter.size(); ++n) {
+               _kmeter[n]->reset();
+               _iec1meter[n]->reset();
+               _iec2meter[n]->reset();
+               _vumeter[n]->reset();
+       }
 }
 
 void
@@ -143,6 +150,16 @@ PeakMeter::reset_max ()
                _max_peak_power[i] = -INFINITY;
                _max_peak_signal[i] = 0;
        }
+
+       const size_t n_midi  = min (_peak_signal.size(), (size_t) current_meters.n_midi());
+
+       for (size_t n = 0; n < _peak_signal.size(); ++n) {
+               if (n < n_midi) {
+                       _visible_peak_power[n] = 0;
+               } else {
+                       _visible_peak_power[n] = -INFINITY;
+               }
+       }
 }
 
 bool
@@ -173,7 +190,6 @@ PeakMeter::reflect_inputs (const ChanCount& in)
 
        const size_t limit = min (_peak_signal.size(), (size_t) current_meters.n_total ());
        const size_t n_midi  = min (_peak_signal.size(), (size_t) current_meters.n_midi());
-       const size_t n_audio = current_meters.n_audio();
 
        for (size_t n = 0; n < limit; ++n) {
                if (n < n_midi) {
@@ -183,13 +199,7 @@ PeakMeter::reflect_inputs (const ChanCount& in)
                }
        }
 
-       for (size_t n = 0; n < n_audio; ++n) {
-               _kmeter[n]->reset();
-               _iec1meter[n]->reset();
-               _iec2meter[n]->reset();
-               _vumeter[n]->reset();
-       }
-
+       reset();
        reset_max();
 
        ConfigurationChanged (in, in); /* EMIT SIGNAL */
@@ -241,6 +251,9 @@ PeakMeter::reset_max_channels (const ChanCount& chn)
        assert(_iec1meter.size() == n_audio);
        assert(_iec2meter.size() == n_audio);
        assert(_vumeter.size() == n_audio);
+
+       reset();
+       reset_max();
 }
 
 /** To be driven by the Meter signal from IO.
@@ -260,6 +273,11 @@ PeakMeter::meter ()
        const size_t limit = min (_peak_signal.size(), (size_t) current_meters.n_total ());
        const size_t n_midi  = min (_peak_signal.size(), (size_t) current_meters.n_midi());
 
+       /* 0.01f ^= 100 Hz update rate */
+       const float midi_meter_falloff = Config->get_meter_falloff() * 0.01f;
+       /* kmeters: 24dB / 2 sec */
+       const float audio_meter_falloff = (_meter_type & (MeterK20 | MeterK14)) ? 0.12f : midi_meter_falloff;
+
        for (size_t n = 0; n < limit; ++n) {
 
                /* grab peak since last read */
@@ -270,11 +288,11 @@ PeakMeter::meter ()
                if (n < n_midi) {
                        _max_peak_power[n] = -INFINITY; // std::max (new_peak, _max_peak_power[n]); // XXX
                        _max_peak_signal[n] = 0;
-                       if (Config->get_meter_falloff() == 0.0f || new_peak > _visible_peak_power[n]) {
+                       if (midi_meter_falloff == 0.0f || new_peak > _visible_peak_power[n]) {
                                ;
                        } else {
-                               /* empirical WRT to falloff times , 0.01f ^= 100 Hz update rate */
-                               new_peak = _visible_peak_power[n] - sqrt(_visible_peak_power[n] * Config->get_meter_falloff() * 0.01f * 0.0002f);
+                               /* empirical algorithm WRT to audio falloff times */
+                               new_peak = _visible_peak_power[n] - sqrt(_visible_peak_power[n] * midi_meter_falloff * 0.0002f);
                                if (new_peak < (1.0 / 512.0)) new_peak = 0;
                        }
                        _visible_peak_power[n] = new_peak;
@@ -297,11 +315,11 @@ PeakMeter::meter ()
 
                _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]) {
+               if (audio_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] - (Config->get_meter_falloff() * 0.01f);
+                       new_peak = _visible_peak_power[n] - (audio_meter_falloff);
                        _visible_peak_power[n] = std::max (new_peak, -INFINITY);
                }
        }
@@ -311,24 +329,28 @@ float
 PeakMeter::meter_level(uint32_t n, MeterType type) {
        switch (type) {
                case MeterKrms:
+               case MeterK20:
+               case MeterK14:
                        {
-                               const uint32_t n_midi = current_meters.n_midi();
+                               const int n_midi = current_meters.n_midi();
                                if ((n - n_midi) < _kmeter.size() && (n - n_midi) >= 0) {
                                        return accurate_coefficient_to_dB (_kmeter[n - n_midi]->read());
                                }
                        }
                        break;
-               case MeterIEC1:
+               case MeterIEC1DIN:
+               case MeterIEC1NOR:
                        {
-                               const uint32_t n_midi = current_meters.n_midi();
+                               const int n_midi = current_meters.n_midi();
                                if ((n - n_midi) < _iec1meter.size() && (n - n_midi) >= 0) {
                                        return accurate_coefficient_to_dB (_iec1meter[n - n_midi]->read());
                                }
                        }
                        break;
-               case MeterIEC2:
+               case MeterIEC2BBC:
+               case MeterIEC2EBU:
                        {
-                               const uint32_t n_midi = current_meters.n_midi();
+                               const int n_midi = current_meters.n_midi();
                                if ((n - n_midi) < _iec2meter.size() && (n - n_midi) >= 0) {
                                        return accurate_coefficient_to_dB (_iec2meter[n - n_midi]->read());
                                }
@@ -336,7 +358,7 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
                        break;
                case MeterVU:
                        {
-                               const uint32_t n_midi = current_meters.n_midi();
+                               const int n_midi = current_meters.n_midi();
                                if ((n - n_midi) < _vumeter.size() && (n - n_midi) >= 0) {
                                        return accurate_coefficient_to_dB (_vumeter[n - n_midi]->read());
                                }
@@ -368,19 +390,19 @@ PeakMeter::set_type(MeterType t)
 
        _meter_type = t;
 
-       if (t & MeterKrms) {
+       if (t & (MeterKrms | MeterK20 | MeterK14)) {
                const size_t n_audio = current_meters.n_audio();
                for (size_t n = 0; n < n_audio; ++n) {
                        _kmeter[n]->reset();
                }
        }
-       if (t & MeterIEC1) {
+       if (t & (MeterIEC1DIN | MeterIEC1NOR)) {
                const size_t n_audio = current_meters.n_audio();
                for (size_t n = 0; n < n_audio; ++n) {
                        _iec1meter[n]->reset();
                }
        }
-       if (t & MeterIEC2) {
+       if (t & (MeterIEC2BBC | MeterIEC2EBU)) {
                const size_t n_audio = current_meters.n_audio();
                for (size_t n = 0; n < n_audio; ++n) {
                        _iec2meter[n]->reset();