assert() to help find some possible causes of #2991. Fix some confusion with GTK...

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

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 0a45228c67ec53dfa17b4e6dc1d87df126d45891..279472e02d18cda39eef14d6236aed6f56303eeb 100644 (file)
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,26 +27,30 @@
 using namespace std;
 using namespace ARDOUR;
 
-sigc::signal<void,nframes_t> InternalReturn::CycleStart;
+PBD::Signal1<void,nframes_t> InternalReturn::CycleStart;
 
 InternalReturn::InternalReturn (Session& s)
        : Return (s, true)
        , user_count (0)
 {
-       CycleStart.connect (mem_fun (*this, &InternalReturn::cycle_start));
+       CycleStart.connect_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1));
 }
 
 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));
 }
 
 void
-InternalReturn::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+InternalReturn::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes, bool)
 {
-       /* XXX no lock here, just atomic fetch */
+       if (!_active && !_pending_active) {
+               return;
+       }
+
+       /* no lock here, just atomic fetch */
 
        if (g_atomic_int_get(&user_count) == 0) {
                /* nothing to do - nobody is feeding us anything */
@@ -54,17 +58,18 @@ InternalReturn::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame
        }
 
        bufs.merge_from (buffers, nframes);
+       _active = _pending_active;
 }
 
 bool
 InternalReturn::configure_io (ChanCount in, ChanCount out)
 {
        IOProcessor::configure_io (in, out);
-       allocate_buffers (_session.get_block_size());
+       allocate_buffers (_session.engine().frames_per_cycle());
        return true;
 }
 
-void 
+void
 InternalReturn::set_block_size (nframes_t nframes)
 {
        allocate_buffers (nframes);
@@ -73,8 +78,8 @@ InternalReturn::set_block_size (nframes_t nframes)
 void
 InternalReturn::allocate_buffers (nframes_t nframes)
 {
-       buffers.ensure_buffers (DataType::AUDIO, _configured_input.n_audio(), nframes);
-       buffers.ensure_buffers (DataType::MIDI, _configured_input.n_midi(), nframes);
+       buffers.ensure_buffers (_configured_input, nframes);
+       buffers.set_count (_configured_input);
 }
 
 BufferSet*
@@ -126,17 +131,20 @@ InternalReturn::get_state()
 }
 
 int
-InternalReturn::set_state (const XMLNode& node)
+InternalReturn::set_state (const XMLNode& node, int version)
 {
-       return Return::set_state (node);
+       return Return::set_state (node, version);
 }
 
-bool 
+bool
 InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 {
        out = in;
        return true;
 }
 
-
-
+bool
+InternalReturn::visible () const
+{
+       return false;
+}