Merge branch 'master' into windows

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

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 765038b728b6e6b2b3691f5a56fffdcb7a86642d..6c5470bbb942b20de692e450248ba6fcea2fac9b 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <limits>
 
 #include "pbd/compose.h"
 
@@ -44,7 +45,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 ()
@@ -149,7 +150,7 @@ void
 PeakMeter::reset_max ()
 {
        for (size_t i = 0; i < _max_peak_power.size(); ++i) {
-               _max_peak_power[i] = -INFINITY;
+               _max_peak_power[i] = -std::numeric_limits<float>::infinity();
                _max_peak_signal[i] = 0;
        }
 
@@ -159,13 +160,13 @@ PeakMeter::reset_max ()
                if (n < n_midi) {
                        _visible_peak_power[n] = 0;
                } else {
-                       _visible_peak_power[n] = -INFINITY;
+                       _visible_peak_power[n] = -std::numeric_limits<float>::infinity();
                }
        }
 }
 
 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 +271,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());
@@ -288,7 +299,7 @@ PeakMeter::meter ()
                _peak_signal[n] = 0;              /* ... to here */
 
                if (n < n_midi) {
-                       _max_peak_power[n] = -INFINITY; // std::max (new_peak, _max_peak_power[n]); // XXX
+                       _max_peak_power[n] = -std::numeric_limits<float>::infinity(); // std::max (new_peak, _max_peak_power[n]); // XXX
                        _max_peak_signal[n] = 0;
                        if (midi_meter_falloff == 0.0f || new_peak > _visible_peak_power[n]) {
                                ;
@@ -322,7 +333,7 @@ PeakMeter::meter ()
                } else {
                        // do falloff
                        new_peak = _visible_peak_power[n] - (audio_meter_falloff);
-                       _visible_peak_power[n] = std::max (new_peak, -INFINITY);
+                       _visible_peak_power[n] = std::max (new_peak, -std::numeric_limits<float>::infinity());
                }
        }
 }