X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbuffer_manager.cc;h=c221837af88ddef013ca597ecf1ec8a272f348e0;hb=5b4c3aa226dc95f33dc3ffae6669a24f5e8b8fe0;hp=5ebbce26293ce618d3407508176326ade897c342;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git

diff --git a/libs/ardour/buffer_manager.cc b/libs/ardour/buffer_manager.cc
index 5ebbce2629..c221837af8 100644
--- a/libs/ardour/buffer_manager.cc
+++ b/libs/ardour/buffer_manager.cc
@@ -18,6 +18,9 @@
 */
 
 #include <iostream>
+
+#include "pbd/compose.h"
+
 #include "ardour/buffer_manager.h"
 #include "ardour/thread_buffers.h"
 
@@ -26,7 +29,10 @@ using namespace PBD;
 
 RingBufferNPT<ThreadBuffers*>* BufferManager::thread_buffers = 0;
 std::list<ThreadBuffers*>* BufferManager::thread_buffers_list = 0;
-Glib::StaticMutex BufferManager::rb_mutex = GLIBMM_STATIC_MUTEX_INIT;
+Glib::Threads::Mutex BufferManager::rb_mutex;
+
+using std::cerr;
+using std::endl;
 
 void
 BufferManager::init (uint32_t size)
@@ -42,15 +48,18 @@ BufferManager::init (uint32_t size)
                 thread_buffers->write (&ts, 1);
 		thread_buffers_list->push_back (ts);
         }
+	// cerr << "Initialized thread buffers, readable count now " << thread_buffers->read_space() << endl;
+
 }
 
 ThreadBuffers*
 BufferManager::get_thread_buffers ()
 {
-	Glib::Mutex::Lock em (rb_mutex);
+	Glib::Threads::Mutex::Lock em (rb_mutex);
         ThreadBuffers* tbp;
 
         if (thread_buffers->read (&tbp, 1) == 1) {
+		// cerr << "Got thread buffers, readable count now " << thread_buffers->read_space() << endl;
                 return tbp;
         }
 
@@ -60,16 +69,17 @@ BufferManager::get_thread_buffers ()
 void
 BufferManager::put_thread_buffers (ThreadBuffers* tbp)
 {
-	Glib::Mutex::Lock em (rb_mutex);
+	Glib::Threads::Mutex::Lock em (rb_mutex);
         thread_buffers->write (&tbp, 1);
+	// cerr << "Put back thread buffers, readable count now " << thread_buffers->read_space() << endl;
 }
 
 void
-BufferManager::ensure_buffers (ChanCount howmany)
+BufferManager::ensure_buffers (ChanCount howmany, size_t custom)
 {
         /* this is protected by the audioengine's process lock: we do not  */
 
 	for (ThreadBufferList::iterator i = thread_buffers_list->begin(); i != thread_buffers_list->end(); ++i) {
-		(*i)->ensure_buffers (howmany);
+		(*i)->ensure_buffers (howmany, custom);
 	}
 }