From 0f63cba3c7e568d45cd736efa3ecc4a7040bc421 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 27 Feb 2021 23:12:15 +0100 Subject: [PATCH] Fix audition-tool * Don't set default speed when using audition * Use actual engine speed, since v6 Session::transport_speed is {-1, 0, 1} --- gtk2_ardour/editor_mouse.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index ed55823026..252b5bcda3 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2109,7 +2109,7 @@ Editor::scrub (samplepos_t sample, double current_x) if (scrubbing_direction == 0) { /* first move */ _session->request_locate (sample, MustStop); - _session->request_transport_speed (0.1); + _session->request_transport_speed (0.1, false); scrubbing_direction = 1; } else { @@ -2133,7 +2133,7 @@ Editor::scrub (samplepos_t sample, double current_x) scrub_reverse_distance = 0; delta = 0.01 * (last_scrub_x - current_x); - _session->request_transport_speed_nonzero (_session->transport_speed() - delta); + _session->request_transport_speed_nonzero (_session->actual_speed() - delta, false); } } else { @@ -2152,7 +2152,7 @@ Editor::scrub (samplepos_t sample, double current_x) scrub_reverse_distance = 0; delta = 0.01 * (current_x - last_scrub_x); - _session->request_transport_speed_nonzero (_session->transport_speed() + delta); + _session->request_transport_speed_nonzero (_session->actual_speed() + delta, false); } } @@ -2164,11 +2164,11 @@ Editor::scrub (samplepos_t sample, double current_x) if (scrubbing_direction > 0) { /* was forwards, go backwards */ - _session->request_transport_speed (-0.1); + _session->request_transport_speed (-0.1, false); scrubbing_direction = -1; } else { /* was backwards, go forwards */ - _session->request_transport_speed (0.1); + _session->request_transport_speed (0.1, false); scrubbing_direction = 1; }