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

fix deadlock caused by VCA=>VCA slaving and set_state()

Browse Source
This commit is contained in:
Paul Davis
2016-03-04 16:09:14 -05:00
parent cd6a88d0d4
commit aa80321976
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/ardour/vca_manager.cc
View File

@@ -140,13 +140,18 @@ VCAManager::set_state (XMLNode const& node, int version)
XMLNodeList const & children = node.children();
VCAList vcal;
{
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
if ((*i)->name() == VCA::xml_node_name) {
boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, **i, version));
Mutex::Lock lm (lock);
/* can't hold the lock for the entire loop,
* because the new VCA maybe slaved and needs
* to call back into us to set up its own
* slave/master relationship
*/
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
if ((*i)->name() == VCA::xml_node_name) {
boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, **i, version));
{
Mutex::Lock lm (lock);
_vcas.push_back (vca);
vcal.push_back (vca);
}