allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix potential deadlock on session-load

Browse Source
This commit is contained in:
Robin Gareus
2016-12-12 00:09:24 +01:00
parent e4d6e4a87f
commit b52bf1a42c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/session.cc
View File

@@ -818,8 +818,10 @@ Session::setup_ltc ()
{
Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
_ltc_input->ensure_io (ChanCount (DataType::AUDIO, 1), true, this);
// TODO use auto-connect thread somehow (needs a route currently)
// see note in Session::auto_connect_thread_run() why process lock is needed.
reconnect_ltc_input ();
}
reconnect_ltc_input ();
}
if (state_tree && (child = find_named_node (*state_tree->root(), X_("LTC Out"))) != 0) {
@@ -828,8 +830,9 @@ Session::setup_ltc ()
{
Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
_ltc_output->ensure_io (ChanCount (DataType::AUDIO, 1), true, this);
// TODO use auto-connect thread
reconnect_ltc_output ();
}
reconnect_ltc_output ();
}
/* fix up names of LTC ports because we don't want the normal