summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-01-12 08:28:54 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2016-01-12 08:28:54 -0500
commitdf5c5d338a7e3375fb1d6d56b5da59f5d1cc527f (patch)
tree287abee9af11ef26221ca3c8041d719a004fdcbf /gtk2_ardour
parent6b61d58b8a00b23c56cd685532f7c3e54ed8c25c (diff)
space bar action (Transport/ToggleRoll) should still start transport if synced to Engine (JACK)
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 0d6d9e8499..cfc1197afd 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2110,7 +2110,12 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
if (affect_transport) {
if (rolling) {
_session->request_stop (with_abort, true);
- } else if (!_session->config.get_external_sync()) {
+ } else {
+ /* the only external sync condition we can be in here
+ * would be Engine (JACK) sync, in which case we still
+ * want to do this.
+ */
+
if (UIConfiguration::instance().get_follow_edits() && ( editor->get_selection().time.front().start == _session->transport_frame() ) ) { //if playhead is exactly at the start of a range, we can assume it was placed there by follow_edits
_session->request_play_range (&editor->get_selection().time, true);
_session->set_requested_return_frame( editor->get_selection().time.front().start ); //force an auto-return here