diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-11-25 23:46:24 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-11-25 23:46:24 +0000 |
| commit | 54cbc45a5a40f4eefd64fa41ad9029f5f8f6a84f (patch) | |
| tree | 558e7cb27683030787fcb4d5654bd4b58ebd8e21 /libs/ardour/delivery.cc | |
| parent | 28c004f4fb0750b6a4236552bcc8de4946b9b164 (diff) | |
Prevent removal of route inputs when the plugins cannot be configured with the new number. Rework locking so that the process lock is held from the point that a route input is removed until after the processors are reconfigured; fixes #3548.
git-svn-id: svn://localhost/ardour2/branches/3.0@8089 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/delivery.cc')
| -rw-r--r-- | libs/ardour/delivery.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 4277ee4ed8..700efd8ac1 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -35,6 +35,7 @@ #include "ardour/panner.h" #include "ardour/port.h" #include "ardour/session.h" +#include "ardour/audioengine.h" #include "i18n.h" @@ -178,9 +179,12 @@ Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) con return false; } +/** Caller must hold process lock */ bool Delivery::configure_io (ChanCount in, ChanCount out) { + assert (!AudioEngine::instance()->process_lock().trylock()); + /* check configuration by comparison with our I/O port configuration, if appropriate. see ::can_support_io_configuration() for comments */ |