X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_send.cc;h=4a4823a29f0b7efbbebbe18b688f8e987080abc0;hb=9e0d03020ff47773f7d1c0414de1c74e6c9e0dac;hp=7ca9319a1e74de99ec9e615e558d94b64bbf2bc1;hpb=20342cf2644fee7b04d6cfdc4fc686897837a01b;p=ardour.git diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index 7ca9319a1e..4a4823a29f 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,14 +42,17 @@ InternalSend::InternalSend (Session& s, boost::shared_ptr mm, boost: } set_name (sendto->name()); - - _send_to->GoingAway.connect (mem_fun (*this, &InternalSend::send_to_going_away)); + + _send_to->DropReferences.connect_same_thread (*this, boost::bind (&InternalSend::send_to_going_away, this)); + _send_to->NameChanged.connect_same_thread (*this, boost::bind (&InternalSend::send_to_name_changed, this)); } InternalSend::InternalSend (Session& s, boost::shared_ptr mm, const XMLNode& node) - : Send (s, mm, node, Delivery::Aux /* will be reset in set_state() */) + : Send (s, mm, node, Stateful::loading_state_version, Delivery::Aux /* will be reset in set_state() */), + target (0) { - set_state (node); + /* Send constructor will set its state, so here we just need to set up our own */ + set_our_state (node, Stateful::loading_state_version); } InternalSend::~InternalSend () @@ -70,29 +73,28 @@ InternalSend::send_to_going_away () } void -InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) +InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool) { - if (!_active || !target || !_send_to) { + if ((!_active && !_pending_active) || !target || !_send_to) { _meter->reset (); return; } // we have to copy the input, because we may alter the buffers with the amp // in-place, which a send must never do. - - BufferSet& sendbufs = _session.get_mix_buffers (bufs.count()); - sendbufs.read_from (bufs, nframes); - assert(sendbufs.count() == bufs.count()); + + assert(mixbufs.available() >= bufs.count()); + mixbufs.read_from (bufs, nframes); /* gain control */ gain_t tgain = target_gain (); - + if (tgain != _current_gain) { - + /* target gain has changed */ - Amp::apply_gain (sendbufs, nframes, _current_gain, tgain); + Amp::apply_gain (mixbufs, nframes, _current_gain, tgain); _current_gain = tgain; } else if (tgain == 0.0) { @@ -101,35 +103,45 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, */ _meter->reset (); - Amp::apply_simple_gain (sendbufs, nframes, 0.0); - return; + Amp::apply_simple_gain (mixbufs, nframes, 0.0); + goto out; } else if (tgain != 1.0) { /* target gain has not changed, but is not zero or unity */ - Amp::apply_simple_gain (sendbufs, nframes, tgain); + 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->run (sendbufs, start_frame, end_frame, nframes); + _amp->run (mixbufs, start_frame, end_frame, nframes, true); + + /* XXX NEED TO PAN */ /* consider metering */ - + if (_metering) { if (_amp->gain_control()->get_value() == 0) { _meter->reset(); } else { - _meter->run (sendbufs, start_frame, end_frame, nframes); + _meter->run (mixbufs, start_frame, end_frame, nframes, true); } } /* deliver to target */ - target->merge_from (sendbufs, nframes); + target->merge_from (mixbufs, nframes); + + out: + _active = _pending_active; +} + +void +InternalSend::set_block_size (nframes_t nframes) +{ + mixbufs.ensure_buffers (_configured_input, nframes); } bool @@ -143,14 +155,14 @@ InternalSend::state (bool full) { XMLNode& node (Send::state (full)); - /* this replaces any existing property */ + /* this replaces any existing "type" property */ node.add_property ("type", "intsend"); if (_send_to) { node.add_property ("target", _send_to->id().to_s()); } - + return node; } @@ -161,12 +173,10 @@ InternalSend::get_state() } int -InternalSend::set_state (const XMLNode& node) +InternalSend::set_our_state (const XMLNode& node, int /*version*/) { const XMLProperty* prop; - Send::set_state (node); - if ((prop = node.property ("target")) != 0) { _send_to_id = prop->value(); @@ -177,15 +187,22 @@ InternalSend::set_state (const XMLNode& node) */ if (!IO::connecting_legal) { - connect_c = IO::ConnectingLegal.connect (mem_fun (*this, &InternalSend::connect_when_legal)); + IO::ConnectingLegal.connect_same_thread (connect_c, boost::bind (&InternalSend::connect_when_legal, this)); } else { connect_when_legal (); } } - + return 0; } +int +InternalSend::set_state (const XMLNode& node, int version) +{ + Send::set_state (node, version); + return set_our_state (node, version); +} + int InternalSend::connect_when_legal () { @@ -199,8 +216,8 @@ InternalSend::connect_when_legal () if ((_send_to = _session.route_by_id (_send_to_id)) == 0) { error << X_("cannot find route to connect to") << endmsg; return -1; - } - + } + if ((target = _send_to->get_return_buffer ()) == 0) { error << X_("target for internal send has no return buffer") << endmsg; return -1; @@ -209,13 +226,21 @@ InternalSend::connect_when_legal () return 0; } -bool +bool InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out) const { out = in; return true; } +bool +InternalSend::configure_io (ChanCount in, ChanCount out) +{ + bool ret = Send::configure_io (in, out); + set_block_size (_session.engine().frames_per_cycle()); + return ret; +} + bool InternalSend::set_name (const std::string& str) { @@ -240,5 +265,11 @@ InternalSend::visible () const return true; } - return false; + return false; +} + +void +InternalSend::send_to_name_changed () +{ + set_name (_send_to->name ()); }