X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=23ae860f47123fc7f1893d82e83d94cdc096c04d;hb=3aade3801d5ff2c8314eefc4375475f46e913fac;hp=819165b35228c9997dc2c88d3ea2ba9c15025350;hpb=730937dc37237c580238171f30e1c02243b8f758;p=ardour.git diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index 819165b352..23ae860f47 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -24,26 +24,32 @@ #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/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" +namespace ARDOUR { +class AutomationControl; +class MuteMaster; +class Pannable; +} + using namespace ARDOUR; 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. */ @@ -60,15 +66,17 @@ 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) { if (_role == Listen) { /* we don't need to do this but it keeps things looking clean @@ -77,12 +85,20 @@ 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)); - _meter.reset (new PeakMeter (_session)); + _amp.reset (new Amp (_session, _("Fader"), _gain_control, true)); + _meter.reset (new PeakMeter (_session, name())); - add_control (_amp->gain_control ()); + _delayline.reset (new DelayLine (_session, name())); + + if (panner_shell()) { + panner_shell()->Changed.connect_same_thread (*this, boost::bind (&Send::panshell_changed, this)); + } } Send::~Send () @@ -109,6 +125,35 @@ Send::deactivate () Processor::deactivate (); } +void +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, pframes_t nframes, bool) { @@ -134,11 +179,12 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe /* 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); + _delayline->run (sendbufs, start_frame, end_frame, nframes, true); + /* deliver to outputs */ Delivery::run (sendbufs, start_frame, end_frame, nframes, true); @@ -196,7 +242,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 (); @@ -221,7 +267,7 @@ Send::set_state (const XMLNode& node, int version) } } } - + XMLNodeList nlist = node.children(); for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) { if ((*i)->name() == X_("Processor")) { @@ -268,7 +314,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. @@ -282,7 +328,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; } @@ -290,11 +336,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(in, out)) { + 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) { @@ -342,5 +403,3 @@ Send::value_as_string (boost::shared_ptr ac) const { return _amp->value_as_string (ac); } - -