using namespace ARDOUR;
using namespace PBD;
-PortInsert::PortInsert (Session& s, boost::shared_ptr<MuteMaster> mm)
+PortInsert::PortInsert (Session& s, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster> mm)
: IOProcessor (s, true, true, string_compose (_("insert %1"), (bitslot = s.next_insert_id()) + 1), "")
- , _out (new Delivery (s, _output, mm, _name, Delivery::Insert))
+ , _out (new Delivery (s, _output, pannable, mm, _name, Delivery::Insert))
{
_mtdm = 0;
_latency_detect = false;
}
void
-PortInsert::set_measured_latency (nframes_t n)
+PortInsert::set_measured_latency (framecnt_t n)
{
_measured_latency = n;
}
-nframes_t
-PortInsert::latency() const
+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().
}
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_is_silent (false);
}
-
+
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);
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);
node.add_property ("bitslot", buf);
- snprintf (buf, sizeof (buf), "%u", _measured_latency);
+ 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);
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;
if ((prop = node.property ("block_size")) != 0) {
sscanf (prop->value().c_str(), "%u", &blocksize);
}
-
+
//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;
return 0;
}
-ARDOUR::nframes_t
+ARDOUR::framecnt_t
PortInsert::signal_latency() const
{
/* because we deliver and collect within the same cycle,
}
}
+/** Caller must hold process lock */
bool
PortInsert::configure_io (ChanCount in, ChanCount out)
{
+ assert (!AudioEngine::instance()->process_lock().trylock());
+
/* for an insert, processor input corresponds to IO output, and vice versa */
if (_input->ensure_io (in, false, this) != 0) {