smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix repeated toggling of loop mode

Browse source 
Calling Session::set_play_loop repeatedly (e.g. LLL) should toggle in and out
of loop play. Previously transport needed to be stopped before loop play could
be started for a second or subsequent time. This uses the loop_changing boolean
to flag that Session::non_realtime_stop should not unset the loop.

Also, Session::non_realtime_stop must reset loop_changing to false after use so
it does not affect the next transport action.
This commit is contained in:
Mark Knoop 2020-05-17 16:08:49 +01:00 • committed by Paul Davis
parent 2e7992dd58
commit 414ea28e78
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/ardour/session_transport.cc
View file

@ -1483,6 +1483,9 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
} }
} }
/* reset loop_changing so it does not affect next transport action */
loop_changing = false;
if (!_transport_fsm->declicking_for_locate()) { if (!_transport_fsm->declicking_for_locate()) {
DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: locate\n")); DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: locate\n"));
@ -1593,7 +1596,11 @@ Session::set_play_loop (bool yn, bool change_transport_state)
merge_event (new SessionEvent (SessionEvent::AutoLoop, SessionEvent::Replace, loc->end(), loc->start(), 0.0f)); merge_event (new SessionEvent (SessionEvent::AutoLoop, SessionEvent::Replace, loc->end(), loc->start(), 0.0f));
if (!Config->get_loop_is_mode()) { if (!Config->get_loop_is_mode()) {
/* args: positition, disposition, flush=true, for_loop_end=false, force=true */ if (transport_rolling()) {
/* set loop_changing to ensure that non_realtime_stop does not unset_play_loop */
loop_changing = true;
}
/* args: position, disposition, flush=true, for_loop_end=false, force=true */
TFSM_LOCATE (loc->start(), MustRoll, true, false, true); TFSM_LOCATE (loc->start(), MustRoll, true, false, true);
} else { } else {
if (!transport_rolling()) { if (!transport_rolling()) {