summaryrefslogtreecommitdiff
path: root/libs/ardour/meter.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-07-21 14:39:21 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-07-21 14:39:21 +0000
commitf41149628955fc8145bef6db0c110b71664c0a3a (patch)
tree316e15017f50f3f320ee6a74edbc57eaf35cbd6e /libs/ardour/meter.cc
parent2093d59a9613dccd509c90f5413b1a2efd164c4b (diff)
fix clicking when processors become active/inactive; reduce crazy 2.5sec delay for quit dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@5402 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/meter.cc')
-rw-r--r--libs/ardour/meter.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index ba5ccf1501..e8512aa593 100644
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -73,7 +73,7 @@ Metering::update_meters()
void
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)