13
0

Fix deadlock.

git-svn-id: svn://localhost/ardour2/branches/3.0@8286 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-12-16 12:48:11 +00:00
parent b8429faada
commit 9e4b7a45fe

View File

@ -244,22 +244,20 @@ PortInsert::signal_latency() const
}
}
/** Caller must not hold process lock */
/** Caller must hold process lock */
bool
PortInsert::configure_io (ChanCount in, ChanCount out)
{
assert (!AudioEngine::instance()->process_lock().trylock());
/* for an insert, processor input corresponds to IO output, and vice versa */
{
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
if (_input->ensure_io (in, false, this) != 0) {
return false;
}
if (_output->ensure_io (out, false, this) != 0) {
return false;
}
if (_input->ensure_io (in, false, this) != 0) {
return false;
}
if (_output->ensure_io (out, false, this) != 0) {
return false;
}
return Processor::configure_io (in, out);