X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=e74fd7f8ced0327b317debc66578409ac0449a5e;hb=caac41a9cb2d86985595c590b151b0197b7b0c4c;hp=bacb381fe5f392a572d2f58a9c75d23f61c95032;hpb=759f1216afa4487441106d3b2c17e47651f57d11;p=ardour.git

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index bacb381fe5..e74fd7f8ce 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -26,15 +26,18 @@
 #include "ardour/amp.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
-#include "ardour/port.h"
-#include "ardour/audio_port.h"
 #include "ardour/buffer_set.h"
 #include "ardour/meter.h"
-#include "ardour/panner.h"
 #include "ardour/io.h"
 
 #include "i18n.h"
 
+namespace ARDOUR {
+class AutomationControl;
+class MuteMaster;
+class Pannable;
+}
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
@@ -80,7 +83,9 @@ Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMas
 	boost_debug_shared_ptr_mark_interesting (this, "send");
 
 	_amp.reset (new Amp (_session));
-	_meter.reset (new PeakMeter (_session));
+	_meter.reset (new PeakMeter (_session, name()));
+
+	add_control (_amp->gain_control ());
 }
 
 Send::~Send ()
@@ -132,9 +137,8 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe
 
 	/* gain control */
 
-	// 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->set_gain_automation_buffer (_session.send_gain_automation_buffer ());
+	_amp->setup_gain_automation (start_frame, end_frame, nframes);
 	_amp->run (sendbufs, start_frame, end_frame, nframes, true);
 
 	/* deliver to outputs */
@@ -189,34 +193,37 @@ Send::set_state (const XMLNode& node, int version)
 
 	Delivery::set_state (node, version);
 
-        /* don't try to reset bitslot if there is a node for it already: this can cause
-           issues with the session's accounting of send ID's
-        */
+	if (node.property ("ignore-bitslot") == 0) {
 
-        if ((prop = node.property ("bitslot")) == 0) {
-		if (_role == Delivery::Aux) {
-			_bitslot = _session.next_aux_send_id ();
-		} else if (_role == Delivery::Send) {
-			_bitslot = _session.next_send_id ();
-		} else {
-			// bitslot doesn't matter but make it zero anyway
-			_bitslot = 0;
-		}
-        } else {
-		if (_role == Delivery::Aux) {
-			_session.unmark_aux_send_id (_bitslot);
-			sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
-			_session.mark_aux_send_id (_bitslot);
-		} else if (_role == Delivery::Send) {
-			_session.unmark_send_id (_bitslot);
-			sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
-			_session.mark_send_id (_bitslot);
+		/* don't try to reset bitslot if there is a node for it already: this can cause
+		   issues with the session's accounting of send ID's
+		*/
+		
+		if ((prop = node.property ("bitslot")) == 0) {
+			if (_role == Delivery::Aux) {
+				_bitslot = _session.next_aux_send_id ();
+			} else if (_role == Delivery::Send) {
+				_bitslot = _session.next_send_id ();
+			} else {
+				// bitslot doesn't matter but make it zero anyway
+				_bitslot = 0;
+			}
 		} else {
-			// bitslot doesn't matter but make it zero anyway
-			_bitslot = 0;
+			if (_role == Delivery::Aux) {
+				_session.unmark_aux_send_id (_bitslot);
+				sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+				_session.mark_aux_send_id (_bitslot);
+			} else if (_role == Delivery::Send) {
+				_session.unmark_send_id (_bitslot);
+				sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+				_session.mark_send_id (_bitslot);
+			} else {
+				// bitslot doesn't matter but make it zero anyway
+				_bitslot = 0;
+			}
 		}
-        }
-
+	}
+	
 	XMLNodeList nlist = node.children();
 	for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) {
 		if ((*i)->name() == X_("Processor")) {
@@ -263,7 +270,7 @@ Send::set_state_2X (const XMLNode& node, int /* version */)
 }
 
 bool
-Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+Send::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
 	/* sends have no impact at all on the channel configuration of the
 	   streams passing through the route. so, out == in.
@@ -290,30 +297,6 @@ Send::configure_io (ChanCount in, ChanCount out)
 	return true;
 }
 
-/** Set up the XML description of a send so that its name is unique.
- *  @param state XML send state.
- *  @param session Session.
- */
-void
-Send::make_unique (XMLNode &state, Session &session)
-{
-	uint32_t const bitslot = session.next_send_id() + 1;
-
-	char buf[32];
-	snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
-	state.property("bitslot")->set_value (buf);
-
-	string const name = string_compose (_("send %1"), bitslot);
-
-	state.property("name")->set_value (name);
-
-	XMLNode* io = state.child ("IO");
-
-	if (io) {
-		io->property("name")->set_value (name);
-	}
-}
-
 bool
 Send::set_name (const string& new_name)
 {
@@ -355,3 +338,11 @@ Send::display_to_user () const
 
 	return true;
 }
+
+string
+Send::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+{
+	return _amp->value_as_string (ac);
+}
+
+