X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fport_insert.cc;h=fa09ea05ac8dd11e3b2f2358ebed1b5eb4e81b66;hb=f6d29abfc75c460b9e35717f2907e4e61bf38058;hp=f047ce222414cb43d33da0379c9c4461ee2983ee;hpb=c0c617902e03db2a75e8733dcc9982a575c2366a;p=ardour.git diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc index f047ce2224..fa09ea05ac 100644 --- a/libs/ardour/port_insert.cc +++ b/libs/ardour/port_insert.cc @@ -19,19 +19,14 @@ #include - -#include "pbd/failed_constructor.h" #include "pbd/xml++.h" -#include "ardour/audioengine.h" #include "ardour/audio_port.h" -#include "ardour/buffer_set.h" +#include "ardour/audioengine.h" #include "ardour/delivery.h" +#include "ardour/io.h" #include "ardour/mtdm.h" -#include "ardour/plugin.h" -#include "ardour/port.h" #include "ardour/port_insert.h" -#include "ardour/route.h" #include "ardour/session.h" #include "ardour/types.h" @@ -41,31 +36,35 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PortInsert::PortInsert (Session& s, boost::shared_ptr mm) - : IOProcessor (s, true, true, string_compose (_("insert %1"), (bitslot = s.next_insert_id()) + 1), "") - , _out (new Delivery (s, _output, mm, _name, Delivery::Insert)) +string +PortInsert::name_and_id_new_insert (Session& s, uint32_t& bitslot) +{ + bitslot = s.next_insert_id (); + return string_compose (_("insert %1"), bitslot+ 1); +} + +PortInsert::PortInsert (Session& s, boost::shared_ptr pannable, boost::shared_ptr mm) + : IOProcessor (s, true, true, name_and_id_new_insert (s, _bitslot), "", DataType::AUDIO, true) + , _out (new Delivery (s, _output, pannable, mm, _name, Delivery::Insert)) { _mtdm = 0; _latency_detect = false; - _latency_flush_frames = false; + _latency_flush_frames = 0; _measured_latency = 0; } PortInsert::~PortInsert () { - _session.unmark_insert_id (bitslot); + _session.unmark_insert_id (_bitslot); delete _mtdm; } void PortInsert::start_latency_detection () { - if (_mtdm != 0) { - delete _mtdm; - } - - _mtdm = new MTDM; - _latency_flush_frames = false; + delete _mtdm; + _mtdm = new MTDM (_session.frame_rate()); + _latency_flush_frames = 0; _latency_detect = true; _measured_latency = 0; } @@ -73,55 +72,72 @@ PortInsert::start_latency_detection () void PortInsert::stop_latency_detection () { - _latency_flush_frames = signal_latency() + _session.engine().frames_per_cycle(); + _latency_flush_frames = signal_latency() + _session.engine().samples_per_cycle(); _latency_detect = false; } void -PortInsert::set_measured_latency (nframes_t n) +PortInsert::set_measured_latency (framecnt_t n) { _measured_latency = n; } +framecnt_t +PortInsert::latency() const +{ + /* because we deliver and collect within the same cycle, + all I/O is necessarily delayed by at least frames_per_cycle(). + + if the return port for insert has its own latency, we + need to take that into account too. + */ + + if (_measured_latency == 0) { + return _session.engine().samples_per_cycle() + _input->latency(); + } else { + return _measured_latency; + } +} + void -PortInsert::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool) +PortInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool) { if (_output->n_ports().n_total() == 0) { return; } if (_latency_detect) { - + if (_input->n_ports().n_audio() != 0) { AudioBuffer& outbuf (_output->ports().nth_audio_port(0)->get_audio_buffer (nframes)); Sample* in = _input->ports().nth_audio_port(0)->get_audio_buffer (nframes).data(); Sample* out = outbuf.data(); - + _mtdm->process (nframes, in, out); - - outbuf.is_silent (false); + + outbuf.set_written (true); } - + return; - + } else if (_latency_flush_frames) { - + /* wait for the entire input buffer to drain before picking up input again so that we can't hear the remnants of whatever MTDM pumped into the pipeline. */ - + silence (nframes); - + if (_latency_flush_frames > nframes) { _latency_flush_frames -= nframes; } else { _latency_flush_frames = 0; } - + return; } - + if (!_active && !_pending_active) { /* deliver silence */ silence (nframes); @@ -144,11 +160,15 @@ PortInsert::get_state(void) XMLNode& PortInsert::state (bool full) { - XMLNode& node = Processor::state(full); + XMLNode& node = IOProcessor::state(full); char buf[32]; node.add_property ("type", "port"); - snprintf (buf, sizeof (buf), "%" PRIu32, bitslot); + snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot); node.add_property ("bitslot", buf); + snprintf (buf, sizeof (buf), "%" PRId64, _measured_latency); + node.add_property("latency", buf); + snprintf (buf, sizeof (buf), "%u", _session.get_block_size()); + node.add_property("block_size", buf); return node; } @@ -163,15 +183,15 @@ PortInsert::set_state (const XMLNode& node, int version) const XMLNode* insert_node = &node; - // legacy sessions: search for child IOProcessor node + // legacy sessions: search for child Redirect node for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->name() == "IOProcessor") { + if ((*niter)->name() == "Redirect") { insert_node = *niter; break; } } - Processor::set_state (*insert_node, version); + IOProcessor::set_state (*insert_node, version); if ((prop = node.property ("type")) == 0) { error << _("XML node describing port insert is missing the `type' field") << endmsg; @@ -183,20 +203,32 @@ PortInsert::set_state (const XMLNode& node, int version) return -1; } - if ((prop = node.property ("bitslot")) == 0) { - bitslot = _session.next_insert_id(); - } else { - _session.unmark_insert_id (bitslot); - sscanf (prop->value().c_str(), "%" PRIu32, &bitslot); - _session.mark_insert_id (bitslot); - } + uint32_t blocksize = 0; + if ((prop = node.property ("block_size")) != 0) { + sscanf (prop->value().c_str(), "%u", &blocksize); + } - set_name (string_compose (_("insert %1"), bitslot)); + //if the jack period is the same as when the value was saved, we can recall our latency.. + if ( (_session.get_block_size() == blocksize) && (prop = node.property ("latency")) != 0) { + uint32_t latency = 0; + sscanf (prop->value().c_str(), "%u", &latency); + _measured_latency = latency; + } + + if (!node.property ("ignore-bitslot")) { + if ((prop = node.property ("bitslot")) == 0) { + _bitslot = _session.next_insert_id(); + } else { + _session.unmark_insert_id (_bitslot); + sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot); + _session.mark_insert_id (_bitslot); + } + } return 0; } -ARDOUR::nframes_t +ARDOUR::framecnt_t PortInsert::signal_latency() const { /* because we deliver and collect within the same cycle, @@ -207,15 +239,20 @@ PortInsert::signal_latency() const */ if (_measured_latency == 0) { - return _session.engine().frames_per_cycle() + _input->signal_latency(); + return _session.engine().samples_per_cycle() + _input->signal_latency(); } else { return _measured_latency; } } +/** Caller must hold process lock */ bool PortInsert::configure_io (ChanCount in, ChanCount out) { +#ifndef PLATFORM_WINDOWS + assert (!AudioEngine::instance()->process_lock().trylock()); +#endif + /* for an insert, processor input corresponds to IO output, and vice versa */ if (_input->ensure_io (in, false, this) != 0) { @@ -230,7 +267,7 @@ PortInsert::configure_io (ChanCount in, ChanCount out) } bool -PortInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out) const +PortInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out) { out = in; return true;