diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-22 20:49:21 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-22 20:49:21 +0000 |
commit | 333817557d0063b7204ca95cd40176f99d7a1f1d (patch) | |
tree | 3d44e9f676fcc0794a027afd0f42e0a317d5d3bd /libs | |
parent | 13bf1fff6fcce8382e39de0ed1d62c30f3781e0f (diff) |
make metering do the right thing if panner is bypassed
git-svn-id: svn://localhost/ardour2/branches/3.0@8927 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/delivery.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 56057ca7cc..bc2d7b8081 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -294,9 +294,6 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf _panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes); - if (result_required) { - bufs.read_from (output_buffers (), nframes); - } } else { @@ -311,6 +308,10 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf } } + if (result_required) { + bufs.read_from (output_buffers (), nframes); + } + out: _active = _pending_active; } |