diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-03 18:44:06 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-03 18:44:06 +0000 |
commit | 03c74e45a871f2e09fb1ee855f830c94d1cdb163 (patch) | |
tree | e0bd9da870df25c4127d22a4fb79359bdebea701 /libs/ardour/session_state.cc | |
parent | c9dda81a693ba9c06b9d62f5df56c04be75adfca (diff) |
more tweaks to MTC slave code (still not functional), including removing race conditions when resetting slave state; make Session catch on its own saved preferences, which has not been happening; make switching sync sources avoid race conditions
git-svn-id: svn://localhost/ardour2/branches/3.0@6269 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_state.cc')
-rw-r--r-- | libs/ardour/session_state.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index bcc3afbb05..e2df46c83a 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -58,6 +58,7 @@ #include "midi++/port.h" #include "pbd/boost_debug.h" +#include "pbd/enumwriter.h" #include "pbd/error.h" #include "pbd/pathscanner.h" #include "pbd/pthread_utils.h" @@ -3212,7 +3213,7 @@ Session::config_changed (std::string p, bool ours) if (!config.get_external_sync()) { drop_sync_source (); } else { - use_sync_source (config.get_sync_source()); + switch_to_sync_source (config.get_sync_source()); } } else if (p == "remote-model") { set_remote_control_ids (); |