X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdelivery.cc;h=80135baf28c0da2d77a49b5469369d7e53904eb8;hb=a406d9183adc67075a4e802fd8254c2560df9964;hp=a1aa968a040b5cbc05b292e5d800d2d7333b014f;hpb=e33d4553b2b333c30835b00741fc5c1fd0e2b36d;p=ardour.git diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index a1aa968a04..80135baf28 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -35,6 +35,7 @@ #include "ardour/panner.h" #include "ardour/port.h" #include "ardour/session.h" +#include "ardour/audioengine.h" #include "i18n.h" @@ -42,9 +43,9 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -PBD::Signal1 Delivery::CycleStart; -PBD::Signal0 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 */ @@ -114,14 +115,14 @@ Delivery::display_name () const } 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; } @@ -137,7 +138,8 @@ Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) con if (_output) { if (_output->n_ports() != ChanCount::ZERO) { - out = _output->n_ports(); + /* 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 */ @@ -177,9 +179,12 @@ Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) con return false; } +/** Caller must hold process lock */ bool Delivery::configure_io (ChanCount in, ChanCount out) { + 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 */ @@ -189,8 +194,7 @@ Delivery::configure_io (ChanCount in, ChanCount out) if (_output) { if (_output->n_ports() != out) { if (_output->n_ports() != ChanCount::ZERO) { - fatal << _name << " programming error: configure_io with nports = " << _output->n_ports() << " called with " << in << " and " << out << " with " << _output->n_ports() << " output ports" << endmsg; - /*NOTREACHED*/ + _output->ensure_io (out, false, this); } else { /* I/O not yet configured */ } @@ -209,8 +213,9 @@ Delivery::configure_io (ChanCount in, ChanCount out) } } } - } + } + if (!Processor::configure_io (in, out)) { return false; } @@ -221,7 +226,7 @@ Delivery::configure_io (ChanCount in, ChanCount out) } void -Delivery::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool result_required) +Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool result_required) { assert (_output); @@ -241,7 +246,7 @@ Delivery::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nfra processing pathway that wants to use this->output_buffers() for some reason. */ - 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 @@ -418,50 +423,49 @@ Delivery::reset_panners () void -Delivery::start_pan_touch (uint32_t which) +Delivery::start_pan_touch (uint32_t which, double when) { if (which < _panner->npanners()) { - _panner->pan_control(which)->start_touch(); + _panner->pan_control(which)->start_touch(when); } } void -Delivery::end_pan_touch (uint32_t which) +Delivery::end_pan_touch (uint32_t which, bool mark, double when) { if (which < _panner->npanners()) { - _panner->pan_control(which)->stop_touch(); + _panner->pan_control(which)->stop_touch(mark, when); } } -void -Delivery::transport_stopped (sframes_t frame) -{ - _panner->transport_stopped (frame); -} void -Delivery::flush (nframes_t nframes, nframes64_t time) +Delivery::flush_buffers (framecnt_t nframes, framepos_t time) { /* io_lock, not taken: function must be called from Session::process() calltree */ 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 () +Delivery::transport_stopped (framepos_t now) { - /* turn off any notes that are on */ + Processor::transport_stopped (now); - PortSet& ports (_output->ports()); + _panner->transport_stopped (now); - for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) { - (*i).transport_stopped (); - } + if (_output) { + PortSet& ports (_output->ports()); + + for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) { + (*i).transport_stopped (); + } + } } gain_t @@ -481,9 +485,7 @@ Delivery::target_gain () return 0.0; } - gain_t desired_gain = -1.0f; - - MuteMaster::MutePoint mp; + MuteMaster::MutePoint mp = MuteMaster::Main; // stupid gcc uninit warning switch (_role) { case Main: @@ -495,13 +497,15 @@ Delivery::target_gain () case Send: case Insert: case Aux: - /* XXX FIX ME this is wrong, we need per-delivery muting */ - mp = MuteMaster::PreFader; + if (_pre_fader) { + mp = MuteMaster::PreFader; + } else { + mp = MuteMaster::PostFader; + } break; } - //cerr << name() << ' '; - desired_gain = _mute_master->mute_gain_at (mp); + gain_t desired_gain = _mute_master->mute_gain_at (mp); if (_role == Listen && _session.monitor_out() && !_session.listening()) { @@ -538,8 +542,8 @@ Delivery::set_name (const std::string& name) void Delivery::output_changed (IOChange change, void* /*src*/) { - if (change & ARDOUR::ConfigurationChanged) { + if (change.type & IOChange::ConfigurationChanged) { reset_panner (); + _output_buffers->attach_buffers (_output->ports ()); } } -