From 7ba1f94fb162bb57ec5fc3eee7d46f9cbb6be26c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 27 Jan 2013 04:00:39 +0000 Subject: fix another semantically-significant-expression-in-assert case (though not a very important one, because the test is intended to fail) git-svn-id: svn://localhost/ardour2/branches/3.0@14010 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/delivery.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libs/ardour') diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 126b599299..9eaf843f7c 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -179,7 +179,10 @@ Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) con bool Delivery::configure_io (ChanCount in, ChanCount out) { - assert (!AudioEngine::instance()->process_lock().trylock()); +#ifndef NDEBUG + bool r = AudioEngine::instance()->process_lock().trylock(); + assert (!r && "trylock inside Delivery::configure_io"); +#endif /* check configuration by comparison with our I/O port configuration, if appropriate. see ::can_support_io_configuration() for comments -- cgit v1.2.3