try just removing all PLATFORM_WINDOWS conditionals in ipmidi code to see if it will...

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

diff --git a/libs/pbd/pbd/event_loop.h b/libs/pbd/pbd/event_loop.h
index 450bf5752fcbc04cc0983baa6162d9a73abd17bd..a10036549796ffb7567e1538213d6a636e662534 100644 (file)
--- a/libs/pbd/pbd/event_loop.h
+++ b/libs/pbd/pbd/event_loop.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,7 +22,9 @@
 
 #include <boost/function.hpp>
 #include <boost/bind.hpp> /* we don't need this here, but anything calling call_slot() probably will, so this is convenient */
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
+
+#include "pbd/libpbd_visibility.h"
 
 namespace PBD
 {
@@ -36,7 +38,7 @@ namespace PBD
  * when something like this is needed (it inherits from EventLoop).
  */
 
-class EventLoop 
+class LIBPBD_API EventLoop
 {
   public:
        EventLoop() {}
@@ -47,7 +49,7 @@ class EventLoop
        };
 
         struct BaseRequestObject;
-    
+
         struct InvalidationRecord {
            std::list<BaseRequestObject*> requests;
            PBD::EventLoop* event_loop;
@@ -64,18 +66,18 @@ class EventLoop
             bool                    valid;
             InvalidationRecord*     invalidation;
            boost::function<void()> the_slot;
-            
+
             BaseRequestObject() : valid (true), invalidation (0) {}
        };
 
        virtual void call_slot (InvalidationRecord*, const boost::function<void()>&) = 0;
-        virtual Glib::Mutex& slot_invalidation_mutex() = 0;
+        virtual Glib::Threads::Mutex& slot_invalidation_mutex() = 0;
 
        static EventLoop* get_event_loop_for_thread();
        static void set_event_loop_for_thread (EventLoop* ui);
 
   private:
-       static Glib::StaticPrivate<EventLoop> thread_event_loop;
+        static Glib::Threads::Private<EventLoop> thread_event_loop;
 
 };