diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-21 14:39:21 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-21 14:39:21 +0000 |
commit | f41149628955fc8145bef6db0c110b71664c0a3a (patch) | |
tree | 316e15017f50f3f320ee6a74edbc57eaf35cbd6e /libs/ardour/return.cc | |
parent | 2093d59a9613dccd509c90f5413b1a2efd164c4b (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/return.cc')
-rw-r--r-- | libs/ardour/return.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc index 5a44d3f6e6..e5af719afd 100644 --- a/libs/ardour/return.cc +++ b/libs/ardour/return.cc @@ -122,7 +122,7 @@ Return::set_state(const XMLNode& node) void Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) { - if (!active() || _input->n_ports() == ChanCount::ZERO) { + if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) { return; } @@ -141,6 +141,8 @@ Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframe _meter->run (bufs, start_frame, end_frame, nframes); } } + + _active = _pending_active; } bool |