From ad69a564a0cfe40bbb49d6254a70f9448d3b6841 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 18 May 2021 22:59:22 -0600 Subject: [PATCH] Revert "come to a complete stop if rewind/ffwd steps past -40 semitones slower" This reverts commit 05ef7f2647592bdf510bc459d52a17d5f4ace63b. This stopping behavior was not satisfactory. The behavior after this revert is not great, but better than the stop. --- gtk2_ardour/ardour_ui.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 1fcb588689..4a3e793c84 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2028,15 +2028,16 @@ ARDOUR_UI::transport_ffwd_rewind (bool fwd) /* close to zero, maybe flip direction */ - if (transport_speed != 0.0) { - _session->request_stop (TRS_UI); - } else { - if (fwd) { + if (fwd) { + if (transport_speed <= 0) { _session->request_transport_speed (1.0, false); - } else { - _session->request_transport_speed (-1.0, false); + _session->request_roll (TRS_UI); + } + } else { + if (transport_speed >= 0) { + _session->request_transport_speed (-1.0, false); + _session->request_roll (TRS_UI); } - _session->request_roll (TRS_UI); } /* either we've just started, or we're moving as slowly as we