X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Freturn.cc;h=43a2e1bfd1e997246d3dfd7299af3cd6227aa7cd;hb=eaf58fdd50a79aa4fa2760ca5dbeb2dd4cda2e15;hp=c2c227769d932c1670ec801f3685c67208122c43;hpb=c83389b8ec5fef9553a401e6123b7e55702af9e2;p=ardour.git

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index c2c227769d..43a2e1bfd1 100644
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -22,12 +22,10 @@
 #include "pbd/xml++.h"
 
 #include "ardour/amp.h"
-#include "ardour/audio_port.h"
+#include "ardour/audioengine.h"
 #include "ardour/buffer_set.h"
 #include "ardour/io.h"
 #include "ardour/meter.h"
-#include "ardour/panner.h"
-#include "ardour/port.h"
 #include "ardour/return.h"
 #include "ardour/session.h"
 
@@ -36,37 +34,28 @@
 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 ()
 {
+        _session.unmark_return_id (_bitslot);
 }
 
 XMLNode&
@@ -93,14 +82,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) */
@@ -115,11 +96,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, bool)
+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;
@@ -169,27 +160,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);
-	}
-}
-
-