X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=4624006ca9b7aac604a196f2eae84e94b0f08eec;hb=d488ce49bb71d99d1f23a30ff6594e2ad759f6fa;hp=ea4c16a416f04ded663236f91bb220b41a709b29;hpb=20342cf2644fee7b04d6cfdc4fc686897837a01b;p=ardour.git diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index ea4c16a416..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,6 +17,7 @@ */ +#include #include #include "pbd/xml++.h" @@ -35,34 +36,19 @@ 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) , _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 mm, const XMLNode& node, 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)) { - throw failed_constructor(); - } - - ProcessorCreated (this); /* EMIT SIGNAL */ } Send::~Send () { - GoingAway (); + _session.unmark_send_id (_bitslot); } void @@ -79,21 +65,30 @@ 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 (!_active || _output->n_ports() == ChanCount::ZERO) { + 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()); @@ -103,21 +98,23 @@ 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 */ - + if (_metering) { 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); } } + + /* _active was set to _pending_active by Delivery::run() */ } XMLNode& @@ -127,7 +124,7 @@ Send::get_state(void) } XMLNode& -Send::state(bool full) +Send::state (bool full) { XMLNode& node = Delivery::state(full); char buf[32]; @@ -140,24 +137,27 @@ Send::state(bool full) } 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 + */ + + 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 */ - - Delivery::set_state (*insert_node); return 0; } @@ -168,7 +168,7 @@ Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const /* sends have no impact at all on the channel configuration of the streams passing through the route. so, out == in. */ - + out = in; return true; } @@ -179,8 +179,14 @@ Send::configure_io (ChanCount in, ChanCount out) if (!_amp->configure_io (in, out) || !_meter->configure_io (in, out)) { return false; } - - return Processor::configure_io (in, out); + + if (!Processor::configure_io (in, out)) { + return false; + } + + reset_panner (); + + return true; } /** Set up the XML description of a send so that its name is unique. @@ -196,8 +202,8 @@ 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"); @@ -208,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; } @@ -225,9 +243,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; }