X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fthread_buffers.cc;h=5aa90a0598cedecd3f53c6ee97fd6c6a2abb0bcb;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=94490ca912487420c4fdf956ee60b555fb93e7cc;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git

diff --git a/libs/ardour/thread_buffers.cc b/libs/ardour/thread_buffers.cc
index 94490ca912..5aa90a0598 100644
--- a/libs/ardour/thread_buffers.cc
+++ b/libs/ardour/thread_buffers.cc
@@ -30,17 +30,20 @@ using namespace std;
 ThreadBuffers::ThreadBuffers ()
 	: silent_buffers (new BufferSet)
 	, scratch_buffers (new BufferSet)
+	, noinplace_buffers (new BufferSet)
 	, route_buffers (new BufferSet)
 	, mix_buffers (new BufferSet)
 	, gain_automation_buffer (0)
+	, trim_automation_buffer (0)
 	, send_gain_automation_buffer (0)
+	, scratch_automation_buffer (0)
 	, pan_automation_buffer (0)
 	, npan_buffers (0)
 {
 }
 
 void
-ThreadBuffers::ensure_buffers (ChanCount howmany)
+ThreadBuffers::ensure_buffers (ChanCount howmany, size_t custom)
 {
 	// std::cerr << "ThreadBuffers " << this << " resize buffers with count = " << howmany << std::endl;
 
@@ -60,28 +63,38 @@ ThreadBuffers::ensure_buffers (ChanCount howmany)
 
 	for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
 		size_t count = std::max (scratch_buffers->available().get(*t), howmany.get(*t));
-		size_t size = (*t == DataType::MIDI)
-			? _engine->raw_buffer_size (*t)
-			: _engine->raw_buffer_size (*t) / sizeof (Sample);
+		size_t size;
+		if (custom > 0) {
+			size = custom;
+		} else {
+			size = (*t == DataType::MIDI)
+				? _engine->raw_buffer_size (*t)
+				: _engine->raw_buffer_size (*t) / sizeof (Sample);
+		}
 
 		scratch_buffers->ensure_buffers (*t, count, size);
+		noinplace_buffers->ensure_buffers (*t, count, size);
 		mix_buffers->ensure_buffers (*t, count, size);
 		silent_buffers->ensure_buffers (*t, count, size);
 		route_buffers->ensure_buffers (*t, count, size);
 	}
 
-	size_t audio_buffer_size = _engine->raw_buffer_size (DataType::AUDIO) / sizeof (Sample);
+	size_t audio_buffer_size = custom > 0 ? custom : _engine->raw_buffer_size (DataType::AUDIO) / sizeof (Sample);
 
 	delete [] gain_automation_buffer;
 	gain_automation_buffer = new gain_t[audio_buffer_size];
+	delete [] trim_automation_buffer;
+	trim_automation_buffer = new gain_t[audio_buffer_size];
 	delete [] send_gain_automation_buffer;
 	send_gain_automation_buffer = new gain_t[audio_buffer_size];
+	delete [] scratch_automation_buffer;
+	scratch_automation_buffer = new gain_t[audio_buffer_size];
 
 	allocate_pan_automation_buffers (audio_buffer_size, howmany.n_audio(), false);
 }
 
 void
-ThreadBuffers::allocate_pan_automation_buffers (framecnt_t nframes, uint32_t howmany, bool force)
+ThreadBuffers::allocate_pan_automation_buffers (samplecnt_t nframes, uint32_t howmany, bool force)
 {
 	/* we always need at least 2 pan buffers */