From 3cd8138a419cb165f56070ace0b21a1e63ec5a43 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 25 Jul 2012 17:48:55 +0000
Subject: convert from Glib:: to Glib::Threads for all thread-related API

git-svn-id: svn://localhost/ardour2/branches/3.0@13084 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/process_thread.cc | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'libs/ardour/process_thread.cc')

diff --git a/libs/ardour/process_thread.cc b/libs/ardour/process_thread.cc
index 5d3b54cb13..e10ccf160c 100644
--- a/libs/ardour/process_thread.cc
+++ b/libs/ardour/process_thread.cc
@@ -29,20 +29,17 @@ using namespace ARDOUR;
 using namespace Glib;
 using namespace std;
 
-Private<ThreadBuffers>* ProcessThread::_private_thread_buffers = 0;
-
 static void
 release_thread_buffer (void* arg)
 {
         BufferManager::put_thread_buffers ((ThreadBuffers*) arg);
 }
 
+Glib::Threads::Private<ThreadBuffers> ProcessThread::_private_thread_buffers (release_thread_buffer);
+
 void
 ProcessThread::init ()
 {
-	if (_private_thread_buffers == 0) {
-		_private_thread_buffers = new Private<ThreadBuffers> (release_thread_buffer);
-	}
 }
 
 ProcessThread::ProcessThread ()
@@ -59,22 +56,22 @@ ProcessThread::get_buffers ()
         ThreadBuffers* tb = BufferManager::get_thread_buffers ();
 
         assert (tb);
-        _private_thread_buffers->set (tb);
+        _private_thread_buffers.set (tb);
 }
 
 void
 ProcessThread::drop_buffers ()
 {
-        ThreadBuffers* tb = _private_thread_buffers->get();
+        ThreadBuffers* tb = _private_thread_buffers.get();
         assert (tb);
         BufferManager::put_thread_buffers (tb);
-        _private_thread_buffers->set (0);
+        _private_thread_buffers.set (0);
 }
 
 BufferSet&
 ProcessThread::get_silent_buffers (ChanCount count)
 {
-        ThreadBuffers* tb = _private_thread_buffers->get();
+        ThreadBuffers* tb = _private_thread_buffers.get();
         assert (tb);
 
         BufferSet* sb = tb->silent_buffers;
@@ -95,7 +92,7 @@ ProcessThread::get_silent_buffers (ChanCount count)
 BufferSet&
 ProcessThread::get_scratch_buffers (ChanCount count)
 {
-        ThreadBuffers* tb = _private_thread_buffers->get();
+        ThreadBuffers* tb = _private_thread_buffers.get();
         assert (tb);
 
         BufferSet* sb = tb->scratch_buffers;
@@ -114,7 +111,7 @@ ProcessThread::get_scratch_buffers (ChanCount count)
 BufferSet&
 ProcessThread::get_mix_buffers (ChanCount count)
 {
-        ThreadBuffers* tb = _private_thread_buffers->get();
+        ThreadBuffers* tb = _private_thread_buffers.get();
         assert (tb);
 
         BufferSet* mb = tb->mix_buffers;
@@ -128,7 +125,7 @@ ProcessThread::get_mix_buffers (ChanCount count)
 gain_t*
 ProcessThread::gain_automation_buffer()
 {
-        ThreadBuffers* tb = _private_thread_buffers->get();
+        ThreadBuffers* tb = _private_thread_buffers.get();
         assert (tb);
 
         gain_t *g =  tb->gain_automation_buffer;
@@ -139,7 +136,7 @@ ProcessThread::gain_automation_buffer()
 gain_t*
 ProcessThread::send_gain_automation_buffer()
 {
-        ThreadBuffers* tb = _private_thread_buffers->get();
+        ThreadBuffers* tb = _private_thread_buffers.get();
         assert (tb);
 
         gain_t* g = tb->send_gain_automation_buffer;
@@ -150,7 +147,7 @@ ProcessThread::send_gain_automation_buffer()
 pan_t**
 ProcessThread::pan_automation_buffer()
 {
-        ThreadBuffers* tb = _private_thread_buffers->get();
+        ThreadBuffers* tb = _private_thread_buffers.get();
         assert (tb);
 
         pan_t** p = tb->pan_automation_buffer;
-- 
cgit v1.2.3