X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdelivery.cc;h=3b95c5ee3d521918e22e2cd424202ab19a071316;hb=204baa31d842d4c2f833d319b6fa55e402a1bfb8;hp=44782650c16c23904bfe8104ef29dc69d0b1cde4;hpb=37e9a53180877db90e3d9e88ac916a2ed0473ae3;p=ardour.git diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 44782650c1..3b95c5ee3d 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -47,7 +47,6 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -PBD::Signal1 Delivery::CycleStart; PBD::Signal0 Delivery::PannersLegal; bool Delivery::panners_legal = false; @@ -61,8 +60,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr io, boost::shared_ptr(new PannerShell (_name, _session, pannable)); @@ -73,8 +71,6 @@ Delivery::Delivery (Session& s, boost::shared_ptr io, boost::shared_ptrchanged.connect_same_thread (*this, boost::bind (&Delivery::output_changed, this, _1, _2)); } - - CycleStart.connect_same_thread (*this, boost::bind (&Delivery::cycle_start, this, _1)); } /* deliver to a new IO object */ @@ -86,8 +82,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr pannable, boost::sha , _current_gain (1.0) , _no_outs_cuz_we_no_monitor (false) , _mute_master (mm) - , no_panner_reset (false) - , scnt (0) + , _no_panner_reset (false) { if (pannable) { _panshell = boost::shared_ptr(new PannerShell (_name, _session, pannable)); @@ -98,14 +93,21 @@ Delivery::Delivery (Session& s, boost::shared_ptr pannable, boost::sha if (_output) { _output->changed.connect_same_thread (*this, boost::bind (&Delivery::output_changed, this, _1, _2)); } - - CycleStart.connect_same_thread (*this, boost::bind (&Delivery::cycle_start, this, _1)); } Delivery::~Delivery() { - DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name)); + DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name)); + + /* this object should vanish from any signal callback lists + that it is on before we get any further. The full qualification + of the method name is not necessary, but is here to make it + clear that this call is about signals, not data flow connections. + */ + + ScopedConnectionList::drop_connections (); + delete _output_buffers; } @@ -126,12 +128,6 @@ Delivery::display_name () const } } -void -Delivery::cycle_start (pframes_t /*nframes*/) -{ - _no_outs_cuz_we_no_monitor = false; -} - bool Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) const { @@ -233,8 +229,6 @@ Delivery::configure_io (ChanCount in, ChanCount out) void 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()); @@ -276,6 +270,7 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf _output->silence (nframes); if (result_required) { + bufs.set_count (output_buffers().count ()); Amp::apply_simple_gain (bufs, nframes, 0.0); } goto out; @@ -286,31 +281,17 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf Amp::apply_simple_gain (bufs, nframes, tgain); } - if (_panshell) { - panner = _panshell->panner(); - } - -#if 0 - if (_session.transport_rolling()) { - cerr << name() << " first value written : " << scnt << endl; - for (BufferSet::audio_iterator b = bufs.audio_begin(); b != bufs.audio_end(); ++b) { - Sample* p = b->data (); - float s = (float) scnt; - for (pframes_t n = 0; n < nframes; ++n) { - p[n] = s * 0.001; - s += 1.0; - } - } - scnt += nframes; - } -#endif - - if (panner && !panner->bypassed()) { + if (_panshell && !_panshell->bypassed() && _panshell->panner()) { // Use the panner to distribute audio to output port buffers _panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes); + // MIDI data will not have been delivered by the panner + + if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) { + _output->copy_to_outputs (bufs, DataType::MIDI, nframes, 0); + } } else { @@ -349,7 +330,7 @@ Delivery::state (bool full_state) node.add_property("role", enum_2_string(_role)); if (_panshell) { - node.add_child_nocopy (_panshell->state (full_state)); + node.add_child_nocopy (_panshell->get_state ()); } return node; @@ -371,7 +352,7 @@ Delivery::set_state (const XMLNode& node, int version) // std::cerr << this << ' ' << _name << " NO ROLE INFO\n"; } - XMLNode* pan_node = node.child (X_("Panner")); + XMLNode* pan_node = node.child (X_("PannerShell")); if (pan_node && _panshell) { _panshell->set_state (*pan_node, version); @@ -383,26 +364,31 @@ Delivery::set_state (const XMLNode& node, int version) } void -Delivery::reset_panner () +Delivery::unpan () { - if (_role == Listen) { - /* monitor out gets no panner */ - return; - } + /* caller must hold process lock */ - if (panners_legal) { - if (!no_panner_reset) { + _panshell.reset (); +} - uint32_t ntargets; +uint32_t +Delivery::pan_outs () const +{ + if (_output) { + return _output->n_ports().n_audio(); + } - if (_output) { - ntargets = _output->n_ports().n_audio(); - } else { - ntargets = _configured_output.n_audio(); - } + return _configured_output.n_audio(); +} + +void +Delivery::reset_panner () +{ + if (panners_legal) { + if (!_no_panner_reset) { if (_panshell) { - _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets)); + _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs())); if (_role == Main) { _panshell->pannable()->set_panner (_panshell->panner()); @@ -419,16 +405,8 @@ Delivery::reset_panner () int Delivery::panners_became_legal () { - uint32_t ntargets; - - if (_output) { - ntargets = _output->n_ports().n_audio(); - } else { - ntargets = _configured_output.n_audio(); - } - if (_panshell) { - _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets)); + _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs())); if (_role == Main) { _panshell->pannable()->set_panner (_panshell->panner()); @@ -442,19 +420,19 @@ Delivery::panners_became_legal () void Delivery::defer_pan_reset () { - no_panner_reset = true; + _no_panner_reset = true; } void Delivery::allow_pan_reset () { - no_panner_reset = false; + _no_panner_reset = false; reset_panner (); } int -Delivery::disable_panners (void) +Delivery::disable_panners () { panners_legal = false; return 0; @@ -472,10 +450,14 @@ Delivery::flush_buffers (framecnt_t nframes, framepos_t time) { /* io_lock, not taken: function must be called from Session::process() calltree */ + if (!_output) { + return; + } + PortSet& ports (_output->ports()); for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) { - (*i).flush_buffers (nframes, time); + i->flush_buffers (nframes, time); } } @@ -492,7 +474,7 @@ Delivery::transport_stopped (framepos_t now) PortSet& ports (_output->ports()); for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) { - (*i).transport_stopped (); + i->transport_stopped (); } } } @@ -504,7 +486,7 @@ Delivery::realtime_locate () PortSet& ports (_output->ports()); for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) { - (*i).realtime_locate (); + i->realtime_locate (); } } } @@ -580,6 +562,8 @@ Delivery::set_name (const std::string& name) return ret; } +bool ignore_output_change = false; + void Delivery::output_changed (IOChange change, void* /*src*/) { @@ -598,3 +582,4 @@ Delivery::panner () const return boost::shared_ptr(); } } +