X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcapturing_processor.cc;h=6e9049472af02f98c4ee2348e8fd6732813c6534;hb=11b02e90ac9b084cd25741b7a6bdc91c59749c16;hp=ce4a546fb417f8503465d5cc2aef3151bcc85f44;hpb=4729bbde5f5f6833b878155da5a395d5ecd9e565;p=ardour.git

diff --git a/libs/ardour/capturing_processor.cc b/libs/ardour/capturing_processor.cc
index ce4a546fb4..6e9049472a 100644
--- a/libs/ardour/capturing_processor.cc
+++ b/libs/ardour/capturing_processor.cc
@@ -22,13 +22,14 @@
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 
-CapturingProcessor::CapturingProcessor (Session & session)
+CapturingProcessor::CapturingProcessor (Session & session, samplecnt_t latency)
 	: Processor (session, X_("capture point"))
 	, block_size (AudioEngine::instance()->samples_per_cycle())
+	, _latency (latency)
 {
 	realloc_buffers ();
 }
@@ -46,10 +47,16 @@ CapturingProcessor::set_block_size (pframes_t nframes)
 }
 
 void
-CapturingProcessor::run (BufferSet& bufs, framepos_t, framepos_t, pframes_t nframes, bool)
+CapturingProcessor::run (BufferSet& bufs, samplepos_t, samplepos_t, double, pframes_t nframes, bool)
 {
-	if (active()) {
-		capture_buffers.read_from (bufs, nframes);
+	if (!active()) {
+		_delaybuffers.flush ();
+		return;
+	}
+	for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+		for (uint32_t b = 0; b < bufs.count().get (*t); ++b) {
+			_delaybuffers.delay (*t, b, capture_buffers.get (*t, b), bufs.get (*t, b), nframes, 0, 0);
+		}
 	}
 }
 
@@ -57,6 +64,7 @@ bool
 CapturingProcessor::configure_io (ChanCount in, ChanCount out)
 {
 	Processor::configure_io (in, out);
+	_delaybuffers.set (out, _latency);
 	realloc_buffers();
 	return true;
 }
@@ -72,14 +80,15 @@ void
 CapturingProcessor::realloc_buffers()
 {
 	capture_buffers.ensure_buffers (_configured_input, block_size);
+	_delaybuffers.flush ();
 }
 
 XMLNode &
-CapturingProcessor::state (bool full)
+CapturingProcessor::state ()
 {
-	XMLNode& node = Processor::state (full);
+	XMLNode& node = Processor::state ();
 
-	node.add_property (X_("type"), X_("capture"));
+	node.set_property (X_("type"), X_("capture"));
 	return node;
 }