cleanup confused mess related to jack_port_type_get_buffer_size()

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

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 86d0a2deea47f7f9619eeb7eeef6cc923d21c288..6402eded81a481895e3f558703f4795129ce65b3 100644 (file)
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -20,44 +20,54 @@
 
 #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"
 
 using namespace std;
 using namespace ARDOUR;
 
-sigc::signal<void,nframes_t> InternalReturn::CycleStart;
+PBD::Signal1<void, pframes_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));
+       CycleStart.connect_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1));
+        _display_to_user = false;
 }
 
 void
-InternalReturn::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes, bool)
+InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
 {
        if (!_active && !_pending_active) {
                return;
        }
 
-       /* no lock here, just atomic fetch */
+       /* _sends is only modified with the process lock held, so this is ok, I think */
 
-       if (g_atomic_int_get(&user_count) == 0) {
-               /* nothing to do - nobody is feeding us anything */
-               return;
+       for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
+               if ((*i)->active ()) {
+                       bufs.merge_from ((*i)->get_buffers(), nframes);
+               }
        }
 
-       bufs.merge_from (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;
 }
 
@@ -69,47 +79,39 @@ InternalReturn::configure_io (ChanCount in, ChanCount out)
        return true;
 }
 
-void
-InternalReturn::set_block_size (nframes_t nframes)
+int
+InternalReturn::set_block_size (pframes_t nframes)
 {
        allocate_buffers (nframes);
+        return 0;
 }
 
 void
-InternalReturn::allocate_buffers (nframes_t nframes)
+InternalReturn::allocate_buffers (pframes_t nframes)
 {
        buffers.ensure_buffers (_configured_input, nframes);
        buffers.set_count (_configured_input);
 }
 
-BufferSet*
-InternalReturn::get_buffers ()
+void
+InternalReturn::add_send (InternalSend* send)
 {
        Glib::Mutex::Lock lm (_session.engine().process_lock());
-       /* use of g_atomic here is just for code consistency - its protected by the lock
-          for writing.
-       */
-       g_atomic_int_inc (&user_count);
-       return &buffers;
+       _sends.push_back (send);
 }
 
 void
-InternalReturn::release_buffers ()
+InternalReturn::remove_send (InternalSend* send)
 {
        Glib::Mutex::Lock lm (_session.engine().process_lock());
-       if (user_count) {
-               /* use of g_atomic here is just for code consistency - its protected by the lock
-                  for writing.
-               */
-               (void) g_atomic_int_dec_and_test (&user_count);
-       }
+       _sends.remove (send);
 }
 
 void
-InternalReturn::cycle_start (nframes_t nframes)
+InternalReturn::cycle_start (pframes_t nframes)
 {
        /* called from process cycle - no lock necessary */
-       if (user_count) {
+       if (!_sends.empty ()) {
                /* don't bother with this if nobody is going to feed us anything */
                buffers.silence (nframes, 0);
        }
@@ -143,8 +145,4 @@ InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& ou
        return true;
 }
 
-bool
-InternalReturn::visible () const
-{
-       return false;
-}
+