diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-09 20:05:18 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-09 20:05:18 +0000 |
commit | 498dfebcca3b97cdd7b83444040042fe06626241 (patch) | |
tree | 09b397ba40679e67a1a265e6d227e39ee0b4b4da /gtk2_ardour/editor_ops.cc | |
parent | 8f508460903ef628a3f34ee60611b75ed4e1a734 (diff) |
90% done with external sync design changes (GUI now has toggle switch for ext/int sync; source chosen separately, currently in ardour prefs dialog ; fix libmidi++ and compilation scripts to correctly build JACK+ALSA support; minor contiuing tweaks on transport stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@6048 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index c9a5870df0..001e56da35 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -2350,13 +2350,14 @@ Editor::transition_to_rolling (bool fwd) return; } - switch (Config->get_slave_source()) { - case None: - case JACK: - break; - default: - /* transport controlled by the master */ - return; + if (session->config.get_external_sync()) { + switch (session->config.get_sync_source()) { + case JACK: + break; + default: + /* transport controlled by the master */ + return; + } } if (session->is_auditioning()) { |