X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fthread_buffers.cc;h=5aa90a0598cedecd3f53c6ee97fd6c6a2abb0bcb;hb=79f01bc889d6c928345214eaba9016c6396bcfca;hp=36ffbb70da5aeb267b9c8c811aded4ac5e31fd79;hpb=0954efffd3a1d642be313aed9b5b7070eb307a9c;p=ardour.git

diff --git a/libs/ardour/thread_buffers.cc b/libs/ardour/thread_buffers.cc
index 36ffbb70da..5aa90a0598 100644
--- a/libs/ardour/thread_buffers.cc
+++ b/libs/ardour/thread_buffers.cc
@@ -36,6 +36,7 @@ ThreadBuffers::ThreadBuffers ()
 	, gain_automation_buffer (0)
 	, trim_automation_buffer (0)
 	, send_gain_automation_buffer (0)
+	, scratch_automation_buffer (0)
 	, pan_automation_buffer (0)
 	, npan_buffers (0)
 {
@@ -72,7 +73,7 @@ ThreadBuffers::ensure_buffers (ChanCount howmany, size_t custom)
 		}
 
 		scratch_buffers->ensure_buffers (*t, count, size);
-		noinplace_buffers->ensure_buffers (*t, count + count, size); // in + out
+		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);
@@ -86,12 +87,14 @@ ThreadBuffers::ensure_buffers (ChanCount howmany, size_t custom)
 	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 */