better, cleaner fix for copying sends/returns/port inserts via XML state

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

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index f5122f3a5ffb59e53a37e07ef361a7e1ca189059..0152155338f9401b045a470c09f807c28290b2c4 100644 (file)
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -30,44 +30,36 @@
 #include "ardour/port.h"
 #include "ardour/return.h"
 #include "ardour/session.h"
+#include "ardour/mute_master.h"
+#include "ardour/audioengine.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 
-Return::Return (Session& s, bool internal)
-       : IOProcessor (s, (internal ? false : true), false,
-                      string_compose (_("return %1"), (_bitslot = s.next_return_id()) + 1))
-       , _metering (false)
+std::string
+Return::name_and_id_new_return (Session& s, uint32_t& bitslot)
 {
-       /* never muted */
-
-       _amp.reset (new Amp (_session, boost::shared_ptr<MuteMaster>()));
-       _meter.reset (new PeakMeter (_session));
-
-       ProcessorCreated (this); /* EMIT SIGNAL */
+       bitslot = s.next_return_id();
+       return string_compose (_("return %1"), bitslot + 1);
 }
 
-Return::Return (Session& s, const XMLNode& node, bool internal)
-       : IOProcessor (s, (internal ? false : true), false, "return")
+
+Return::Return (Session& s, bool internal)
+       : IOProcessor (s, (internal ? false : true), false,
+                      name_and_id_new_return (s, _bitslot))
        , _metering (false)
 {
        /* never muted */
 
-       _amp.reset (new Amp (_session, boost::shared_ptr<MuteMaster>()));
+       _amp.reset (new Amp (_session));
        _meter.reset (new PeakMeter (_session));
-
-       if (set_state (node, Stateful::loading_state_version)) {
-               throw failed_constructor();
-       }
-
-       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Return::~Return ()
 {
-       GoingAway ();
+        _session.unmark_return_id (_bitslot);
 }
 
 XMLNode&
@@ -94,14 +86,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) */
@@ -116,11 +100,21 @@ Return::set_state (const XMLNode& node, int version)
 
        IOProcessor::set_state (*insert_node, version);
 
+       if (!node.property ("ignore-bitslot")) {
+               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 +126,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);
                }
        }
 
@@ -170,27 +164,3 @@ Return::configure_io (ChanCount in, ChanCount out)
        return true;
 }
 
-/** Set up the XML description of a return so that its name is unique.
- *  @param state XML return state.
- *  @param session Session.
- */
-void
-Return::make_unique (XMLNode &state, Session &session)
-{
-       uint32_t const bitslot = session.next_return_id() + 1;
-
-       char buf[32];
-       snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
-       state.property("bitslot")->set_value (buf);
-
-       std::string const name = string_compose (_("return %1"), bitslot);
-
-       state.property("name")->set_value (name);
-
-       XMLNode* io = state.child ("IO");
-       if (io) {
-               io->property("name")->set_value (name);
-       }
-}
-
-