Inrease the export "chunk size" to speed it up over 10% at least in some situations

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

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 7209236fe8ddcbe4b4abd6c6c03631a0476e09b5..ad2ed81194ece50b686f74c68aa0f1fda352ec43 100644 (file)
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -18,22 +18,15 @@
 
 #include <glibmm/thread.h>
 
-#include "pbd/failed_constructor.h"
-
 #include "ardour/internal_return.h"
-#include "ardour/mute_master.h"
-#include "ardour/session.h"
 #include "ardour/internal_send.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;
 }
 
@@ -44,63 +37,33 @@ 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::Mutex::Lock lm (_sends_mutex, Glib::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);
+                       }
                }
        }
 
        _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::Mutex::Lock lm (_sends_mutex);
        _sends.push_back (send);
 }
 
 void
 InternalReturn::remove_send (InternalSend* send)
 {
-       Glib::Mutex::Lock lm (_session.engine().process_lock());
+       Glib::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)
 {
@@ -116,12 +79,6 @@ InternalReturn::get_state()
        return state (true);
 }
 
-int
-InternalReturn::set_state (const XMLNode& node, int version)
-{
-       return Return::set_state (node, version);
-}
-
 bool
 InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 {
@@ -129,4 +86,9 @@ InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& ou
        return true;
 }
 
-
+bool
+InternalReturn::configure_io (ChanCount in, ChanCount out)
+{
+       IOProcessor::configure_io (in, out);
+       return true;
+}