X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fport_insert.cc;h=7427dda42ca632fc666815e3e75af427061302c3;hb=8c04457be14673385287def048c387b3953fa8e8;hp=fa09ea05ac8dd11e3b2f2358ebed1b5eb4e81b66;hpb=a882e96db1367c26660fd3d3079e9e3e19b1e149;p=ardour.git

diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc
index fa09ea05ac..7427dda42c 100644
--- a/libs/ardour/port_insert.cc
+++ b/libs/ardour/port_insert.cc
@@ -30,7 +30,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -59,6 +59,13 @@ PortInsert::~PortInsert ()
         delete _mtdm;
 }
 
+void
+PortInsert::set_pre_fader (bool p)
+{
+	Processor::set_pre_fader (p);
+	_out->set_pre_fader (p);
+}
+
 void
 PortInsert::start_latency_detection ()
 {
@@ -100,7 +107,7 @@ PortInsert::latency() const
 }
 
 void
-PortInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
+PortInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool)
 {
 	if (_output->n_ports().n_total() == 0) {
 		return;
@@ -115,7 +122,7 @@ PortInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
                         Sample* out = outbuf.data();
 
                         _mtdm->process (nframes, in, out);
-			
+
                         outbuf.set_written (true);
                 }
 
@@ -127,7 +134,7 @@ PortInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
                    hear the remnants of whatever MTDM pumped into the pipeline.
                 */
 
-                silence (nframes);
+                silence (nframes, start_frame);
 
                 if (_latency_flush_frames > nframes) {
                         _latency_flush_frames -= nframes;
@@ -140,11 +147,11 @@ PortInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
 
 	if (!_active && !_pending_active) {
 		/* deliver silence */
-		silence (nframes);
+		silence (nframes, start_frame);
 		goto out;
 	}
 
-	_out->run (bufs, start_frame, end_frame, nframes, true);
+	_out->run (bufs, start_frame, end_frame, speed, nframes, true);
 	_input->collect_input (bufs, nframes, ChanCount::ZERO);
 
   out:
@@ -161,14 +168,10 @@ XMLNode&
 PortInsert::state (bool 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), "%" PRId64, _measured_latency);
-        node.add_property("latency", buf);
-        snprintf (buf, sizeof (buf), "%u", _session.get_block_size());
-        node.add_property("block_size", buf);
+	node.set_property ("type", "port");
+	node.set_property ("bitslot", _bitslot);
+	node.set_property ("latency", _measured_latency);
+	node.set_property ("block-size", _session.get_block_size());
 
 	return node;
 }
@@ -179,7 +182,6 @@ PortInsert::set_state (const XMLNode& node, int version)
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;
 	XMLPropertyList plist;
-	const XMLProperty *prop;
 
 	const XMLNode* insert_node = &node;
 
@@ -193,35 +195,33 @@ PortInsert::set_state (const XMLNode& node, int version)
 
 	IOProcessor::set_state (*insert_node, version);
 
-	if ((prop = node.property ("type")) == 0) {
+	std::string type_str;
+	if (!node.get_property ("type", type_str)) {
 		error << _("XML node describing port insert is missing the `type' field") << endmsg;
 		return -1;
 	}
 
-	if (prop->value() != "port") {
+	if (type_str != "port") {
 		error << _("non-port insert XML used for port plugin insert") << endmsg;
 		return -1;
 	}
 
-        uint32_t blocksize = 0;
-        if ((prop = node.property ("block_size")) != 0) {
-                sscanf (prop->value().c_str(), "%u", &blocksize);
-        }
+	uint32_t blocksize = 0;
+	node.get_property ("block-size", 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;
-                sscanf (prop->value().c_str(), "%u", &latency);
-                _measured_latency = latency;
-        }
+	//if the jack period is the same as when the value was saved, we can recall our latency..
+	if ( (_session.get_block_size() == blocksize) ) {
+		node.get_property ("latency", _measured_latency);
+	}
 
 	if (!node.property ("ignore-bitslot")) {
-		if ((prop = node.property ("bitslot")) == 0) {
-			_bitslot = _session.next_insert_id();
-		} else {
+		uint32_t bitslot;
+		if (node.get_property ("bitslot", bitslot)) {
 			_session.unmark_insert_id (_bitslot);
-			sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+			_bitslot = bitslot;
 			_session.mark_insert_id (_bitslot);
+		} else {
+			_bitslot = _session.next_insert_id();
 		}
 	}