Use ISC license for RDFF (same idea, MIT style, just prettier).

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

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index 69aa2f700e071c3e337a06521ae1140244184c4f..e64db79c869770e7c4d34e602fcf120dcce44ae9 100644 (file)
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -30,6 +30,7 @@
 #include "ardour/port.h"
 #include "ardour/return.h"
 #include "ardour/session.h"
+#include "ardour/mute_master.h"
 
 #include "i18n.h"
 
@@ -43,31 +44,13 @@ Return::Return (Session& s, bool internal)
 {
        /* never muted */
 
-       _amp.reset (new Amp (_session, boost::shared_ptr<MuteMaster>()));
+       _amp.reset (new Amp (_session));
        _meter.reset (new PeakMeter (_session));
-
-       ProcessorCreated (this); /* EMIT SIGNAL */
-}
-
-Return::Return (Session& s, const XMLNode& node, bool internal)
-       : IOProcessor (s, (internal ? false : true), false, "return")
-       , _metering (false)
-{
-       /* never muted */
-
-       _amp.reset (new Amp (_session, boost::shared_ptr<MuteMaster>()));
-       _meter.reset (new PeakMeter (_session));
-
-       if (set_state (node)) {
-               throw failed_constructor();
-       }
-
-       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Return::~Return ()
 {
-       GoingAway ();
+        _session.unmark_return_id (_bitslot);
 }
 
 XMLNode&
@@ -94,14 +77,6 @@ Return::set_state (const XMLNode& node, int version)
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
        const XMLProperty* prop;
-
-       if ((prop = node.property ("bitslot")) == 0) {
-               _bitslot = _session.next_return_id();
-       } else {
-               sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
-               _session.mark_return_id (_bitslot);
-       }
-
        const XMLNode* insert_node = &node;
 
        /* Return has regular IO automation (gain, pan) */
@@ -114,13 +89,21 @@ Return::set_state (const XMLNode& node, int version)
                }
        }
 
-       IOProcessor::set_state (*insert_node);
+       IOProcessor::set_state (*insert_node, version);
 
+       if ((prop = node.property ("bitslot")) == 0) {
+               _bitslot = _session.next_return_id();
+       } else {
+                _session.unmark_return_id (_bitslot);
+               sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+               _session.mark_return_id (_bitslot);
+       }
+        
        return 0;
 }
 
 void
-Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
 {
        if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) {
                return;
@@ -132,13 +115,13 @@ Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframe
        // Can't automate gain for sends or returns yet because we need different buffers
        // so that we don't overwrite the main automation data for the route amp
        // _amp->setup_gain_automation (start_frame, end_frame, nframes);
-       _amp->run (bufs, start_frame, end_frame, nframes);
+       _amp->run (bufs, start_frame, end_frame, nframes, true);
 
        if (_metering) {
                if (_amp->gain_control()->get_value() == 0) {
                        _meter->reset();
                } else {
-                       _meter->run (bufs, start_frame, end_frame, nframes);
+                       _meter->run (bufs, start_frame, end_frame, nframes, true);
                }
        }