fixes/updates for move to ::open()

[ardour.git] / libs / ardour / thread_buffers.cc

diff --git a/libs/ardour/thread_buffers.cc b/libs/ardour/thread_buffers.cc
index e469187ce9497709d8a54240a05aef9a3ed8757e..2336ee50bc866327ce802a8323788e59d2a0092d 100644 (file)
--- a/libs/ardour/thread_buffers.cc
+++ b/libs/ardour/thread_buffers.cc
@@ -33,6 +33,7 @@ ThreadBuffers::ThreadBuffers ()
        , route_buffers (new BufferSet)
        , mix_buffers (new BufferSet)
        , gain_automation_buffer (0)
+       , trim_automation_buffer (0)
        , send_gain_automation_buffer (0)
        , pan_automation_buffer (0)
        , npan_buffers (0)
@@ -40,7 +41,7 @@ ThreadBuffers::ThreadBuffers ()
 }
 
 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,7 +61,14 @@ 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 = _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);
                mix_buffers->ensure_buffers (*t, count, size);
@@ -68,10 +76,12 @@ ThreadBuffers::ensure_buffers (ChanCount howmany)
                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];