X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_send.cc;h=17a3ca1f421b47dc0acbdd2d866f5286e5739048;hb=16a8762dd494adb68756b8d549f349ed7bdccd9b;hp=ed7c5e6bc3c91edd64451522eb98a7e700d92d28;hpb=a5674e92712aacae648e8d55ec7b767b6d988542;p=ardour.git diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index ed7c5e6bc3..17a3ca1f42 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -22,19 +22,26 @@ #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_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 sendto, Delivery::Role role, bool ignore_bitslot) + : Send (s, p, mm, role, ignore_bitslot) { if (sendto) { if (use_target (sendto)) { @@ -43,6 +50,8 @@ InternalSend::InternalSend (Session& s, boost::shared_ptr p, boost::sh } init_gain (); + + CycleStart.connect_same_thread (*this, boost::bind (&InternalSend::cycle_start, this, _1)); } InternalSend::~InternalSend () @@ -75,17 +84,32 @@ InternalSend::use_target (boost::shared_ptr sendto) _send_to->add_send_to_internal_return (this); + mixbufs.ensure_buffers (_send_to->internal_return()->input_streams(), _session.get_block_size()); + mixbufs.set_count (_send_to->internal_return()->input_streams()); + + reset_panner (); + set_name (sendto->name()); _send_to_id = _send_to->id(); 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_to_going_away () { @@ -105,8 +129,48 @@ 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. - assert(mixbufs.available() >= bufs.count()); - mixbufs.read_from (bufs, nframes); + 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 */ + + 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); + } + } /* gain control */ @@ -134,14 +198,10 @@ 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); - /* XXX NEED TO PAN */ - /* consider metering */ if (_metering) { @@ -152,20 +212,6 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame } } -#if 0 - if (_session.transport_rolling()) { - for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) { - Sample* p = b->data (); - for (pframes_t n = 0; n < nframes; ++n) { - if (p[n] != 0.0) { - cerr << "\tnon-zero data SENT to " << b->data() << endl; - break; - } - } - } - } -#endif - /* target will pick up our output when it is ready */ out: @@ -175,7 +221,10 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame int InternalSend::set_block_size (pframes_t nframes) { - mixbufs.ensure_buffers (_configured_input, nframes); + if (_send_to) { + mixbufs.ensure_buffers (_send_to->internal_return()->input_streams(), nframes); + } + return 0; } @@ -212,10 +261,10 @@ InternalSend::set_state (const XMLNode& node, int version) { const XMLProperty* prop; - Send::set_state (node, version); - init_gain (); + Send::set_state (node, version); + if ((prop = node.property ("target")) != 0) { _send_to_id = prop->value(); @@ -248,7 +297,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; } @@ -256,17 +306,33 @@ 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; } +uint32_t +InternalSend::pan_outs () const +{ + /* the number of targets for our panner is determined by what we are + sending to, if anything. + */ + + if (_send_to) { + return _send_to->internal_return()->input_streams().n_audio(); + } + + return 1; /* zero is more accurate, but 1 is probably safer as a way to + * say "don't pan" + */ +} + 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; } @@ -281,7 +347,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; } @@ -304,3 +370,19 @@ InternalSend::send_to_property_changed (const PropertyChange& what_changed) set_name (_send_to->name ()); } } + +void +InternalSend::set_can_pan (bool yn) +{ + if (_panshell) { + _panshell->set_bypassed (!yn); + } +} + +void +InternalSend::cycle_start (pframes_t /*nframes*/) +{ + for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) { + b->prepare (); + } +}