finally get to the bottom of where NO_PLUGIN_STATE needs to be in order to be useful

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

diff --git a/libs/ardour/buffer_manager.cc b/libs/ardour/buffer_manager.cc
index b30fd6ebb683634a95b564194c7e4a97ef5211a7..c8819e41cbe10e7e111a9fdfda7acd0bd814eeb6 100644 (file)
--- a/libs/ardour/buffer_manager.cc
+++ b/libs/ardour/buffer_manager.cc
@@ -29,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)
@@ -45,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;
         }
 
@@ -63,8 +69,9 @@ 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