From 852d8de563135803b4b36be1e8c8424020f918a2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 17 Jun 2021 11:08:50 -0400 Subject: [PATCH] Factor away duplicated ARDOUR_UI::transport_roll() body --- gtk2_ardour/ardour_ui.cc | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 014a536ad2..ade223394a 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1803,42 +1803,7 @@ ARDOUR_UI::transport_roll () return; } - if (_session->is_auditioning()) { - 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 (_session->get_play_loop()) { - - /* If loop playback is not a mode, then we should cancel - it when this action is requested. If it is a mode - we just leave it in place. - */ - - if (!Config->get_loop_is_mode()) { - /* stop loop playback but keep transport state */ - _session->request_play_loop (false, false); - } - - } else if (_session->get_play_range () ) { - /* stop playing a range if we currently are */ - _session->request_play_range (0, true); - } - - if (!rolling) { - _session->request_roll (); - } + _controller.transport_play (); } bool