X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_send.cc;h=9749dab7603aacb0c84aa4404f6a4dcbea7c8ab0;hb=81bff2edee31ad64693d5be3c06558714ea92722;hp=dac1839a5ea07a89bfc2a0907a75be81281c800e;hpb=0c384b7c219872322a4462f62e5e67b4119caa6d;p=ardour.git diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index dac1839a5e..9749dab760 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -19,9 +19,11 @@ #include "pbd/error.h" #include "pbd/failed_constructor.h" +#include "pbd/types_convert.h" #include "ardour/amp.h" #include "ardour/audio_buffer.h" +#include "ardour/delayline.h" #include "ardour/internal_return.h" #include "ardour/internal_send.h" #include "ardour/meter.h" @@ -30,7 +32,7 @@ #include "ardour/session.h" #include "ardour/audioengine.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace ARDOUR { class MuteMaster; class Pannable; } @@ -40,17 +42,26 @@ using namespace std; PBD::Signal1 InternalSend::CycleStart; -InternalSend::InternalSend (Session& s, boost::shared_ptr p, boost::shared_ptr mm, boost::shared_ptr sendto, Delivery::Role role) - : Send (s, p, mm, role) +InternalSend::InternalSend (Session& s, + boost::shared_ptr p, + boost::shared_ptr mm, + boost::shared_ptr sendfrom, + boost::shared_ptr sendto, + Delivery::Role role, + bool ignore_bitslot) + : Send (s, p, mm, role, ignore_bitslot) + , _send_from (sendfrom) + , _allow_feedback (false) { - if (sendto) { - if (use_target (sendto)) { - throw failed_constructor(); - } - } + if (sendto) { + if (use_target (sendto)) { + throw failed_constructor(); + } + } init_gain (); + _send_from->DropReferences.connect_same_thread (source_connection, boost::bind (&InternalSend::send_from_going_away, this)); CycleStart.connect_same_thread (*this, boost::bind (&InternalSend::cycle_start, this, _1)); } @@ -66,10 +77,10 @@ InternalSend::init_gain () { if (_role == Listen) { /* send to monitor bus is always at unity */ - _amp->set_gain (1.0, this); + _gain_control->set_value (GAIN_COEFF_UNITY, PBD::Controllable::NoGroup); } else { /* aux sends start at -inf dB */ - _amp->set_gain (0, this); + _gain_control->set_value (GAIN_COEFF_ZERO, PBD::Controllable::NoGroup); } } @@ -87,6 +98,10 @@ InternalSend::use_target (boost::shared_ptr sendto) mixbufs.ensure_buffers (_send_to->internal_return()->input_streams(), _session.get_block_size()); mixbufs.set_count (_send_to->internal_return()->input_streams()); + _meter->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs())); + + _send_delay->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs())); + reset_panner (); set_name (sendto->name()); @@ -110,6 +125,12 @@ InternalSend::target_io_changed () reset_panner(); } +void +InternalSend::send_from_going_away () +{ + _send_from.reset(); +} + void InternalSend::send_to_going_away () { @@ -119,7 +140,7 @@ InternalSend::send_to_going_away () } void -InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool) +InternalSend::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool) { if ((!_active && !_pending_active) || !_send_to) { _meter->reset (); @@ -129,15 +150,38 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame // we have to copy the input, because we may alter the buffers with the amp // in-place, which a send must never do. - if (_panshell && !_panshell->bypassed()) { - _panshell->run (bufs, mixbufs, start_frame, end_frame, nframes); + if (_panshell && !_panshell->bypassed() && role() != Listen) { + if (mixbufs.count ().n_audio () > 0) { + _panshell->run (bufs, mixbufs, start_sample, end_sample, nframes); + } + + /* non-audio data will not have been copied by the panner, do it now + * if there are more buffers available than send buffers, ignore them, + * if there are less, copy the last as IO::copy_to_output does. */ + + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + if (*t != DataType::AUDIO) { + BufferSet::iterator o = mixbufs.begin(*t); + BufferSet::iterator i = bufs.begin(*t); + + while (i != bufs.end(*t) && o != mixbufs.end(*t)) { + o->read_from (*i, nframes); + ++i; + ++o; + } + while (o != mixbufs.end(*t)) { + o->silence(nframes, 0); + ++o; + } + } + } } else { if (role() == Listen) { /* We're going to the monitor bus, so discard MIDI data */ - + uint32_t const bufs_audio = bufs.count().get (DataType::AUDIO); uint32_t const mixbufs_audio = mixbufs.count().get (DataType::AUDIO); - + /* monitor-section has same number of channels as master-bus (on creation). * * There is no clear answer what should happen when trying to PFL or AFL @@ -157,7 +201,8 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame */ uint32_t j = 0; - for (uint32_t i = 0; i < mixbufs_audio; ++i) { + uint32_t i = 0; + for (i = 0; i < mixbufs_audio && j < bufs_audio; ++i) { mixbufs.get_audio(i).read_from (bufs.get_audio(j), nframes); ++j; @@ -165,6 +210,10 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame j = 0; } } + /* in case or MIDI track with 0 audio channels */ + for (; i < mixbufs_audio; ++i) { + mixbufs.get_audio(i).silence (nframes); + } } else { assert (mixbufs.available() >= bufs.count()); @@ -180,38 +229,41 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame /* target gain has changed */ - Amp::apply_gain (mixbufs, nframes, _current_gain, tgain); - _current_gain = tgain; + _current_gain = Amp::apply_gain (mixbufs, _session.nominal_sample_rate(), nframes, _current_gain, tgain); - } else if (tgain == 0.0) { + } else if (tgain == GAIN_COEFF_ZERO) { /* we were quiet last time, and we're still supposed to be quiet. */ _meter->reset (); - Amp::apply_simple_gain (mixbufs, nframes, 0.0); + Amp::apply_simple_gain (mixbufs, nframes, GAIN_COEFF_ZERO); goto out; - } else if (tgain != 1.0) { + } else if (tgain != GAIN_COEFF_UNITY) { /* target gain has not changed, but is not zero or unity */ Amp::apply_simple_gain (mixbufs, nframes, tgain); } _amp->set_gain_automation_buffer (_session.send_gain_automation_buffer ()); - _amp->setup_gain_automation (start_frame, end_frame, nframes); - _amp->run (mixbufs, start_frame, end_frame, nframes, true); + _amp->setup_gain_automation (start_sample, end_sample, nframes); + _amp->run (mixbufs, start_sample, end_sample, speed, nframes, true); + + _send_delay->run (mixbufs, start_sample, end_sample, speed, nframes, true); /* consider metering */ if (_metering) { - if (_amp->gain_control()->get_value() == 0) { + if (_amp->gain_control()->get_value() == GAIN_COEFF_ZERO) { _meter->reset(); } else { - _meter->run (mixbufs, start_frame, end_frame, nframes, true); + _meter->run (mixbufs, start_sample, end_sample, speed, nframes, true); } } + _thru_delay->run (bufs, start_sample, end_sample, speed, nframes, true); + /* target will pick up our output when it is ready */ out: @@ -228,46 +280,47 @@ InternalSend::set_block_size (pframes_t nframes) return 0; } +void +InternalSend::set_allow_feedback (bool yn) +{ + _allow_feedback = yn; + _send_from->processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */ +} + bool InternalSend::feeds (boost::shared_ptr other) const { - return _send_to == other; + if (_role == Listen || !_allow_feedback) { + return _send_to == other; + } + return false; } XMLNode& -InternalSend::state (bool full) +InternalSend::state () { - XMLNode& node (Send::state (full)); + XMLNode& node (Send::state ()); /* this replaces any existing "type" property */ - node.add_property ("type", "intsend"); + node.set_property ("type", "intsend"); if (_send_to) { - node.add_property ("target", _send_to->id().to_s()); + node.set_property ("target", _send_to->id()); } + node.set_property ("allow-feedback", _allow_feedback); return node; } -XMLNode& -InternalSend::get_state() -{ - return state (true); -} - int InternalSend::set_state (const XMLNode& node, int version) { - const XMLProperty* prop; - init_gain (); Send::set_state (node, version); - if ((prop = node.property ("target")) != 0) { - - _send_to_id = prop->value(); + if (node.get_property ("target", _send_to_id)) { /* if we're loading a session, the target route may not have been create yet. make sure we defer till we are sure that it should @@ -281,6 +334,8 @@ InternalSend::set_state (const XMLNode& node, int version) } } + node.get_property (X_("allow-feedback"), _allow_feedback); + return 0; } @@ -385,4 +440,4 @@ InternalSend::cycle_start (pframes_t /*nframes*/) for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) { b->prepare (); } -} +}