Fix deadlock.
git-svn-id: svn://localhost/ardour2/branches/3.0@8286 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
b8429faada
commit
9e4b7a45fe
@ -244,14 +244,13 @@ PortInsert::signal_latency() const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Caller must not hold process lock */
|
/** Caller must hold process lock */
|
||||||
bool
|
bool
|
||||||
PortInsert::configure_io (ChanCount in, ChanCount out)
|
PortInsert::configure_io (ChanCount in, ChanCount out)
|
||||||
{
|
{
|
||||||
/* for an insert, processor input corresponds to IO output, and vice versa */
|
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) {
|
if (_input->ensure_io (in, false, this) != 0) {
|
||||||
return false;
|
return false;
|
||||||
@ -260,7 +259,6 @@ PortInsert::configure_io (ChanCount in, ChanCount out)
|
|||||||
if (_output->ensure_io (out, false, this) != 0) {
|
if (_output->ensure_io (out, false, this) != 0) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return Processor::configure_io (in, out);
|
return Processor::configure_io (in, out);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user