diff options
| -rw-r--r-- | libs/ardour/amp.cc | 11 | ||||
| -rw-r--r-- | libs/ardour/io.cc | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index ca1aa74bb5..c437b53243 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -39,10 +39,15 @@ Amp::run (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t target, boo // assert(bufs.buffer_capacity(DataType::AUDIO) >= nframes); // if we don't need to declick, defer to apply_simple_gain - if (initial == target) { - for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) { - apply_gain_to_buffer (i->data (), nframes, target); + if (target == 0.0) { + for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) { + memset (i->data(), 0, sizeof (Sample) * nframes); + } + } else if (target != 1.0) { + for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) { + apply_gain_to_buffer (i->data(), nframes, target); + } } return; } diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 67f365a400..b3dc2a89c9 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -249,7 +249,8 @@ IO::deliver_output (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, } - Amp::run(bufs, nframes, _gain, dg, _phase_invert); + if (dg != _gain || dg != 1.0) + Amp::run(bufs, nframes, _gain, dg, _phase_invert); } // Use the panner to distribute audio to output port buffers |