From 1f0ac78bc4552834b2659cd3ff16b8643a1a9531 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 10 Dec 2010 22:46:53 +0000 Subject: [PATCH] Fix deadlock on closing a send IO dialogue. git-svn-id: svn://localhost/ardour2/branches/3.0@8240 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/processor.cc | 1 + libs/ardour/send.cc | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc index 86f63d5a2f..e5616987c6 100644 --- a/libs/ardour/processor.cc +++ b/libs/ardour/processor.cc @@ -247,6 +247,7 @@ Processor::set_state (const XMLNode& node, int version) return 0; } +/** Caller must hold process lock */ bool Processor::configure_io (ChanCount in, ChanCount out) { diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index 9e34080fe0..b4196e39e2 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -217,7 +217,7 @@ Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const return true; } -/** Caller must not hold process lock */ +/** Caller must hold process lock */ bool Send::configure_io (ChanCount in, ChanCount out) { @@ -226,7 +226,6 @@ Send::configure_io (ChanCount in, ChanCount out) } if (_output) { - Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock()); _output->ensure_io (out, false, 0); }