diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-15 17:01:12 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-15 17:01:12 -0400 |
| commit | 50a6487e771f24803d82a1a1c6c3938448b07ae2 (patch) | |
| tree | ed5611bf63ba535c78fc52ea2769a0fea763de31 /libs/ardour | |
| parent | af2b8c73b9e9b34447fcab59eff2a9d54bde8b48 (diff) | |
move speed quietning code into Delivery, where it belongs.
Note: I find the -12dB reduction too much of a reduction.
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/delivery.cc | 8 | ||||
| -rw-r--r-- | libs/ardour/panner_shell.cc | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index bd07360340..5a4fbd3e1d 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -318,6 +318,14 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf goto out; } + // Speed quietning + + if (fabs (_session.transport_speed()) > 1.5 && Config->get_quieten_at_speed ()) { + Amp::apply_simple_gain (bufs, nframes, speed_quietning, false); + } + + // Panning + if (_panshell && !_panshell->bypassed() && _panshell->panner()) { // Use the panner to distribute audio to output port buffers diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc index 3884df8e74..d8d760ba8f 100644 --- a/libs/ardour/panner_shell.cc +++ b/libs/ardour/panner_shell.cc @@ -385,14 +385,7 @@ PannerShell::run (BufferSet& inbufs, BufferSet& outbufs, framepos_t start_frame, if (!(as & Play || ((as & Touch) && !_panner->touching()))) { - // Speed quietning - gain_t gain_coeff = GAIN_COEFF_UNITY; - - if (fabs(_session.transport_speed()) > 1.5 && Config->get_quieten_at_speed ()) { - gain_coeff = speed_quietning; - } - - distribute_no_automation (inbufs, outbufs, nframes, gain_coeff); + distribute_no_automation (inbufs, outbufs, nframes, 1.0); } else { |