X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=4624006ca9b7aac604a196f2eae84e94b0f08eec;hb=c8e3f32533cc6f4481222781d93e7bf7c32ffe5f;hp=d2c1d3c493955d5837eeeb0f17da4fd224c88699;hpb=57e1358fb2d8a8ab51b4996808e0eaa41492fb9e;p=ardour.git

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index d2c1d3c493..4624006ca9 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <iostream>
 #include <algorithm>
 
 #include "pbd/xml++.h"
@@ -35,34 +36,19 @@
 
 using namespace ARDOUR;
 using namespace PBD;
+using namespace std;
 
 Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, Role r)
 	: Delivery (s, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r)
 	, _metering (false)
 {
-	_amp.reset (new Amp (_session, _mute_master));
+	_amp.reset (new Amp (_session));
 	_meter.reset (new PeakMeter (_session));
-
-	ProcessorCreated (this); /* EMIT SIGNAL */
-}
-
-Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node, int version, Role r)
-        : Delivery (s, mm, "send", r)
-	, _metering (false)
-{
-	_amp.reset (new Amp (_session, _mute_master));
-	_meter.reset (new PeakMeter (_session));
-
-	if (set_state (node, version)) {
-		throw failed_constructor();
-	}
-
-	ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Send::~Send ()
 {
-	GoingAway ();
+        _session.unmark_send_id (_bitslot);
 }
 
 void
@@ -79,12 +65,13 @@ Send::deactivate ()
 {
 	_amp->deactivate ();
 	_meter->deactivate ();
-
+	_meter->reset ();
+	
 	Processor::deactivate ();
 }
 
 void
-Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool)
 {
 	if (_output->n_ports() == ChanCount::ZERO) {
 		_meter->reset ();
@@ -111,11 +98,11 @@ Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_
 	// 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 (sendbufs, start_frame, end_frame, nframes);
+	_amp->run (sendbufs, start_frame, end_frame, nframes, true);
 
 	/* deliver to outputs */
 
-	Delivery::run (sendbufs, start_frame, end_frame, nframes);
+	Delivery::run (sendbufs, start_frame, end_frame, nframes, true);
 
 	/* consider metering */
 
@@ -123,7 +110,7 @@ Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_
 		if (_amp->gain_control()->get_value() == 0) {
 			_meter->reset();
 		} else {
-			_meter->run (*_output_buffers, start_frame, end_frame, nframes);
+			_meter->run (*_output_buffers, start_frame, end_frame, nframes, true);
 		}
 	}
 
@@ -137,7 +124,7 @@ Send::get_state(void)
 }
 
 XMLNode&
-Send::state(bool full)
+Send::state (bool full)
 {
 	XMLNode& node = Delivery::state(full);
 	char buf[32];
@@ -156,18 +143,21 @@ Send::set_state (const XMLNode& node, int version)
 	XMLNodeIterator niter;
 	const XMLProperty* prop;
 
-	if ((prop = node.property ("bitslot")) == 0) {
-		_bitslot = _session.next_send_id();
-	} else {
-		sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
-		_session.mark_send_id (_bitslot);
-	}
+	Delivery::set_state (node, version);
 
-	const XMLNode* insert_node = &node;
+        /* don't try to reset bitslot if its already set: this can cause
+           issues with the session's accounting of send ID's
+        */
 
-	/* XXX need to load automation state & data for amp */
+        if ((prop = node.property ("bitslot")) == 0) {
+                _bitslot = _session.next_send_id();
+        } else {
+                _session.unmark_send_id (_bitslot);
+                sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+                _session.mark_send_id (_bitslot);
+        }
 
-	Delivery::set_state (*insert_node, version);
+	/* XXX need to load automation state & data for amp */
 
 	return 0;
 }
@@ -212,7 +202,7 @@ Send::make_unique (XMLNode &state, Session &session)
 	snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
 	state.property("bitslot")->set_value (buf);
 
-	std::string const name = string_compose (_("send %1"), bitslot);
+	string const name = string_compose (_("send %1"), bitslot);
 
 	state.property("name")->set_value (name);
 
@@ -224,15 +214,27 @@ Send::make_unique (XMLNode &state, Session &session)
 }
 
 bool
-Send::set_name (const std::string& new_name)
+Send::set_name (const string& new_name)
 {
-	std::string unique_name;
+	string unique_name;
 
 	if (_role == Delivery::Send) {
 		char buf[32];
-		snprintf (buf, sizeof (buf), "%u", _bitslot);
-		unique_name = new_name;
+
+		/* rip any existing numeric part of the name, and append the bitslot
+		 */
+
+		string::size_type last_letter = new_name.find_last_not_of ("0123456789");
+
+		if (last_letter != string::npos) {
+			unique_name = new_name.substr (0, last_letter + 1);
+		} else {
+			unique_name = new_name;
+		}
+
+		snprintf (buf, sizeof (buf), "%u", (_bitslot + 1));
 		unique_name += buf;
+
 	} else {
 		unique_name = new_name;
 	}
@@ -246,6 +248,7 @@ Send::display_to_user () const
 	/* we ignore Deliver::_display_to_user */
 
 	if (_role == Listen) {
+                /* don't make the monitor/control/listen send visible */
 		return false;
 	}