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

Factor away duplicated ARDOUR_UI::toggle_roll() body

Browse source
This commit is contained in:
David Robillard 2021-06-17 11:07:58 -04:00
parent 648124dacb
commit b0fb8ae2c9
2 changed files with 1 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

64
gtk2_ardour/ardour_ui.cc
View file

@ -1855,69 +1855,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
return;
}
if (_session->is_auditioning()) {
_session->cancel_audition ();
return;
}
if (_session->config.get_external_sync()) {
switch (TransportMasterManager::instance().current()->type()) {
case Engine:
break;
default:
/* transport controlled by the master */
return;
}
}
bool rolling = _session->transport_rolling();
if (rolling) {
if (roll_out_of_bounded_mode) {
/* drop out of loop/range playback but leave transport rolling */
if (_session->get_play_loop()) {
if (_session->actively_recording()) {
/* actually stop transport because
otherwise the captured data will make
no sense.
*/
_session->request_play_loop (false, true);
} else {
_session->request_play_loop (false, false);
}
} else if (_session->get_play_range ()) {
_session->request_cancel_play_range ();
}
} else {
_session->request_stop (with_abort, true);
}
} else { /* not rolling */
if (with_abort) { /* with_abort == true means the command was intended to stop transport, not start. */
return;
}
if (_session->get_play_loop() && Config->get_loop_is_mode()) {
_session->request_locate (_session->locations()->auto_loop_location()->start(), MustRoll);
} else {
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
_session->request_play_range (&range, true);
_session->set_requested_return_sample (range.front().start); //force an auto-return here
}
}
_session->request_roll ();
}
}
_controller.toggle_roll (with_abort, roll_out_of_bounded_mode);
}
void

2
libs/ardour/session_controller.cc
View file

@ -257,8 +257,6 @@ SessionController::set_transport_speed (double speed)
void
SessionController::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
{
/* TO BE KEPT IN SYNC WITH ARDOUR_UI::toggle_roll() */
if (!_session) {
return;
}