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 /libs/ardour/session_process.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 'libs/ardour/session_process.cc')
| -rw-r--r-- | libs/ardour/session_process.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 4bbe852687..a79a2e4cd8 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -469,7 +469,7 @@ Session::transport_locked () const { Slave* sl = _slave; - if (!locate_pending() && ((Config->get_slave_source() == None) || (sl && sl->ok() && sl->locked()))) { + if (!locate_pending() && (!config.get_external_sync() || (sl && sl->ok() && sl->locked()))) { return true; } @@ -487,7 +487,7 @@ Session::follow_slave (nframes_t nframes) if (!_slave->ok()) { stop_transport (); - Config->set_slave_source (None); + config.set_external_sync (false); goto noroll; } |