X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_send.cc;h=33b299dfeea9b88058b90590a8471e128b9e44ed;hb=9254e80c396265f484adb3b7bf5f0b502d096107;hp=bd2efbe12dae57b47d1a7809977c4910c5aa576a;hpb=c7d2497e2badd3fabd29fe3b1c55978f276bbbf9;p=ardour.git diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index bd2efbe12d..33b299dfee 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -25,27 +25,41 @@ #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" +namespace ARDOUR { class MuteMaster; class Pannable; } + using namespace PBD; using namespace ARDOUR; using namespace std; -InternalSend::InternalSend (Session& s, boost::shared_ptr p, boost::shared_ptr mm, boost::shared_ptr sendto, Delivery::Role role) - : Send (s, p, mm, role) +PBD::Signal1 InternalSend::CycleStart; + +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) { - 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)); } InternalSend::~InternalSend () @@ -89,11 +103,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 () { @@ -113,13 +143,43 @@ 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()) { + if (_panshell && !_panshell->bypassed() && role() != Listen) { _panshell->run (bufs, mixbufs, start_frame, end_frame, nframes); } else { if (role() == Listen) { /* We're going to the monitor bus, so discard MIDI data */ - assert (mixbufs.available().get (DataType::AUDIO) >= bufs.count().get (DataType::AUDIO)); - mixbufs.read_from (bufs, nframes, DataType::AUDIO); + + 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 + * 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) { + mixbufs.get_audio(i).read_from (bufs.get_audio(j), nframes); + ++j; + + if (j == bufs_audio) { + j = 0; + } + } + } else { assert (mixbufs.available() >= bufs.count()); mixbufs.read_from (bufs, nframes); @@ -152,12 +212,12 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame 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, nframes, true); + _delayline->run (mixbufs, start_frame, end_frame, nframes, true); + /* consider metering */ if (_metering) { @@ -253,7 +313,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; } @@ -261,7 +322,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; @@ -287,7 +348,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; } @@ -302,7 +363,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; } @@ -335,11 +396,9 @@ InternalSend::set_can_pan (bool yn) } void -InternalSend::cycle_start (pframes_t nframes) +InternalSend::cycle_start (pframes_t /*nframes*/) { - Delivery::cycle_start (nframes); - for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) { - (*b).prepare (); + b->prepare (); } }