X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_return.cc;h=1eae5d31719e4fde4a97f8a19e1594729e4264f1;hb=5b4c3aa226dc95f33dc3ffae6669a24f5e8b8fe0;hp=409c87d93c3d4e12e9f3c5d57f3e72bf385e835b;hpb=86f24d20e1616ffaafc97de65db49fd6a91270f8;p=ardour.git

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 409c87d93c..1eae5d3171 100644
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,92 +16,53 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <glibmm/thread.h>
-
-#include "pbd/failed_constructor.h"
+#include <glibmm/threads.h>
 
 #include "ardour/internal_return.h"
-#include "ardour/mute_master.h"
-#include "ardour/session.h"
+#include "ardour/internal_send.h"
+#include "ardour/route.h"
 
 using namespace std;
 using namespace ARDOUR;
 
-sigc::signal<void,nframes_t> InternalReturn::CycleStart;
-
 InternalReturn::InternalReturn (Session& s)
 	: Return (s, true)
-	, user_count (0)
-{
-	CycleStart.connect (mem_fun (*this, &InternalReturn::cycle_start));
-}
-
-InternalReturn::InternalReturn (Session& s, const XMLNode& node)
-	: Return (s, node, true)
-	, user_count (0)
 {
-	CycleStart.connect (mem_fun (*this, &InternalReturn::cycle_start));
+        _display_to_user = false;
 }
 
 void
-InternalReturn::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
 {
-	if (user_count == 0) {
-		/* nothing to do - nobody is feeding us anything */
+	if (!_active && !_pending_active) {
 		return;
 	}
 
-	/* XXX this should be merge() */
-
-	bufs.merge_from (buffers, nframes);
-}
-
-bool
-InternalReturn::configure_io (ChanCount in, ChanCount out)
-{
-	IOProcessor::configure_io (in, out);
-	allocate_buffers (_session.get_block_size());
-	return true;
-}
-
-void 
-InternalReturn::set_block_size (nframes_t nframes)
-{
-	allocate_buffers (nframes);
-}
-
-void
-InternalReturn::allocate_buffers (nframes_t nframes)
-{
-	buffers.ensure_buffers (DataType::AUDIO, _configured_input.n_audio(), nframes);
-	buffers.ensure_buffers (DataType::MIDI, _configured_input.n_midi(), 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 () && (!(*i)->source_route() || (*i)->source_route()->active())) {
+				bufs.merge_from ((*i)->get_buffers(), nframes);
+			}
+		}
+	}
 
-BufferSet*
-InternalReturn::get_buffers ()
-{
-	Glib::Mutex::Lock lm (_session.engine().process_lock());
-	user_count++;
-	return &buffers;
+	_active = _pending_active;
 }
 
 void
-InternalReturn::release_buffers ()
+InternalReturn::add_send (InternalSend* send)
 {
-	Glib::Mutex::Lock lm (_session.engine().process_lock());
-	if (user_count) {
-		user_count--;
-	}
+	Glib::Threads::Mutex::Lock lm (_sends_mutex);
+	_sends.push_back (send);
 }
 
 void
-InternalReturn::cycle_start (nframes_t nframes)
+InternalReturn::remove_send (InternalSend* send)
 {
-	/* called from process cycle - no lock necessary */
-	if (user_count) {
-		/* don't bother with this if nobody is going to feed us anything */
-		buffers.silence (nframes, 0);
-	}
+	Glib::Threads::Mutex::Lock lm (_sends_mutex);
+	_sends.remove (send);
 }
 
 XMLNode&
@@ -119,18 +80,16 @@ InternalReturn::get_state()
 	return state (true);
 }
 
-int
-InternalReturn::set_state (const XMLNode& node)
+bool
+InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
-	return Return::set_state (node);
+	out = in;
+	return true;
 }
 
-bool 
-InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+bool
+InternalReturn::configure_io (ChanCount in, ChanCount out)
 {
-	out = in;
+	IOProcessor::configure_io (in, out);
 	return true;
 }
-
-
-