From 7381b8a8c62c7ebec41560907c209e6fb0dc16fc Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 4 May 2021 18:54:40 -0600 Subject: [PATCH] any varispeed action that doesn't also set the default speed cancels auto-return --- libs/ardour/session_transport.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 06ce3acaa9..9270812e04 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -365,7 +365,13 @@ Session::set_transport_speed (double speed) clear_clicks (); _engine_speed = new_engine_speed; - DEBUG_TRACE (DEBUG::Transport, string_compose ("send TSC3 with speed = %1\n", _transport_fsm->transport_speed())); + if (fabs (speed) != 1.0 && _transport_fsm->default_speed() == 1.0) { + /* varispeed of any sort cancels auto-return */ + _requested_return_sample = -1; + _last_roll_location = -1; + _last_roll_or_reversal_location = -1; + } + /* throttle signal emissions. * when slaved [_last]_transport_fsm->transport_speed()