From 15b5fce90480490455237da917167b0bcb5ce946 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 27 Jan 2011 01:31:03 +0000 Subject: merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally). git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/thread_buffers.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libs/ardour/thread_buffers.cc') diff --git a/libs/ardour/thread_buffers.cc b/libs/ardour/thread_buffers.cc index 2436b6d365..f30edee572 100644 --- a/libs/ardour/thread_buffers.cc +++ b/libs/ardour/thread_buffers.cc @@ -18,6 +18,7 @@ */ #include +#include #include "ardour/audioengine.h" #include "ardour/buffer_set.h" @@ -68,6 +69,10 @@ ThreadBuffers::ensure_buffers (ChanCount howmany) void ThreadBuffers::allocate_pan_automation_buffers (framecnt_t nframes, uint32_t howmany, bool force) { + /* we always need at least 2 pan buffers */ + + howmany = max (2U, howmany); + if (!force && howmany <= npan_buffers) { return; } -- cgit v1.2.3