diff options
author | Carl Hetherington <carl@carlh.net> | 2010-12-16 12:48:11 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-12-16 12:48:11 +0000 |
commit | 9e4b7a45fee81854d5dc395e3df6b3ba6cc570ac (patch) | |
tree | 295b46cf0e6d5695e7a6fdef80fa539bd7589255 /libs/ardour/port_insert.cc | |
parent | b8429faada7c9af35fef1bedeac6af30fe670bdd (diff) |
Fix deadlock.
git-svn-id: svn://localhost/ardour2/branches/3.0@8286 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/port_insert.cc')
-rw-r--r-- | libs/ardour/port_insert.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc index b738c68de8..492fca2723 100644 --- a/libs/ardour/port_insert.cc +++ b/libs/ardour/port_insert.cc @@ -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); |