X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Freturn.cc;h=4f9e8b958a4aad86db00df92f50d4fd9e3133dfb;hb=8488d8f6a53d3385893a435481cb60ed21c21ea0;hp=69aa2f700e071c3e337a06521ae1140244184c4f;hpb=79f91c7a205d981d2b8cc15e32a6da02d8423065;p=ardour.git

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index 69aa2f700e..4f9e8b958a 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,38 +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>()));
-	_meter.reset (new PeakMeter (_session));
-
-	if (set_state (node)) {
-		throw failed_constructor();
-	}
-
-	ProcessorCreated (this); /* EMIT SIGNAL */
+	_amp.reset (new Amp (_session));
+	_meter.reset (new PeakMeter (_session, name()));
 }
 
 Return::~Return ()
 {
-	GoingAway ();
+        _session.unmark_return_id (_bitslot);
 }
 
 XMLNode&
@@ -94,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) */
@@ -114,13 +94,23 @@ Return::set_state (const XMLNode& node, int version)
 		}
 	}
 
-	IOProcessor::set_state (*insert_node);
+	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 +122,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);
 		}
 	}
 
@@ -146,7 +136,7 @@ Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframe
 }
 
 bool
-Return::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+Return::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
 	out = in + _input->n_ports();
 	return true;
@@ -161,7 +151,7 @@ Return::configure_io (ChanCount in, ChanCount out)
 
 	// Ensure there are enough buffers (since we add some)
 	if (_session.get_scratch_buffers(in).count() < out) {
-		Glib::Mutex::Lock em (_session.engine().process_lock());
+		Glib::Threads::Mutex::Lock em (_session.engine().process_lock());
 		IO::PortCountChanged(out);
 	}
 
@@ -170,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);
-	}
-}
-
-