ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix Play Range (#9360)

Browse Source 
When starting RangePlay while the transport is already rolling
the transport is now stopped (and de-clicked) before locating.

This should not clear the RangeStop event when it is caused
by a RangePlay request.
This commit is contained in:
Robin Gareus 2023-06-08 16:44:21 +02:00
parent 44a6069694
commit cd2d0448a9
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/session_process.cc
View File

@ -1019,7 +1019,7 @@ Session::process_event (SessionEvent* ev)
break;
case SessionEvent::RangeStop:
cerr << "RANGE STOP\n";
// cerr << "RANGE STOP\n";
TFSM_STOP (ev->yes_or_no, false);
remove = false;
del = false;

14
libs/ardour/session_transport.cc
View File

@ -142,8 +142,10 @@ Session::realtime_stop (bool abort, bool clear_state)
add_post_transport_work (todo);
}
_clear_event_type (SessionEvent::RangeStop);
_clear_event_type (SessionEvent::RangeLocate);
if (clear_state) {
_clear_event_type (SessionEvent::RangeStop);
_clear_event_type (SessionEvent::RangeLocate);
}
/* if we're going to clear loop state, then force disabling record BUT only if we're not doing latched rec-enable */
disable_record (true, (!Config->get_latched_record_enable() && clear_state));
@ -1499,11 +1501,13 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished, bool will_
clear_clicks();
unset_preroll_record_trim ();
/* do this before seeking, because otherwise the tracks will do the wrong thing in seamless loop mode.
*/
/* do these before seeking, because otherwise the tracks will do the wrong thing in seamless loop mode. */
if (ptw & PostTransportClearSubstate) {
unset_play_range ();
}
if (ptw & (PostTransportClearSubstate|PostTransportStop)) {
unset_play_range ();
if (!Config->get_loop_is_mode() && get_play_loop() && !loop_changing) {
unset_play_loop ();
}