X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdelivery.cc;h=56057ca7cc4bafa4d9f2a69a6bffa5fe0efcf053;hb=07cadd6fcaf6148f152a837f715b3e734eadb443;hp=f8bba4c8e71bf58ca054971d2779c3eb2b332d63;hpb=88beef2e93d26d28467fe151f5ef2972d0ca9169;p=ardour.git diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index f8bba4c8e7..56057ca7cc 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -1,16 +1,16 @@ /* - 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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -22,6 +22,9 @@ #include "pbd/enumwriter.h" #include "pbd/convert.h" +#include "ardour/midi_buffer.h" + +#include "ardour/debug.h" #include "ardour/delivery.h" #include "ardour/audio_buffer.h" #include "ardour/amp.h" @@ -31,8 +34,11 @@ #include "ardour/meter.h" #include "ardour/mute_master.h" #include "ardour/panner.h" +#include "ardour/panner_shell.h" +#include "ardour/pannable.h" #include "ardour/port.h" #include "ardour/session.h" +#include "ardour/audioengine.h" #include "i18n.h" @@ -40,146 +46,179 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -sigc::signal Delivery::CycleStart; -sigc::signal Delivery::PannersLegal; -bool Delivery::panners_legal = false; +PBD::Signal1 Delivery::CycleStart; +PBD::Signal0 Delivery::PannersLegal; +bool Delivery::panners_legal = false; /* deliver to an existing IO object */ -Delivery::Delivery (Session& s, boost::shared_ptr io, boost::shared_ptr mm, const string& name, Role r) - : IOProcessor(s, boost::shared_ptr(), (r == Listen ? boost::shared_ptr() : io), name) +Delivery::Delivery (Session& s, boost::shared_ptr io, boost::shared_ptr pannable, + boost::shared_ptr mm, const string& name, Role r) + : IOProcessor(s, boost::shared_ptr(), (role_requires_output_ports (r) ? io : boost::shared_ptr()), name) , _role (r) , _output_buffers (new BufferSet()) , _current_gain (1.0) , _output_offset (0) , _no_outs_cuz_we_no_monitor (false) - , _solo_level (0) - , _solo_isolated (false) , _mute_master (mm) , no_panner_reset (false) - { - _panner = boost::shared_ptr(new Panner (_name, _session)); - + _panshell = boost::shared_ptr(new PannerShell (_name, _session, pannable)); + _display_to_user = false; + if (_output) { - _output->changed.connect (mem_fun (*this, &Delivery::output_changed)); + _output->changed.connect_same_thread (*this, boost::bind (&Delivery::output_changed, this, _1, _2)); } - CycleStart.connect (mem_fun (*this, &Delivery::cycle_start)); + CycleStart.connect_same_thread (*this, boost::bind (&Delivery::cycle_start, this, _1)); } /* deliver to a new IO object */ -Delivery::Delivery (Session& s, boost::shared_ptr mm, const string& name, Role r) - : IOProcessor(s, false, (r == Listen ? false : true), name) +Delivery::Delivery (Session& s, boost::shared_ptr pannable, boost::shared_ptr mm, const string& name, Role r) + : IOProcessor(s, false, (role_requires_output_ports (r) ? true : false), name) , _role (r) , _output_buffers (new BufferSet()) , _current_gain (1.0) , _output_offset (0) , _no_outs_cuz_we_no_monitor (false) - , _solo_level (0) - , _solo_isolated (false) , _mute_master (mm) , no_panner_reset (false) { - _panner = boost::shared_ptr(new Panner (_name, _session)); + _panshell = boost::shared_ptr(new PannerShell (_name, _session, pannable)); + _display_to_user = false; if (_output) { - _output->changed.connect (mem_fun (*this, &Delivery::output_changed)); + _output->changed.connect_same_thread (*this, boost::bind (&Delivery::output_changed, this, _1, _2)); } - CycleStart.connect (mem_fun (*this, &Delivery::cycle_start)); + CycleStart.connect_same_thread (*this, boost::bind (&Delivery::cycle_start, this, _1)); } -/* deliver to a new IO object, reconstruct from XML */ -Delivery::Delivery (Session& s, boost::shared_ptr mm, const XMLNode& node) - : IOProcessor (s, false, true, "reset") - , _role (Role (0)) - , _output_buffers (new BufferSet()) - , _current_gain (1.0) - , _output_offset (0) - , _no_outs_cuz_we_no_monitor (false) - , _solo_level (0) - , _solo_isolated (false) - , _mute_master (mm) - , no_panner_reset (false) +Delivery::~Delivery() { - _panner = boost::shared_ptr(new Panner (_name, _session)); - - if (set_state (node)) { - throw failed_constructor (); - } - - if (_output) { - _output->changed.connect (mem_fun (*this, &Delivery::output_changed)); - } - - CycleStart.connect (mem_fun (*this, &Delivery::cycle_start)); + DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name)); + delete _output_buffers; } -/* deliver to an existing IO object, reconstruct from XML */ - -Delivery::Delivery (Session& s, boost::shared_ptr out, boost::shared_ptr mm, const XMLNode& node) - : IOProcessor (s, boost::shared_ptr(), out, "reset") - , _role (Role (0)) - , _output_buffers (new BufferSet()) - , _current_gain (1.0) - , _output_offset (0) - , _no_outs_cuz_we_no_monitor (false) - , _solo_level (0) - , _solo_isolated (false) - , _mute_master (mm) - , no_panner_reset (false) +std::string +Delivery::display_name () const { - _panner = boost::shared_ptr(new Panner (_name, _session)); - - if (set_state (node)) { - throw failed_constructor (); - } - - if (_output) { - _output->changed.connect (mem_fun (*this, &Delivery::output_changed)); + switch (_role) { + case Main: + return _("main outs"); + break; + case Listen: + return _("listen"); + break; + case Send: + case Insert: + default: + return name(); } - - CycleStart.connect (mem_fun (*this, &Delivery::cycle_start)); } void -Delivery::cycle_start (nframes_t nframes) +Delivery::cycle_start (pframes_t /*nframes*/) { _output_offset = 0; _no_outs_cuz_we_no_monitor = false; } void -Delivery::increment_output_offset (nframes_t n) +Delivery::increment_output_offset (framecnt_t n) { _output_offset += n; } bool -Delivery::visible () const +Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) const { - if (_role & Main) { - return false; - } + if (_role == Main) { - return true; -} + /* the out buffers will be set to point to the port output buffers + of our output object. + */ -bool -Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) const -{ - out = in; - return true; + if (_output) { + if (_output->n_ports() != ChanCount::ZERO) { + /* increase number of output ports if the processor chain requires it */ + out = ChanCount::max (_output->n_ports(), in); + return true; + } else { + /* not configured yet - we will passthru */ + out = in; + return true; + } + } else { + fatal << "programming error: this should never be reached" << endmsg; + /*NOTREACHED*/ + } + + + } else if (_role == Insert) { + + /* the output buffers will be filled with data from the *input* ports + of this Insert. + */ + + if (_input) { + if (_input->n_ports() != ChanCount::ZERO) { + out = _input->n_ports(); + return true; + } else { + /* not configured yet - we will passthru */ + out = in; + return true; + } + } else { + fatal << "programming error: this should never be reached" << endmsg; + /*NOTREACHED*/ + } + + } else { + fatal << "programming error: this should never be reached" << endmsg; + } + + return false; } +/** Caller must hold process lock */ bool Delivery::configure_io (ChanCount in, ChanCount out) { - if (out != in) { // always 1:1 - return false; + assert (!AudioEngine::instance()->process_lock().trylock()); + + /* check configuration by comparison with our I/O port configuration, if appropriate. + see ::can_support_io_configuration() for comments + */ + + if (_role == Main) { + + if (_output) { + if (_output->n_ports() != out) { + if (_output->n_ports() != ChanCount::ZERO) { + _output->ensure_io (out, false, this); + } else { + /* I/O not yet configured */ + } + } + } + + } else if (_role == Insert) { + + if (_input) { + if (_input->n_ports() != in) { + if (_input->n_ports() != ChanCount::ZERO) { + fatal << _name << " programming error: configure_io called with " << in << " and " << out << " with " << _input->n_ports() << " input ports" << endmsg; + /*NOTREACHED*/ + } else { + /* I/O not yet configured */ + } + } + } + } if (!Processor::configure_io (in, out)) { @@ -192,28 +231,38 @@ Delivery::configure_io (ChanCount in, ChanCount out) } void -Delivery::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) +Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool result_required) { + boost::shared_ptr panner; + + assert (_output); + + PortSet& ports (_output->ports()); + gain_t tgain; + if (_output->n_ports ().get (_output->default_type()) == 0) { - return; + goto out; } - /* this setup is not just for our purposes, but for anything that comes after us in the + if (!_active && !_pending_active) { + _output->silence (nframes); + goto out; + } + + /* this setup is not just for our purposes, but for anything that comes after us in the processing pathway that wants to use this->output_buffers() for some reason. */ - PortSet& ports (_output->ports()); - output_buffers().attach_buffers (ports, nframes, _output_offset); + output_buffers().get_jack_port_addresses (ports, nframes, _output_offset); // this Delivery processor is not a derived type, and thus we assume // we really can modify the buffers passed in (it is almost certainly // the main output stage of a Route). Contrast with Send::run() // which cannot do this. - gain_t tgain = target_gain (); - + tgain = target_gain (); + if (tgain != _current_gain) { - /* target gain has changed */ Amp::apply_gain (bufs, nframes, _current_gain, tgain); @@ -226,9 +275,10 @@ Delivery::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nfra */ _output->silence (nframes); - Amp::apply_simple_gain (bufs, nframes, 0.0); - - return; + if (result_required) { + Amp::apply_simple_gain (bufs, nframes, 0.0); + } + goto out; } else if (tgain != 1.0) { @@ -236,27 +286,34 @@ Delivery::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nfra Amp::apply_simple_gain (bufs, nframes, tgain); } - // Attach output buffers to port buffers + panner = _panshell->panner(); - if (_panner && _panner->npanners() && !_panner->bypassed()) { + if (panner && !panner->bypassed()) { // Use the panner to distribute audio to output port buffers - _panner->run (bufs, output_buffers(), start_frame, end_frame, nframes); + _panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes); + + if (result_required) { + bufs.read_from (output_buffers (), nframes); + } } else { + // Do a 1:1 copy of data to output ports if (bufs.count().n_audio() > 0 && ports.count().n_audio () > 0) { _output->copy_to_outputs (bufs, DataType::AUDIO, nframes, _output_offset); - } + } if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) { _output->copy_to_outputs (bufs, DataType::MIDI, nframes, _output_offset); } } -} + out: + _active = _pending_active; +} XMLNode& Delivery::state (bool full_state) @@ -272,20 +329,20 @@ Delivery::state (bool full_state) } node.add_property("role", enum_2_string(_role)); - node.add_child_nocopy (_panner->state (full_state)); + node.add_child_nocopy (_panshell->state (full_state)); return node; } int -Delivery::set_state (const XMLNode& node) +Delivery::set_state (const XMLNode& node, int version) { const XMLProperty* prop; - if (IOProcessor::set_state (node)) { + if (IOProcessor::set_state (node, version)) { return -1; } - + if ((prop = node.property ("role")) != 0) { _role = Role (string_2_enum (prop->value(), _role)); // std::cerr << this << ' ' << _name << " set role to " << enum_2_string (_role) << std::endl; @@ -294,10 +351,10 @@ Delivery::set_state (const XMLNode& node) } XMLNode* pan_node = node.child (X_("Panner")); - + if (pan_node) { - _panner->set_state (*pan_node); - } + _panshell->set_state (*pan_node, version); + } reset_panner (); @@ -307,22 +364,32 @@ Delivery::set_state (const XMLNode& node) void Delivery::reset_panner () { + if (_role == Listen) { + /* monitor out gets no panner */ + return; + } + if (panners_legal) { if (!no_panner_reset) { uint32_t ntargets; - + if (_output) { ntargets = _output->n_ports().n_audio(); } else { ntargets = _configured_output.n_audio(); } - _panner->reset (ntargets, pans_required()); + _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets)); + + if (_role == Main) { + _panshell->pannable()->set_panner (_panshell->panner()); + } } + } else { panner_legal_c.disconnect (); - panner_legal_c = PannersLegal.connect (mem_fun (*this, &Delivery::panners_became_legal)); + PannersLegal.connect_same_thread (panner_legal_c, boost::bind (&Delivery::panners_became_legal, this)); } } @@ -337,8 +404,12 @@ Delivery::panners_became_legal () ntargets = _configured_output.n_audio(); } - _panner->reset (ntargets, pans_required()); - _panner->load (); // automation + _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets)); + + if (_role == Main) { + _panshell->pannable()->set_panner (_panshell->panner()); + } + panner_legal_c.disconnect (); return 0; } @@ -368,48 +439,45 @@ int Delivery::reset_panners () { panners_legal = true; - return PannersLegal (); + return *PannersLegal (); } - void -Delivery::start_pan_touch (uint32_t which) +Delivery::flush_buffers (framecnt_t nframes, framepos_t time) { - if (which < _panner->npanners()) { - _panner->pan_control(which)->start_touch(); - } -} + /* io_lock, not taken: function must be called from Session::process() calltree */ -void -Delivery::end_pan_touch (uint32_t which) -{ - if (which < _panner->npanners()) { - _panner->pan_control(which)->stop_touch(); + PortSet& ports (_output->ports()); + + for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) { + (*i).flush_buffers (nframes, time, _output_offset); } - } void -Delivery::transport_stopped (sframes_t frame) +Delivery::transport_stopped (framepos_t now) { - _panner->transport_stopped (frame); + Processor::transport_stopped (now); + _panshell->pannable()->transport_stopped (now); + + if (_output) { + PortSet& ports (_output->ports()); + + for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) { + (*i).transport_stopped (); + } + } } -void -Delivery::flush (nframes_t nframes) +gain_t +Delivery::target_gain () { - /* io_lock, not taken: function must be called from Session::process() calltree */ - - PortSet& ports (_output->ports()); + /* if we've been requested to deactivate, our target gain is zero */ - for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) { - (*i).flush_buffers (nframes, _output_offset); + if (!_pending_active) { + return 0.0; } -} -gain_t -Delivery::target_gain () -{ /* if we've been told not to output because its a monitoring situation and we're not monitoring, then be quiet. */ @@ -418,42 +486,38 @@ Delivery::target_gain () return 0.0; } - gain_t desired_gain; - - if (_solo_level) { - desired_gain = 1.0; - } else { - - MuteMaster::MutePoint mp; - - switch (_role) { - case Main: - mp = MuteMaster::Main; - break; - case Listen: - mp = MuteMaster::Listen; - break; - case Send: - case Insert: - /* XXX FIX ME this is wrong, we need per-delivery muting */ + MuteMaster::MutePoint mp = MuteMaster::Main; // stupid gcc uninit warning + + switch (_role) { + case Main: + mp = MuteMaster::Main; + break; + case Listen: + mp = MuteMaster::Listen; + break; + case Send: + case Insert: + case Aux: + if (_pre_fader) { mp = MuteMaster::PreFader; - break; - } - - if (_solo_isolated) { - - /* ... but we are isolated from all that nonsense */ - - desired_gain = _mute_master->mute_gain_at (mp); - - } else if (_session.soloing()) { - - desired_gain = min (Config->get_solo_mute_gain(), _mute_master->mute_gain_at (mp)); - } else { - desired_gain = _mute_master->mute_gain_at (mp); + mp = MuteMaster::PostFader; } - } + break; + } + + gain_t desired_gain = _mute_master->mute_gain_at (mp); + + if (_role == Listen && _session.monitor_out() && !_session.listening()) { + + /* nobody is soloed, and this delivery is a listen-send to the + control/monitor/listen bus, we should be silent since + it gets its signal from the master out. + */ + + desired_gain = 0.0; + + } return desired_gain; } @@ -470,17 +534,23 @@ Delivery::set_name (const std::string& name) bool ret = IOProcessor::set_name (name); if (ret) { - ret = _panner->set_name (name); + ret = _panshell->set_name (name); } return ret; } void -Delivery::output_changed (IOChange change, void* src) +Delivery::output_changed (IOChange change, void* /*src*/) { - if (change & ARDOUR::ConfigurationChanged) { + if (change.type & IOChange::ConfigurationChanged) { reset_panner (); + _output_buffers->attach_buffers (_output->ports ()); } } +boost::shared_ptr +Delivery::panner () const +{ + return _panshell->panner(); +}