X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_return.cc;h=fc5963603b5ac572d7d9313b3211b0b2c07bacc4;hb=f6d29abfc75c460b9e35717f2907e4e61bf38058;hp=568604272b8785b44bba30293b36fc426b14efda;hpb=26366a40629693b387331c81ed255116fa8f7f7c;p=ardour.git

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 568604272b..fc5963603b 100644
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -16,16 +16,10 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
-#include "pbd/failed_constructor.h"
-
-#include "ardour/audio_buffer.h"
 #include "ardour/internal_return.h"
-#include "ardour/mute_master.h"
-#include "ardour/session.h"
 #include "ardour/internal_send.h"
-#include "ardour/audioengine.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -43,11 +37,13 @@ InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*e
 		return;
 	}
 
-	/* _sends is only modified with the process lock held, so this is ok, I think */
-
-	for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
-		if ((*i)->active ()) {
-			bufs.merge_from ((*i)->get_buffers(), nframes);
+	Glib::Threads::Mutex::Lock lm (_sends_mutex, Glib::Threads::TRY_LOCK);
+	
+	if (lm.locked ()) {
+		for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
+			if ((*i)->active ()) {
+				bufs.merge_from ((*i)->get_buffers(), nframes);
+			}
 		}
 	}
 
@@ -57,14 +53,14 @@ 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());
+	Glib::Threads::Mutex::Lock lm (_sends_mutex);
 	_sends.push_back (send);
 }
 
 void
 InternalReturn::remove_send (InternalSend* send)
 {
-	Glib::Mutex::Lock lm (_session.engine().process_lock());
+	Glib::Threads::Mutex::Lock lm (_sends_mutex);
 	_sends.remove (send);
 }
 
@@ -84,8 +80,15 @@ InternalReturn::get_state()
 }
 
 bool
-InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
 	out = in;
 	return true;
 }
+
+bool
+InternalReturn::configure_io (ChanCount in, ChanCount out)
+{
+	IOProcessor::configure_io (in, out);
+	return true;
+}