X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmeter.cc;h=a5e82c3bf3411131dd47d21903bbd371e79071ed;hb=07be98b3410ac70b3c4451592fb88def678611ef;hp=3bc12f20d620878b384b2d91283b01d3eb754914;hpb=49445140345fd4e57a833d3803e529c0c07d221c;p=ardour.git

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 3bc12f20d6..a5e82c3bf3 100644
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -1,16 +1,16 @@
 /*
-    Copyright (C) 2006 Paul Davis 
-    
+    Copyright (C) 2006 Paul Davis
+
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free
     Software Foundation; either version 2 of the License, or (at your option)
     any later version.
-    
+
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
     for more details.
-    
+
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
     675 Mass Ave, Cambridge, MA 02139, USA.
@@ -53,11 +53,11 @@ Metering::disconnect (sigc::connection& c)
 /**
     Update the meters.
 
-    The meter signal lock is taken to prevent modification of the 
+    The meter signal lock is taken to prevent modification of the
     Meter signal while updating the meters, taking the meter signal
-    lock prior to taking the io_lock ensures that all IO will remain 
+    lock prior to taking the io_lock ensures that all IO will remain
     valid while metering.
-*/   
+*/
 void
 Metering::update_meters()
 {
@@ -71,17 +71,17 @@ 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;
 	}
 
 	const uint32_t n_audio = min(_configured_input.n_audio(), bufs.count().n_audio());
 	const uint32_t n_midi  = min(_configured_input.n_midi(), bufs.count().n_midi());
-	
+
 	uint32_t n = 0;
-	
+
 	// Meter MIDI in to the first n_midi peaks
 	for (uint32_t i = 0; i < n_midi; ++i, ++n) {
 		float val = 0.0f;
@@ -104,13 +104,15 @@ PeakMeter::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nfr
 
 	// Meter audio in to the rest of the peaks
 	for (uint32_t i = 0; i < n_audio; ++i, ++n) {
-		_peak_power[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_power[n]); 
+		_peak_power[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_power[n]);
 	}
 
 	// Zero any excess peaks
 	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)
@@ -147,9 +149,9 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
 	if (out != in) { // always 1:1
 		return false;
 	}
-	
+
 	uint32_t limit = in.n_total();
-	
+
 	while (_peak_power.size() > limit) {
 		_peak_power.pop_back();
 		_visible_peak_power.pop_back();
@@ -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();
@@ -185,21 +191,21 @@ PeakMeter::meter ()
 
 		/* grab peak since last read */
 
- 		float new_peak = _peak_power[n]; /* XXX we should use atomic exchange from here ... */
+		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) {
-			new_peak = coefficient_to_dB (new_peak);
+			new_peak = fast_coefficient_to_dB (new_peak);
 		} else {
 			new_peak = minus_infinity();
 		}
-		
+
 		/* 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 {