Accommodate newly introduced source(s) in our MSVC project (libpbd)

[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 f78ba260904a350313b383e31acf970b5316e3f4..89bc41e185af44e755ee20bc5815619d0ba6396f 100644 (file)
--- a/libs/pbd/pbd/abstract_ui.h
+++ b/libs/pbd/pbd/abstract_ui.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1998-2009 Paul Davis 
+    Copyright (C) 1998-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
@@ -34,7 +34,7 @@
 
 /* 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 
+ * 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.
@@ -46,43 +46,55 @@
 #define ABSTRACT_UI_API LIBPBD_DLL_EXPORT
 #else
 #define ABSTRACT_UI_API LIBPBD_DLL_IMPORT
-#endif 
+#endif
 
 
 class Touchable;
 
 template<typename RequestObject>
-class ABSTRACT_UI_API AbstractUI : public BaseUI /* see notes in visibility.h about why this is not LIBPBD_API */
+class ABSTRACT_UI_API AbstractUI : public BaseUI
 {
-  public:
+public:
        AbstractUI (const std::string& name);
-       virtual ~AbstractUI() {}
+       virtual ~AbstractUI();
 
-       void register_thread (std::string, pthread_t, std::string, uint32_t num_requests);
+       void register_thread (pthread_t, std::string, uint32_t num_requests);
        void call_slot (EventLoop::InvalidationRecord*, const boost::function<void()>&);
-        Glib::Threads::Mutex& slot_invalidation_mutex() { return request_buffer_map_lock; }
+       Glib::Threads::Mutex& slot_invalidation_mutex() { return request_buffer_map_lock; }
 
        Glib::Threads::Mutex request_buffer_map_lock;
 
-  protected:
+       static void* request_buffer_factory (uint32_t num_requests);
+
+protected:
        struct RequestBuffer : public PBD::RingBufferNPT<RequestObject> {
-                bool dead;
-                AbstractUI<RequestObject>& ui;
-                RequestBuffer (uint32_t size, AbstractUI<RequestObject>& uir) 
-                        : PBD::RingBufferNPT<RequestObject> (size)
-                        , dead (false) 
-                        , ui (uir) {}
-        };
+               bool dead;
+               RequestBuffer (uint32_t size)
+                       : PBD::RingBufferNPT<RequestObject> (size)
+                       , dead (false) {}
+       };
        typedef typename RequestBuffer::rw_vector RequestBufferVector;
+
+#if defined(COMPILER_MINGW) && defined(PTW32_VERSION)
+       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::Threads::Private<RequestBuffer> per_thread_request_buffer;
-       
-       Glib::Threads::Mutex               request_list_lock;
+       static Glib::Threads::Private<RequestBuffer> per_thread_request_buffer;
+
        std::list<RequestObject*> request_list;
-       
+
        RequestObject* get_request (RequestType);
        void handle_ui_requests ();
        void send_request (RequestObject *);
@@ -92,5 +104,3 @@ class ABSTRACT_UI_API AbstractUI : public BaseUI /* see notes in visibility.h ab
 };
 
 #endif /* __pbd_abstract_ui_h__ */
-
-