convert from Glib:: to Glib::Threads for all thread-related API

[ardour.git] / libs / pbd / event_loop.cc

diff --git a/libs/pbd/event_loop.cc b/libs/pbd/event_loop.cc
index 6950c045ff0fba82e6232bcaa08e73b07d25cc56..77b08b9f73a254470d8efb10f8910c3ee1f2168f 100644 (file)
--- a/libs/pbd/event_loop.cc
+++ b/libs/pbd/event_loop.cc
@@ -4,10 +4,10 @@
 using namespace PBD;
 using namespace std;
 
-Glib::StaticPrivate<EventLoop> EventLoop::thread_event_loop;
-
 static void do_not_delete_the_loop_pointer (void*) { }
 
+Glib::Threads::Private<EventLoop> EventLoop::thread_event_loop (do_not_delete_the_loop_pointer); 
+
 EventLoop* 
 EventLoop::get_event_loop_for_thread() {
        return thread_event_loop.get ();
@@ -16,7 +16,7 @@ EventLoop::get_event_loop_for_thread() {
 void 
 EventLoop::set_event_loop_for_thread (EventLoop* loop) 
 {
-       thread_event_loop.set (loop, do_not_delete_the_loop_pointer); 
+       thread_event_loop.set (loop);
 }
 
 void* 
@@ -49,7 +49,7 @@ EventLoop::invalidate_request (void* data)
         */
        
         if (ir->event_loop) {
-               Glib::Mutex::Lock lm (ir->event_loop->slot_invalidation_mutex());
+               Glib::Threads::Mutex::Lock lm (ir->event_loop->slot_invalidation_mutex());
                for (list<BaseRequestObject*>::iterator i = ir->requests.begin(); i != ir->requests.end(); ++i) {
                        (*i)->valid = false;
                        (*i)->invalidation = 0;