redesign technique for naming/creating regions for MIDI clone (or other non-capture...

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

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 26e865bec33f5397e506b803f629fb7db2c4ead7..ec736fef69c91cbf50b417ddad19f966e160be09 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -44,7 +44,7 @@ PeakMeter::PeakMeter (Session& s, const std::string& name)
        Iec2ppmdsp::init(s.nominal_frame_rate());
        Vumeterdsp::init(s.nominal_frame_rate());
        _pending_active = true;
-       _active = true;
+       _meter_type = MeterPeak;
 }
 
 PeakMeter::~PeakMeter ()
@@ -107,8 +107,12 @@ 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 | MeterK20 | MeterK14)) {
+               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);
                }
                if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) {
@@ -165,7 +169,7 @@ PeakMeter::reset_max ()
 }
 
 bool
-PeakMeter::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+PeakMeter::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
        out = in;
        return true;
@@ -270,7 +274,17 @@ PeakMeter::meter ()
                return;
        }
 
-       assert(_visible_peak_power.size() == _peak_signal.size());
+       // TODO block this thread while PeakMeter::reset_max_channels() is
+       // reallocating channels.
+       // (may happen with Session > New: old session not yet closed,
+       // meter-thread still active while new one is initializing and
+       // maybe on other occasions, too)
+       if (   (_visible_peak_power.size() != _peak_signal.size())
+                       || (_max_peak_power.size()     != _peak_signal.size())
+                       || (_max_peak_signal.size()    != _peak_signal.size())
+                        ) {
+               return;
+       }
 
        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());
@@ -278,7 +292,7 @@ PeakMeter::meter ()
        /* 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;
+       const float audio_meter_falloff = (_meter_type & (MeterK20 | MeterK14 | MeterK12)) ? 0.12f : midi_meter_falloff;
 
        for (size_t n = 0; n < limit; ++n) {
 
@@ -327,15 +341,18 @@ PeakMeter::meter ()
        }
 }
 
+#define CHECKSIZE(MTR) (n < MTR.size() + n_midi && n >= n_midi)
+
 float
 PeakMeter::meter_level(uint32_t n, MeterType type) {
        switch (type) {
                case MeterKrms:
                case MeterK20:
                case MeterK14:
+               case MeterK12:
                        {
-                               const int n_midi = current_meters.n_midi();
-                               if ((n - n_midi) < _kmeter.size() && (n - n_midi) >= 0) {
+                               const uint32_t n_midi = current_meters.n_midi();
+                               if (CHECKSIZE(_kmeter)) {
                                        return accurate_coefficient_to_dB (_kmeter[n - n_midi]->read());
                                }
                        }
@@ -343,8 +360,8 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
                case MeterIEC1DIN:
                case MeterIEC1NOR:
                        {
-                               const int n_midi = current_meters.n_midi();
-                               if ((n - n_midi) < _iec1meter.size() && (n - n_midi) >= 0) {
+                               const uint32_t n_midi = current_meters.n_midi();
+                               if (CHECKSIZE(_iec1meter)) {
                                        return accurate_coefficient_to_dB (_iec1meter[n - n_midi]->read());
                                }
                        }
@@ -352,16 +369,16 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
                case MeterIEC2BBC:
                case MeterIEC2EBU:
                        {
-                               const int n_midi = current_meters.n_midi();
-                               if ((n - n_midi) < _iec2meter.size() && (n - n_midi) >= 0) {
+                               const uint32_t n_midi = current_meters.n_midi();
+                               if (CHECKSIZE(_iec2meter)) {
                                        return accurate_coefficient_to_dB (_iec2meter[n - n_midi]->read());
                                }
                        }
                        break;
                case MeterVU:
                        {
-                               const int n_midi = current_meters.n_midi();
-                               if ((n - n_midi) < _vumeter.size() && (n - n_midi) >= 0) {
+                               const uint32_t n_midi = current_meters.n_midi();
+                               if (CHECKSIZE(_vumeter)) {
                                        return accurate_coefficient_to_dB (_vumeter[n - n_midi]->read());
                                }
                        }
@@ -392,7 +409,7 @@ PeakMeter::set_type(MeterType t)
 
        _meter_type = t;
 
-       if (t & (MeterKrms | MeterK20 | MeterK14)) {
+       if (t & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) {
                const size_t n_audio = current_meters.n_audio();
                for (size_t n = 0; n < n_audio; ++n) {
                        _kmeter[n]->reset();