X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Finternal_return.cc;h=e42c067454823d7bc1341df08123f3c48e131424;hp=6402eded81a481895e3f558703f4795129ce65b3;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=a5674e92712aacae648e8d55ec7b767b6d988542

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 6402eded81..e42c067454 100644
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -16,107 +16,55 @@
     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/route.h"
 
 using namespace std;
 using namespace ARDOUR;
 
-PBD::Signal1<void, pframes_t> InternalReturn::CycleStart;
-
 InternalReturn::InternalReturn (Session& s)
 	: Return (s, true)
 {
-	CycleStart.connect_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1));
         _display_to_user = false;
 }
 
 void
-InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
+InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, double /*speed*/, pframes_t nframes, bool)
 {
 	if (!_active && !_pending_active) {
 		return;
 	}
 
-	/* _sends is only modified with the process lock held, so this is ok, I think */
+	Glib::Threads::Mutex::Lock lm (_sends_mutex, Glib::Threads::TRY_LOCK);
 
-	for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
-		if ((*i)->active ()) {
-			bufs.merge_from ((*i)->get_buffers(), nframes);
+	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);
+			}
 		}
 	}
 
-#if 0
-        if (_session.transport_rolling()) {
-                for (BufferSet::audio_iterator b = bufs.audio_begin(); b != bufs.audio_end(); ++b) {
-                        Sample* p = b->data ();
-                        for (pframes_t n = 0; n < nframes; ++n) {
-				if (p[n] != 0.0) {
-					cerr << "\tnon-zero data received\n";
-					break;
-				}
-                        }
-                }
-        }
-#endif
-
-
 	_active = _pending_active;
 }
 
-bool
-InternalReturn::configure_io (ChanCount in, ChanCount out)
-{
-	IOProcessor::configure_io (in, out);
-	allocate_buffers (_session.engine().frames_per_cycle());
-	return true;
-}
-
-int
-InternalReturn::set_block_size (pframes_t nframes)
-{
-	allocate_buffers (nframes);
-        return 0;
-}
-
-void
-InternalReturn::allocate_buffers (pframes_t nframes)
-{
-	buffers.ensure_buffers (_configured_input, nframes);
-	buffers.set_count (_configured_input);
-}
-
 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);
 }
 
-void
-InternalReturn::cycle_start (pframes_t nframes)
-{
-	/* called from process cycle - no lock necessary */
-	if (!_sends.empty ()) {
-		/* don't bother with this if nobody is going to feed us anything */
-		buffers.silence (nframes, 0);
-	}
-}
-
 XMLNode&
 InternalReturn::state (bool full)
 {
@@ -132,17 +80,16 @@ InternalReturn::get_state()
 	return state (true);
 }
 
-int
-InternalReturn::set_state (const XMLNode& node, int version)
+bool
+InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
-	return Return::set_state (node, version);
+	out = in;
+	return true;
 }
 
 bool
-InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+InternalReturn::configure_io (ChanCount in, ChanCount out)
 {
-	out = in;
+	IOProcessor::configure_io (in, out);
 	return true;
 }
-
-