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

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index ef6f954dd2..4624006ca9 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.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
@@ -17,10 +17,12 @@
 
 */
 
+#include <iostream>
 #include <algorithm>
 
 #include "pbd/xml++.h"
 
+#include "ardour/amp.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
 #include "ardour/port.h"
@@ -34,29 +36,85 @@
 
 using namespace ARDOUR;
 using namespace PBD;
+using namespace std;
 
-Send::Send (Session& s, Placement p)
-	: IOProcessor (s, string_compose (_("send %1"), (bitslot = s.next_send_id()) + 1), p)
+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)
 {
-	_metering = false;
-	ProcessorCreated (this); /* EMIT SIGNAL */
+	_amp.reset (new Amp (_session));
+	_meter.reset (new PeakMeter (_session));
 }
 
-Send::Send (Session& s, const XMLNode& node)
-	: IOProcessor (s, "send", PreFader)
+Send::~Send ()
 {
-	_metering = false;
+        _session.unmark_send_id (_bitslot);
+}
 
-	if (set_state (node)) {
-		throw failed_constructor();
-	}
+void
+Send::activate ()
+{
+	_amp->activate ();
+	_meter->activate ();
 
-	ProcessorCreated (this); /* EMIT SIGNAL */
+	Processor::activate ();
 }
 
-Send::~Send ()
+void
+Send::deactivate ()
 {
-	GoingAway ();
+	_amp->deactivate ();
+	_meter->deactivate ();
+	_meter->reset ();
+	
+	Processor::deactivate ();
+}
+
+void
+Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool)
+{
+	if (_output->n_ports() == ChanCount::ZERO) {
+		_meter->reset ();
+		_active = _pending_active;
+		return;
+	}
+
+	if (!_active && !_pending_active) {
+		_meter->reset ();
+		_output->silence (nframes);
+		_active = _pending_active;
+		return;
+	}
+
+	// we have to copy the input, because deliver_output() may alter the buffers
+	// in-place, which a send must never do.
+
+	BufferSet& sendbufs = _session.get_mix_buffers (bufs.count());
+	sendbufs.read_from (bufs, nframes);
+	assert(sendbufs.count() == bufs.count());
+
+	/* 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->run (sendbufs, start_frame, end_frame, nframes, true);
+
+	/* deliver to outputs */
+
+	Delivery::run (sendbufs, start_frame, end_frame, nframes, true);
+
+	/* consider metering */
+
+	if (_metering) {
+		if (_amp->gain_control()->get_value() == 0) {
+			_meter->reset();
+		} else {
+			_meter->run (*_output_buffers, start_frame, end_frame, nframes, true);
+		}
+	}
+
+	/* _active was set to _pending_active by Delivery::run() */
 }
 
 XMLNode&
@@ -66,164 +124,71 @@ Send::get_state(void)
 }
 
 XMLNode&
-Send::state(bool full)
+Send::state (bool full)
 {
-	XMLNode& node = IOProcessor::state(full);
+	XMLNode& node = Delivery::state(full);
 	char buf[32];
+
 	node.add_property ("type", "send");
-	snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
+	snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot);
 	node.add_property ("bitslot", buf);
 
 	return node;
 }
 
 int
-Send::set_state(const XMLNode& node)
+Send::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_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
+        */
 
-	/* Send has regular IO automation (gain, pan) */
+        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);
+        }
 
-	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-		if ((*niter)->name() == "IOProcessor") {
-			insert_node = *niter;
-		} else if ((*niter)->name() == X_("Automation")) {
-			// _io->set_automation_state (*(*niter), Evoral::Parameter(GainAutomation));
-		}
-	}
-	
-	IOProcessor::set_state (*insert_node);
+	/* XXX need to load automation state & data for amp */
 
 	return 0;
 }
 
-void
-Send::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes)
-{
-	if (active()) {
-
-		// we have to copy the input, because IO::deliver_output may alter the buffers
-		// in-place, which a send must never do.
-
-		BufferSet& sendbufs = _session.get_mix_buffers(bufs.count());
-
-		sendbufs.read_from(bufs, nframes);
-		assert(sendbufs.count() == bufs.count());
-
-		_io->deliver_output (sendbufs, start_frame, end_frame, nframes);
-
-		if (_metering) {
-			if (_io->effective_gain() == 0) {
-				_io->peak_meter().reset();
-			} else {
-				_io->peak_meter().run_in_place(_io->output_buffers(), start_frame, end_frame, nframes);
-			}
-		}
-
-	} else {
-		_io->silence (nframes);
-		
-		if (_metering) {
-			_io->peak_meter().reset();
-		}
-	}
-}
-
-void
-Send::set_metering (bool yn)
-{
-	_metering = yn;
-
-	if (!_metering) {
-		/* XXX possible thread hazard here */
-		_io->peak_meter().reset();
-	}
-}
-
 bool
-Send::can_support_io_configuration (const ChanCount& in, ChanCount& out_is_ignored) const
+Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 {
-	if (_io->input_maximum() == ChanCount::INFINITE && _io->output_maximum() == ChanCount::INFINITE) {
-
-		/* not configured yet */
-
-		return 1; /* we can support anything the first time we're asked */
-
-	} else {
-
-		/* the "input" config for a port insert corresponds to how
-		   many output ports it will have.
-		*/
+	/* sends have no impact at all on the channel configuration of the
+	   streams passing through the route. so, out == in.
+	*/
 
-		if (_io->output_maximum() == in) {
-			return 1;
-		} 
-	}
-
-	return -1;
+	out = in;
+	return true;
 }
 
 bool
 Send::configure_io (ChanCount in, ChanCount out)
 {
-	/* we're transparent no matter what.  fight the power. */
-
-	if (out != in) {
+	if (!_amp->configure_io (in, out) || !_meter->configure_io (in, out)) {
 		return false;
 	}
 
-	_io->set_output_maximum (in);
-	_io->set_output_minimum (in);
-	_io->set_input_maximum (ChanCount::ZERO);
-	_io->set_input_minimum (ChanCount::ZERO);
-
-	if (_io->ensure_io (ChanCount::ZERO, in, false, this) != 0) {
+	if (!Processor::configure_io (in, out)) {
 		return false;
 	}
 
-	Processor::configure_io(in, out);
-	_io->reset_panner();
+	reset_panner ();
 
 	return true;
 }
 
-ChanCount
-Send::output_streams() const
-{
-	// this method reflects the idea that from the perspective of the Route's ProcessorList, 
-	// a send is just a passthrough. that doesn't match what the Send actually does with its 
-	// data, but since what it does is invisible to the Route, it appears to be a passthrough.
-	
-	return _configured_input;
-}
-
-ChanCount
-Send::input_streams() const
-{
-	return _configured_input;
-}
-
-
-void
-Send::expect_inputs (const ChanCount& expected)
-{
-	if (expected != expected_inputs) {
-		expected_inputs = expected;
-		_io->reset_panner ();
-	}
-}
-
 /** Set up the XML description of a send so that its name is unique.
  *  @param state XML send state.
  *  @param session Session.
@@ -237,12 +202,55 @@ 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);
 
 	XMLNode* io = state.child ("IO");
+
 	if (io) {
 		io->property("name")->set_value (name);
 	}
 }
+
+bool
+Send::set_name (const string& new_name)
+{
+	string unique_name;
+
+	if (_role == Delivery::Send) {
+		char buf[32];
+
+		/* 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;
+	}
+
+	return Delivery::set_name (unique_name);
+}
+
+bool
+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;
+	}
+
+	return true;
+}