X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_send.cc;h=e7db47ca9d6dc4d79669115013b8175fe761ad6a;hb=fb430a7738d4d6d38de8ac3fba491c3572bed386;hp=cb9043fcee0bb28d72e401c064ab86b20a434bcb;hpb=36ec03358fd3f124217416f3db67f9f1aba72aa9;p=ardour.git diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index cb9043fcee..e7db47ca9d 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -19,19 +19,21 @@ #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/internal_return.h" #include "ardour/internal_send.h" #include "ardour/meter.h" -#include "ardour/panner.h" #include "ardour/panner_shell.h" #include "ardour/route.h" #include "ardour/session.h" #include "ardour/audioengine.h" -#include "i18n.h" +#include "pbd/i18n.h" + +namespace ARDOUR { class MuteMaster; class Pannable; } using namespace PBD; using namespace ARDOUR; @@ -39,17 +41,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)); } @@ -65,10 +76,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); } } @@ -86,6 +97,12 @@ 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())); + + if (_delayline) { + _delayline->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs())); + } + reset_panner (); set_name (sendto->name()); @@ -94,11 +111,27 @@ InternalSend::use_target (boost::shared_ptr sendto) target_connections.drop_connections (); _send_to->DropReferences.connect_same_thread (target_connections, boost::bind (&InternalSend::send_to_going_away, this)); - _send_to->PropertyChanged.connect_same_thread (target_connections, boost::bind (&InternalSend::send_to_property_changed, this, _1));; + _send_to->PropertyChanged.connect_same_thread (target_connections, boost::bind (&InternalSend::send_to_property_changed, this, _1)); + _send_to->io_changed.connect_same_thread (target_connections, boost::bind (&InternalSend::target_io_changed, this)); return 0; } +void +InternalSend::target_io_changed () +{ + assert (_send_to); + mixbufs.ensure_buffers (_send_to->internal_return()->input_streams(), _session.get_block_size()); + mixbufs.set_count (_send_to->internal_return()->input_streams()); + reset_panner(); +} + +void +InternalSend::send_from_going_away () +{ + _send_from.reset(); +} + void InternalSend::send_to_going_away () { @@ -108,7 +141,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, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool) { if ((!_active && !_pending_active) || !_send_to) { _meter->reset (); @@ -118,23 +151,59 @@ 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_frame, end_frame, 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); - - assert (mixbufs.available().get (DataType::AUDIO) >= bufs_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 + * a track that has more channels (bufs_audio from source-track is + * larger than mixbufs). + * + * There are two options: + * 1: discard additional channels (current) + * OR + * 2: require the monitor-section to have at least as many channels + * as the largest count of any route + */ + //assert (mixbufs.available().get (DataType::AUDIO) >= bufs_audio); /* Copy bufs into mixbufs, going round bufs more than once if necessary to ensure that every mixbuf gets some data. */ 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; @@ -142,6 +211,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()); @@ -157,37 +230,36 @@ 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_frame_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); } - // 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 (mixbufs, start_frame, end_frame, speed, nframes, true); - _amp->run (mixbufs, start_frame, end_frame, nframes, true); + _delayline->run (mixbufs, start_frame, end_frame, 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_frame, end_frame, speed, nframes, true); } } @@ -207,10 +279,20 @@ 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& @@ -220,11 +302,12 @@ InternalSend::state (bool full) /* 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; } @@ -238,15 +321,11 @@ InternalSend::get_state() 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 @@ -260,6 +339,8 @@ InternalSend::set_state (const XMLNode& node, int version) } } + node.get_property (X_("allow-feedback"), _allow_feedback); + return 0; } @@ -276,7 +357,8 @@ InternalSend::connect_when_legal () boost::shared_ptr sendto; if ((sendto = _session.route_by_id (_send_to_id)) == 0) { - error << X_("cannot find route to connect to") << endmsg; + error << string_compose (_("%1 - cannot find any track/bus with the ID %2 to connect to"), display_name(), _send_to_id) << endmsg; + cerr << string_compose (_("%1 - cannot find any track/bus with the ID %2 to connect to"), display_name(), _send_to_id) << endl; return -1; } @@ -284,7 +366,7 @@ InternalSend::connect_when_legal () } bool -InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out) const +InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out) { out = in; return true; @@ -310,7 +392,7 @@ bool InternalSend::configure_io (ChanCount in, ChanCount out) { bool ret = Send::configure_io (in, out); - set_block_size (_session.engine().frames_per_cycle()); + set_block_size (_session.engine().samples_per_cycle()); return ret; } @@ -325,7 +407,7 @@ string InternalSend::display_name () const { if (_role == Aux) { - return string_compose (X_("aux-%1"), _name); + return string_compose (X_("%1"), _name); } else { return _name; } @@ -358,9 +440,9 @@ InternalSend::set_can_pan (bool yn) } void -InternalSend::cycle_start (pframes_t nframes) +InternalSend::cycle_start (pframes_t /*nframes*/) { for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) { b->prepare (); } -} +}