X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=f299995ffaef2af29f0d40ad966e7c5dbfc5a0a8;hb=a107b95307658af9f881e453362c1388ffac2463;hp=f01512332e76aca23b7b6fea6bb8e40ff74f0233;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index f01512332e..f299995ffa 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -17,9 +17,11 @@ */ +#include #include #include "pbd/xml++.h" +#include "pbd/boost_debug.h" #include "ardour/amp.h" #include "ardour/send.h" @@ -35,34 +37,21 @@ 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) +Send::Send (Session& s, boost::shared_ptr p, boost::shared_ptr mm, Role r) + : Delivery (s, p, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r) , _metering (false) { - _amp.reset (new Amp (_session, _mute_master)); - _meter.reset (new PeakMeter (_session)); - - ProcessorCreated (this); /* EMIT SIGNAL */ -} + boost_debug_shared_ptr_mark_interesting (this, "send"); -Send::Send (Session& s, boost::shared_ptr mm, const XMLNode& node, Role r) - : Delivery (s, mm, "send", r) - , _metering (false) -{ - _amp.reset (new Amp (_session, _mute_master)); + _amp.reset (new Amp (_session)); _meter.reset (new PeakMeter (_session)); - - if (set_state (node)) { - throw failed_constructor(); - } - - ProcessorCreated (this); /* EMIT SIGNAL */ } Send::~Send () { - GoingAway (); + _session.unmark_send_id (_bitslot); } void @@ -79,12 +68,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, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool) { if (_output->n_ports() == ChanCount::ZERO) { _meter->reset (); @@ -111,11 +101,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 +113,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 +127,7 @@ Send::get_state(void) } XMLNode& -Send::state(bool full) +Send::state (bool full) { XMLNode& node = Delivery::state(full); char buf[32]; @@ -146,28 +136,75 @@ Send::state(bool full) snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot); node.add_property ("bitslot", buf); + node.add_child_nocopy (_amp->state (full)); + return node; } int -Send::set_state(const XMLNode& node) +Send::set_state (const XMLNode& node, int version) { - XMLNodeList nlist = node.children(); - XMLNodeIterator niter; + if (version < 3000) { + return set_state_2X (node, version); + } + 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); + + /* 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); + } + + XMLNodeList nlist = node.children(); + for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) { + if ((*i)->name() == X_("Processor")) { + _amp->set_state (**i, version); + } } - const XMLNode* insert_node = &node; + return 0; +} - /* XXX need to load automation state & data for amp */ +int +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 (); + + XMLNodeList::const_iterator i = children.begin(); + while (i != children.end() && (*i)->name() != X_("Redirect")) { + ++i; + } + + if (i == children.end()) { + return -1; + } + + XMLNodeList const & grand_children = (*i)->children (); + XMLNodeList::const_iterator j = grand_children.begin (); + while (j != grand_children.end() && (*j)->name() != X_("IO")) { + ++j; + } + + if (j == grand_children.end()) { + return -1; + } + + XMLProperty const * prop = (*j)->property (X_("name")); + if (!prop) { + return -1; + } - Delivery::set_state (*insert_node); + set_name (prop->value ()); return 0; } @@ -183,6 +220,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) { @@ -212,7 +250,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 +262,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; } @@ -241,9 +291,12 @@ Send::set_name (const std::string& new_name) } bool -Send::visible () const +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; }