Merge branch 'master' into windows

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

diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h
index 7eb23202308ad97bc8cb9d98a8d01b7c5d1d65be..905074c474bba983547f076619ff3fb5543e0efc 100644 (file)
--- a/libs/pbd/pbd/abstract_ui.h
+++ b/libs/pbd/pbd/abstract_ui.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <pthread.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/receiver.h"
 #include "pbd/ringbufferNPT.h"
@@ -42,9 +42,9 @@ class AbstractUI : public BaseUI
 
        void register_thread (std::string, pthread_t, std::string, uint32_t num_requests);
        void call_slot (EventLoop::InvalidationRecord*, const boost::function<void()>&);
-        Glib::Mutex& slot_invalidation_mutex() { return request_buffer_map_lock; }
+        Glib::Threads::Mutex& slot_invalidation_mutex() { return request_buffer_map_lock; }
 
-       Glib::Mutex request_buffer_map_lock;
+       Glib::Threads::Mutex request_buffer_map_lock;
 
   protected:
        struct RequestBuffer : public PBD::RingBufferNPT<RequestObject> {
@@ -56,13 +56,27 @@ class AbstractUI : public BaseUI
                         , ui (uir) {}
         };
        typedef typename RequestBuffer::rw_vector RequestBufferVector;
+
+#if defined(__MINGW32__)
+
+       struct pthread_cmp
+       {
+               bool operator() (const ptw32_handle_t& thread1, const ptw32_handle_t& thread2)
+               {
+                       return thread1.p < thread2.p;
+               }
+       };
+       typedef typename std::map<pthread_t,RequestBuffer*, pthread_cmp>::iterator RequestBufferMapIterator;
+       typedef std::map<pthread_t,RequestBuffer*, pthread_cmp> RequestBufferMap;
+#else
        typedef typename std::map<pthread_t,RequestBuffer*>::iterator RequestBufferMapIterator;
        typedef std::map<pthread_t,RequestBuffer*> RequestBufferMap;
+#endif
 
        RequestBufferMap request_buffers;
-       static Glib::StaticPrivate<RequestBuffer> per_thread_request_buffer;
+        static Glib::Threads::Private<RequestBuffer> per_thread_request_buffer;
        
-       Glib::Mutex               request_list_lock;
+       Glib::Threads::Mutex               request_list_lock;
        std::list<RequestObject*> request_list;
        
        RequestObject* get_request (RequestType);