ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

move process lock taking to avoid deadlock when connecting ports 

git-svn-id: svn://localhost/ardour2/branches/3.0@8104 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-11-27 15:51:58 +00:00
parent c542d5421d
commit 7df2aa24c9
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/io_selector.cc
View File

@ -136,7 +136,6 @@ IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s)
ARDOUR::Bundle::PortList const & our_ports = c[_ours].bundle->channel_ports (c[_ours].channel);
ARDOUR::Bundle::PortList const & other_ports = c[_other].bundle->channel_ports (c[_other].channel);
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) {
for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) {
@ -145,12 +144,16 @@ IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s)
if (!f) {
return;
}
if (s) {
_io->connect (f, *j, 0);
} else {
_io->disconnect (f, *j, 0);
}
{
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
if (s) {
_io->connect (f, *j, 0);
} else {
_io->disconnect (f, *j, 0);
}
}
}
}
}