fix #4405, by explicitly cancelling solo when a route's inputs drop to zero

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

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 8a3baf5bda1fd274ac7e1384030f11fddd257046..3c75c7957da016265101a6755ddd1ffb1a8d6118 100644 (file)
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -20,99 +20,56 @@
 
 #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/audioengine.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 (!_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);
        _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;
-}
-
 void
-InternalReturn::set_block_size (nframes_t nframes)
+InternalReturn::add_send (InternalSend* send)
 {
-       allocate_buffers (nframes);
-}
+       /* caller must hold process lock */
+       assert (!AudioEngine::instance()->process_lock().trylock());
 
-void
-InternalReturn::allocate_buffers (nframes_t nframes)
-{
-       buffers.ensure_buffers (_configured_input, nframes);
-       buffers.set_count (_configured_input);
-}
-
-BufferSet*
-InternalReturn::get_buffers ()
-{
-       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);
-       }
-}
+       /* caller must hold process lock */
+       assert (!AudioEngine::instance()->process_lock().trylock());
 
-void
-InternalReturn::cycle_start (nframes_t nframes)
-{
-       /* 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);
-       }
+       _sends.remove (send);
 }
 
 XMLNode&
@@ -130,12 +87,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
 {
@@ -144,7 +95,8 @@ InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& ou
 }
 
 bool
-InternalReturn::visible () const
+InternalReturn::configure_io (ChanCount in, ChanCount out)
 {
-       return false;
+       IOProcessor::configure_io (in, out);
+       return true;
 }