X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=e74fd7f8ced0327b317debc66578409ac0449a5e;hb=caac41a9cb2d86985595c590b151b0197b7b0c4c;hp=48083d594ab37db39523e3c5a55e98e8891d0afd;hpb=5b90aab4d8837316fc5835083999747c56f24d58;p=ardour.git diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index 48083d594a..e74fd7f8ce 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -21,29 +21,71 @@ #include #include "pbd/xml++.h" +#include "pbd/boost_debug.h" #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; -Send::Send (Session& s, boost::shared_ptr mm, Role r) - : Delivery (s, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r) +string +Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot) +{ + if (r == Role (0)) { + /* this happens during initial construction of sends from XML, + before they get ::set_state() called. lets not worry about + it. + */ + bitslot = 0; + return string (); + } + + switch (r) { + case Delivery::Aux: + return string_compose (_("aux %1"), (bitslot = s.next_aux_send_id ()) + 1); + case Delivery::Listen: + return _("listen"); // no ports, no need for numbering + case Delivery::Send: + return string_compose (_("send %1"), (bitslot = s.next_send_id ()) + 1); + default: + fatal << string_compose (_("programming error: send created using role %1"), enum_2_string (r)) << endmsg; + /*NOTREACHED*/ + return string(); + } + +} + +Send::Send (Session& s, boost::shared_ptr p, boost::shared_ptr mm, Role r) + : Delivery (s, p, mm, name_and_id_new_send (s, r, _bitslot), r) , _metering (false) { + if (_role == Listen) { + /* we don't need to do this but it keeps things looking clean + in a debugger. _bitslot is not used by listen sends. + */ + _bitslot = 0; + } + + 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 () @@ -66,12 +108,12 @@ Send::deactivate () _amp->deactivate (); _meter->deactivate (); _meter->reset (); - + Processor::deactivate (); } void -Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes, bool) +Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool) { if (_output->n_ports() == ChanCount::ZERO) { _meter->reset (); @@ -95,9 +137,8 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframe /* 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 */ @@ -131,7 +172,12 @@ Send::state (bool full) node.add_property ("type", "send"); snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot); - node.add_property ("bitslot", buf); + + if (_role != Listen) { + node.add_property ("bitslot", buf); + } + + node.add_child_nocopy (_amp->state (full)); return node; } @@ -142,32 +188,54 @@ Send::set_state (const XMLNode& node, int version) if (version < 3000) { return set_state_2X (node, version); } - - XMLNodeList nlist = node.children(); - XMLNodeIterator niter; + const XMLProperty* prop; Delivery::set_state (node, version); - /* don't try to reset bitslot if its already set: this can cause - issues with the session's accounting of send ID's - */ - - 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); - } - - /* XXX need to load automation state & data for amp */ + if (node.property ("ignore-bitslot") == 0) { + + /* 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 { + 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")) { + _amp->set_state (**i, version); + } + } return 0; } int -Send::set_state_2X (const XMLNode& node, int version) +Send::set_state_2X (const XMLNode& node, int /* version */) { /* use the IO's name for the name of the send */ XMLNodeList const & children = node.children (); @@ -191,7 +259,7 @@ Send::set_state_2X (const XMLNode& node, int version) return -1; } - XMLProperty const * prop = (*j)->property X_("name"); + XMLProperty const * prop = (*j)->property (X_("name")); if (!prop) { return -1; } @@ -202,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. @@ -212,6 +280,7 @@ Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const return true; } +/** Caller must hold process lock */ bool Send::configure_io (ChanCount in, ChanCount out) { @@ -219,10 +288,6 @@ Send::configure_io (ChanCount in, ChanCount out) return false; } - if (_output) { - _output->ensure_io (out, false, 0); - } - if (!Processor::configure_io (in, out)) { return false; } @@ -232,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) { @@ -297,3 +338,11 @@ Send::display_to_user () const return true; } + +string +Send::value_as_string (boost::shared_ptr ac) const +{ + return _amp->value_as_string (ac); +} + +