Fix well-known control Lua bindings

[ardour.git] / libs / ardour / internal_return.cc

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index fc5963603b5ac572d7d9313b3211b0b2c07bacc4..a162628853afd323afa70f39b1ad31af89989ed7 100644 (file)
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -20,6 +20,7 @@
 
 #include "ardour/internal_return.h"
 #include "ardour/internal_send.h"
+#include "ardour/route.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -31,17 +32,17 @@ InternalReturn::InternalReturn (Session& s)
 }
 
 void
-InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
+InternalReturn::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end_sample*/, double /*speed*/, pframes_t nframes, bool)
 {
        if (!_active && !_pending_active) {
                return;
        }
 
        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 ()) {
+                       if ((*i)->active () && (!(*i)->source_route() || (*i)->source_route()->active())) {
                                bufs.merge_from ((*i)->get_buffers(), nframes);
                        }
                }
@@ -64,19 +65,24 @@ InternalReturn::remove_send (InternalSend* send)
        _sends.remove (send);
 }
 
-XMLNode&
-InternalReturn::state (bool full)
+void
+InternalReturn::set_playback_offset (samplecnt_t cnt)
 {
-       XMLNode& node (Return::state (full));
-       /* override type */
-       node.add_property("type", "intreturn");
-       return node;
+       Processor::set_playback_offset (cnt);
+
+       Glib::Threads::Mutex::Lock lm (_sends_mutex); // TODO reader lock
+       for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
+               (*i)->set_delay_out (cnt);
+       }
 }
 
 XMLNode&
-InternalReturn::get_state()
+InternalReturn::state ()
 {
-       return state (true);
+       XMLNode& node (Return::state ());
+       /* override type */
+       node.set_property("type", "intreturn");
+       return node;
 }
 
 bool