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 a1374feb8adcb475ebaba1a09bd4f3bbd2b38a84..0152155338f9401b045a470c09f807c28290b2c4 100644 (file)
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -31,15 +31,24 @@
 #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;
 
+std::string
+Return::name_and_id_new_return (Session& s, uint32_t& bitslot)
+{
+       bitslot = s.next_return_id();
+       return string_compose (_("return %1"), bitslot + 1);
+}
+
+
 Return::Return (Session& s, bool internal)
        : IOProcessor (s, (internal ? false : true), false,
-                      string_compose (_("return %1"), (_bitslot = s.next_return_id()) + 1))
+                      name_and_id_new_return (s, _bitslot))
        , _metering (false)
 {
        /* never muted */
@@ -91,12 +100,14 @@ Return::set_state (const XMLNode& node, int version)
 
        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);
+       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;
@@ -153,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);
-       }
-}
-
-