From 508c5eb5bd7e31d721c3a29fc734aab3a44aa8a9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 18 Jan 2012 01:30:44 +0000 Subject: make monitor section an optional feature than can be added/removed as needed. this is a big commit, and breakage is possible. it has been moderately tested. this commit also locks the remote control ID of the master bus to 318 and the monitor section (if any) to 319. the numbers are based on MIDI Machine Control limits git-svn-id: svn://localhost/ardour2/branches/3.0@11256 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/internal_return.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libs/ardour/internal_return.cc') diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc index 19f677f368..3c75c7957d 100644 --- a/libs/ardour/internal_return.cc +++ b/libs/ardour/internal_return.cc @@ -57,14 +57,18 @@ InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*e void InternalReturn::add_send (InternalSend* send) { - Glib::Mutex::Lock lm (_session.engine().process_lock()); + /* caller must hold process lock */ + assert (!AudioEngine::instance()->process_lock().trylock()); + _sends.push_back (send); } void InternalReturn::remove_send (InternalSend* send) { - Glib::Mutex::Lock lm (_session.engine().process_lock()); + /* caller must hold process lock */ + assert (!AudioEngine::instance()->process_lock().trylock()); + _sends.remove (send); } -- cgit v1.2.3