X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Freturn.cc;h=e64db79c869770e7c4d34e602fcf120dcce44ae9;hb=8d0ba5254751b88ac560a7ae3b2e7e736ac2dfcf;hp=5a44d3f6e67814ed293ffbe201af9a155c82c580;hpb=86f24d20e1616ffaafc97de65db49fd6a91270f8;p=ardour.git

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index 5a44d3f6e6..e64db79c86 100644
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 #include "ardour/port.h"
 #include "ardour/return.h"
 #include "ardour/session.h"
+#include "ardour/mute_master.h"
 
 #include "i18n.h"
 
@@ -37,37 +38,19 @@ using namespace ARDOUR;
 using namespace PBD;
 
 Return::Return (Session& s, bool internal)
-	: IOProcessor (s, (internal ? false : true), false, 
+	: IOProcessor (s, (internal ? false : true), false,
 		       string_compose (_("return %1"), (_bitslot = s.next_return_id()) + 1))
 	, _metering (false)
 {
 	/* 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&
@@ -89,19 +72,11 @@ Return::state(bool full)
 }
 
 int
-Return::set_state(const XMLNode& node)
+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) */
@@ -113,34 +88,44 @@ Return::set_state(const XMLNode& node)
 			// _io->set_automation_state (*(*niter), Evoral::Parameter(GainAutomation));
 		}
 	}
-	
-	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() || _input->n_ports() == ChanCount::ZERO) {
+	if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) {
 		return;
 	}
-	
+
 	_input->collect_input (bufs, nframes, _configured_input);
 	bufs.set_count(_configured_output);
 
 	// 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);
 		}
 	}
+
+	_active = _pending_active;
 }
 
 bool
@@ -182,7 +167,7 @@ Return::make_unique (XMLNode &state, Session &session)
 	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");