X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=f28142da4cc33831c2d6f244d1fe792915b2ef92;hb=fb430a7738d4d6d38de8ac3fba491c3572bed386;hp=fb5c6b7b0c13265e850edffc666ac8b5762df764;hpb=c40437430acf4b65d8acb8b084eae8cd2f6f5402;p=ardour.git diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index fb5c6b7b0c..f28142da4c 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -21,16 +21,19 @@ #include #include "pbd/xml++.h" -#include "pbd/boost_debug.h" #include "ardour/amp.h" -#include "ardour/send.h" -#include "ardour/session.h" +#include "ardour/boost_debug.h" #include "ardour/buffer_set.h" -#include "ardour/meter.h" +#include "ardour/debug.h" +#include "ardour/gain_control.h" #include "ardour/io.h" +#include "ardour/meter.h" +#include "ardour/panner_shell.h" +#include "ardour/send.h" +#include "ardour/session.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace ARDOUR { class AutomationControl; @@ -43,10 +46,10 @@ using namespace PBD; using namespace std; string -Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot) +Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_bitslot) { - if (r == Role (0)) { - /* this happens during initial construction of sends from XML, + if (ignore_bitslot) { + /* this happens during initial construction of sends from XML, before they get ::set_state() called. lets not worry about it. */ @@ -63,15 +66,18 @@ Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot) 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*/ + abort(); /*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) +Send::Send (Session& s, boost::shared_ptr p, boost::shared_ptr mm, Role r, bool ignore_bitslot) + : Delivery (s, p, mm, name_and_id_new_send (s, r, _bitslot, ignore_bitslot), r) , _metering (false) + , _delay_in (0) + , _delay_out (0) + , _remove_on_disconnect (false) { if (_role == Listen) { /* we don't need to do this but it keeps things looking clean @@ -80,12 +86,23 @@ Send::Send (Session& s, boost::shared_ptr p, boost::shared_ptr gl (new AutomationList (Evoral::Parameter (GainAutomation))); + _gain_control = boost::shared_ptr (new GainControl (_session, Evoral::Parameter(GainAutomation), gl)); + add_control (_gain_control); + + _amp.reset (new Amp (_session, _("Fader"), _gain_control, true)); + _meter.reset (new PeakMeter (_session, name())); - _amp.reset (new Amp (_session)); - _meter.reset (new PeakMeter (_session)); + _delayline.reset (new DelayLine (_session, name())); - add_control (_amp->gain_control ()); + if (panner_shell()) { + panner_shell()->Changed.connect_same_thread (*this, boost::bind (&Send::panshell_changed, this)); + } + if (_output) { + _output->changed.connect_same_thread (*this, boost::bind (&Send::snd_output_changed, this, _1, _2)); + } } Send::~Send () @@ -113,7 +130,36 @@ Send::deactivate () } void -Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool) +Send::set_delay_in(framecnt_t delay) +{ + if (!_delayline) return; + if (_delay_in == delay) { + return; + } + _delay_in = delay; + + DEBUG_TRACE (DEBUG::LatencyCompensation, + string_compose ("Send::set_delay_in(%1) + %2 = %3\n", + delay, _delay_out, _delay_out + _delay_in)); + _delayline.get()->set_delay(_delay_out + _delay_in); +} + +void +Send::set_delay_out(framecnt_t delay) +{ + if (!_delayline) return; + if (_delay_out == delay) { + return; + } + _delay_out = delay; + DEBUG_TRACE (DEBUG::LatencyCompensation, + string_compose ("Send::set_delay_out(%1) + %2 = %3\n", + delay, _delay_in, _delay_out + _delay_in)); + _delayline.get()->set_delay(_delay_out + _delay_in); +} + +void +Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool) { if (_output->n_ports() == ChanCount::ZERO) { _meter->reset (); @@ -139,11 +185,13 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe _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); + _amp->run (sendbufs, start_frame, end_frame, speed, nframes, true); + + _delayline->run (sendbufs, start_frame, end_frame, speed, nframes, true); /* deliver to outputs */ - Delivery::run (sendbufs, start_frame, end_frame, nframes, true); + Delivery::run (sendbufs, start_frame, end_frame, speed, nframes, true); /* consider metering */ @@ -151,7 +199,7 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe if (_amp->gain_control()->get_value() == 0) { _meter->reset(); } else { - _meter->run (*_output_buffers, start_frame, end_frame, nframes, true); + _meter->run (*_output_buffers, start_frame, end_frame, speed, nframes, true); } } @@ -168,15 +216,15 @@ XMLNode& Send::state (bool full) { XMLNode& node = Delivery::state(full); - char buf[32]; - node.add_property ("type", "send"); - snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot); + node.set_property ("type", "send"); if (_role != Listen) { - node.add_property ("bitslot", buf); + node.set_property ("bitslot", _bitslot); } + node.set_property ("selfdestruct", _remove_on_disconnect); + node.add_child_nocopy (_amp->state (full)); return node; @@ -189,7 +237,7 @@ Send::set_state (const XMLNode& node, int version) return set_state_2X (node, version); } - const XMLProperty* prop; + XMLProperty const * prop; Delivery::set_state (node, version); @@ -198,7 +246,7 @@ Send::set_state (const XMLNode& node, int 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 ((prop = node.property ("bitslot")) == 0) { if (_role == Delivery::Aux) { _bitslot = _session.next_aux_send_id (); @@ -211,11 +259,11 @@ Send::set_state (const XMLNode& node, int version) } else { if (_role == Delivery::Aux) { _session.unmark_aux_send_id (_bitslot); - sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot); + _bitslot = string_to(prop->value()); _session.mark_aux_send_id (_bitslot); } else if (_role == Delivery::Send) { _session.unmark_send_id (_bitslot); - sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot); + _bitslot = string_to(prop->value()); _session.mark_send_id (_bitslot); } else { // bitslot doesn't matter but make it zero anyway @@ -223,7 +271,9 @@ Send::set_state (const XMLNode& node, int version) } } } - + + node.get_property (X_("selfdestruct"), _remove_on_disconnect); + XMLNodeList nlist = node.children(); for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) { if ((*i)->name() == X_("Processor")) { @@ -270,7 +320,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. @@ -284,7 +334,7 @@ Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const bool Send::configure_io (ChanCount in, ChanCount out) { - if (!_amp->configure_io (in, out) || !_meter->configure_io (in, out)) { + if (!_amp->configure_io (in, out)) { return false; } @@ -292,11 +342,26 @@ Send::configure_io (ChanCount in, ChanCount out) return false; } + if (!_meter->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs()))) { + return false; + } + + if (_delayline && !_delayline->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs()))) { + cerr << "send delayline config failed\n"; + return false; + } + reset_panner (); return true; } +void +Send::panshell_changed () +{ + _meter->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs())); +} + bool Send::set_name (const string& new_name) { @@ -339,10 +404,13 @@ Send::display_to_user () const return true; } -string -Send::value_as_string (boost::shared_ptr ac) const +void +Send::snd_output_changed (IOChange change, void* /*src*/) { - return _amp->value_as_string (ac); + if (change.type & IOChange::ConnectionsChanged) { + if (!_output->connected() && _remove_on_disconnect) { + _remove_on_disconnect = false; + SelfDestruct (); /* EMIT SIGNAL */ + } + } } - -