Support thread-safe LV2 state restoration

[ardour.git] / libs / ardour / ardour / buffer_manager.h

diff --git a/libs/ardour/ardour/buffer_manager.h b/libs/ardour/ardour/buffer_manager.h
index e3ac981e63b6cce4ff2683c542355b79e2f57f11..1614854a8978876f4e5e103e1158fe77ca964146 100644 (file)
--- a/libs/ardour/ardour/buffer_manager.h
+++ b/libs/ardour/ardour/buffer_manager.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __libardour_buffer_manager__
 #define __libardour_buffer_manager__
 
@@ -7,13 +26,13 @@
 
 #include "ardour/chan_count.h"
 #include <list>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 namespace ARDOUR {
 
 class ThreadBuffers;
 
-class BufferManager
+class LIBARDOUR_API BufferManager
 {
 public:
        static void init (uint32_t);
@@ -21,10 +40,10 @@ public:
        static ThreadBuffers* get_thread_buffers ();
        static void           put_thread_buffers (ThreadBuffers*);
 
-       static void ensure_buffers (ChanCount howmany = ChanCount::ZERO);
+       static void ensure_buffers (ChanCount howmany = ChanCount::ZERO, size_t custom = 0);
 
 private:
-       static Glib::StaticMutex rb_mutex;
+        static Glib::Threads::Mutex rb_mutex;
 
        typedef PBD::RingBufferNPT<ThreadBuffers*> ThreadBufferFIFO;
        typedef std::list<ThreadBuffers*> ThreadBufferList;