Fix a memory leak.

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

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 409c87d93c3d4e12e9f3c5d57f3e72bf385e835b..8e058b69b14c14c53041a8cf2a22a2a1b0289113 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,61 +27,64 @@
 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)
+InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
 {
-       if (user_count == 0) {
-               /* nothing to do - nobody is feeding us anything */
+       if (!_active && !_pending_active) {
                return;
        }
 
-       /* XXX this should be merge() */
+       /* no lock here, just atomic fetch */
+
+       if (g_atomic_int_get(&user_count) == 0) {
+               /* nothing to do - nobody is feeding us anything */
+               return;
+       }
 
        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 
-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 (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*
 InternalReturn::get_buffers ()
 {
        Glib::Mutex::Lock lm (_session.engine().process_lock());
-       user_count++;
+       /* 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;
 }
 
@@ -90,12 +93,15 @@ InternalReturn::release_buffers ()
 {
        Glib::Mutex::Lock lm (_session.engine().process_lock());
        if (user_count) {
-               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);
        }
 }
 
 void
-InternalReturn::cycle_start (nframes_t nframes)
+InternalReturn::cycle_start (pframes_t nframes)
 {
        /* called from process cycle - no lock necessary */
        if (user_count) {
@@ -120,17 +126,15 @@ 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;
 }
 
-
-