interpolation.cc/.h: Spline-Bugfixes: Crash bug at tempos close to 0, wrong calculati...

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

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 3bc12f20d620878b384b2d91283b01d3eb754914..c8546c8ffa20b66ff1d2d8a228d85c5ab8d573d6 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -71,9 +71,9 @@ Metering::update_meters()
  * be set to 0.
  */
 void
-PeakMeter::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+PeakMeter::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes)
 {
-       if (!_active) {
+       if (!_active && !_pending_active) {
                return;
        }
 
@@ -111,6 +111,8 @@ PeakMeter::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nfr
        for (uint32_t i = n; i < _peak_power.size(); ++i) {
                _peak_power[i] = 0.0f;
        }
+
+       _active = _pending_active;
 }
 
 PeakMeter::PeakMeter (Session& s, const XMLNode& node)
@@ -177,6 +179,10 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
 void
 PeakMeter::meter ()
 {
+       if (!_active) {
+               return;
+       }
+
        assert(_visible_peak_power.size() == _peak_power.size());
 
        const size_t limit = _peak_power.size();
@@ -187,7 +193,7 @@ PeakMeter::meter ()
 
                float new_peak = _peak_power[n]; /* XXX we should use atomic exchange from here ... */
                _peak_power[n] = 0;              /* ... to here */
-               
+
                /* compute new visible value using falloff */
 
                if (new_peak > 0.0) {