Merge branch 'master' into cairocanvas

[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..dc5620b2ef76354358862d03e8a1fcd594fb1c42 100644 (file)
--- a/libs/pbd/pbd/abstract_ui.h
+++ b/libs/pbd/pbd/abstract_ui.h
@@ -24,17 +24,35 @@
 #include <string>
 #include <pthread.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
+#include "pbd/libpbd_visibility.h"
 #include "pbd/receiver.h"
 #include "pbd/ringbufferNPT.h"
 #include "pbd/signals.h"
 #include "pbd/base_ui.h"
 
+/* We have a special case in libpbd of a template class that gets instantiated
+ * as the base class of several classes in other libraries. It is not possible
+ * to use LIBFOO_API to mark this visible, because the FOO in each case is 
+ * different. So we define this generic visible/export/hidden/import pair
+ * of macros to try to deal with this special case. These should NEVER be
+ * used anywhere except AbstractUI<T> (or similar cases if they arise.
+ *
+ * Note the assumption here that other libs are being built as DLLs if this one is.
+ */
+
+#ifdef ABSTRACT_UI_EXPORTS
+#define ABSTRACT_UI_API LIBPBD_DLL_EXPORT
+#else
+#define ABSTRACT_UI_API LIBPBD_DLL_IMPORT
+#endif 
+
+
 class Touchable;
 
 template<typename RequestObject>
-class AbstractUI : public BaseUI
+class ABSTRACT_UI_API AbstractUI : public BaseUI
 {
   public:
        AbstractUI (const std::string& name);
@@ -42,9 +60,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 +74,27 @@ class AbstractUI : public BaseUI
                         , ui (uir) {}
         };
        typedef typename RequestBuffer::rw_vector RequestBufferVector;
+
+#if defined(__MINGW32__) && !defined (__MINGW64__)
+
+       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);