tentative redesign of MIDI looping, will probably fix #5050 but needs more extensive...

[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 4da8d0637fe247b9398946fe7404ad5ee33c8a5d..2a8e7be6da95d7f01d85655b382f683b861dd44b 100644 (file)
--- a/libs/ardour/ardour/buffer_manager.h
+++ b/libs/ardour/ardour/buffer_manager.h
@@ -1,4 +1,4 @@
-#ifndef __libardour_buffer_manager__ 
+#ifndef __libardour_buffer_manager__
 #define __libardour_buffer_manager__
 
 #include <stdint.h>
@@ -6,6 +6,8 @@
 #include "pbd/ringbufferNPT.h"
 
 #include "ardour/chan_count.h"
+#include <list>
+#include <glibmm/threads.h>
 
 namespace ARDOUR {
 
@@ -13,17 +15,22 @@ class ThreadBuffers;
 
 class BufferManager
 {
-  public:
-        static void init (uint32_t);
-        
-        static ThreadBuffers* get_thread_buffers ();
-        static void           put_thread_buffers (ThreadBuffers*);
+public:
+       static void init (uint32_t);
 
-        static void ensure_buffers (ChanCount howmany = ChanCount::ZERO);
+       static ThreadBuffers* get_thread_buffers ();
+       static void           put_thread_buffers (ThreadBuffers*);
 
-  private:
-        typedef RingBufferNPT<ThreadBuffers*> ThreadBufferFIFO;
-        static ThreadBufferFIFO* thread_buffers;
+       static void ensure_buffers (ChanCount howmany = ChanCount::ZERO);
+
+private:
+        static Glib::Threads::Mutex rb_mutex;
+
+       typedef PBD::RingBufferNPT<ThreadBuffers*> ThreadBufferFIFO;
+       typedef std::list<ThreadBuffers*> ThreadBufferList;
+
+       static ThreadBufferFIFO* thread_buffers;
+       static ThreadBufferList* thread_buffers_list;
 };
 
 }