summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/ardour/delivery.cc8
-rw-r--r--libs/ardour/panner_shell.cc9
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 {