do not ask for locate-to-loop start in GUI toggle roll

This may have implications for similar code in control surface support
This commit is contained in:
Paul Davis 2021-06-28 14:08:50 -06:00
parent 71afe02d8a
commit 9db76f951b
1 changed files with 2 additions and 4 deletions

View File

@ -1903,9 +1903,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
return;
}
if (_session->get_play_loop() && Config->get_loop_is_mode()) {
_session->request_locate (_session->locations()->auto_loop_location()->start(), MustRoll);
} else {
if (!_session->get_play_loop() && !Config->get_loop_is_mode()) {
if (UIConfiguration::instance().get_follow_edits()) {
list<AudioRange>& range = editor->get_selection().time;
if (range.front().start == _session->transport_sample()) { // if playhead is exactly at the start of a range, we assume it was placed there by follow_edits
@ -1913,8 +1911,8 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
_session->set_requested_return_sample (range.front().start); //force an auto-return here
}
}
_session->request_roll ();
}
_session->request_roll ();
}
}