X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_send.cc;h=8ec543030870a76c09a37892572e7ebe0af8519e;hb=ad547e53fc168410b22628a8cb125e8d4da4b293;hp=7c2c3842761aa83ed4eaa703448cd2539cbbf20c;hpb=f41149628955fc8145bef6db0c110b71664c0a3a;p=ardour.git diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index 7c2c384276..8ec5430308 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 @@ -17,8 +17,6 @@ */ -#include - #include "pbd/error.h" #include "pbd/failed_constructor.h" @@ -32,24 +30,17 @@ using namespace PBD; using namespace ARDOUR; +using namespace std; InternalSend::InternalSend (Session& s, boost::shared_ptr mm, boost::shared_ptr sendto, Delivery::Role role) : Send (s, mm, role) - , _send_to (sendto) -{ - if ((target = _send_to->get_return_buffer ()) == 0) { - throw failed_constructor(); - } - - set_name (sendto->name()); - - _send_to->GoingAway.connect (mem_fun (*this, &InternalSend::send_to_going_away)); -} - -InternalSend::InternalSend (Session& s, boost::shared_ptr mm, const XMLNode& node) - : Send (s, mm, node, Delivery::Aux /* will be reset in set_state() */) + , target (0) { - set_state (node); + if (sendto) { + if (use_target (sendto)) { + throw failed_constructor(); + } + } } InternalSend::~InternalSend () @@ -57,20 +48,40 @@ InternalSend::~InternalSend () if (_send_to) { _send_to->release_return_buffer (); } +} - connect_c.disconnect (); +int +InternalSend::use_target (boost::shared_ptr sendto) +{ + _send_to = sendto; + + if ((target = _send_to->get_return_buffer ()) == 0) { + return -1; + } + + 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));; + + return 0; } + void InternalSend::send_to_going_away () { target = 0; + target_connections.drop_connections (); _send_to.reset (); _send_to_id = "0"; } void -InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) +InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes, bool) { if ((!_active && !_pending_active) || !target || !_send_to) { _meter->reset (); @@ -79,62 +90,74 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_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. - - 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) { /* we were quiet last time, and we're still supposed to be quiet. */ _meter->reset (); - Amp::apply_simple_gain (sendbufs, nframes, 0.0); + 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; } +int +InternalSend::set_block_size (nframes_t nframes) +{ + mixbufs.ensure_buffers (_configured_input, nframes); + + /* ensure that our target can cope with us merging this many frames to it */ + if (target) { + target->ensure_buffers (_configured_input, nframes); + } + return 0; +} + bool InternalSend::feeds (boost::shared_ptr other) const { @@ -146,14 +169,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; } @@ -164,12 +187,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(); @@ -180,15 +201,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,20 +227,17 @@ InternalSend::connect_when_legal () return 0; } - if ((_send_to = _session.route_by_id (_send_to_id)) == 0) { + boost::shared_ptr sendto; + + if ((sendto = _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; } - return 0; + return use_target (sendto); } -bool +bool InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out) const { out = in; @@ -220,13 +245,21 @@ InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out) } bool -InternalSend::set_name (const std::string& str) +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 string& str) { /* rules for external sends don't apply to us */ return IOProcessor::set_name (str); } -std::string +string InternalSend::display_name () const { if (_role == Aux) { @@ -243,5 +276,13 @@ InternalSend::visible () const return true; } - return false; + return false; +} + +void +InternalSend::send_to_property_changed (const PropertyChange& what_changed) +{ + if (what_changed.contains (Properties::name)) { + set_name (_send_to->name ()); + } }