NOOP, remove trailing tabs/whitespace.

[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 905074c474bba983547f076619ff3fb5543e0efc..5491210db7e951401cf69c43a79b21e95c9adb29 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
@@ -26,15 +26,33 @@
 
 #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);
@@ -50,15 +68,14 @@ class AbstractUI : public BaseUI
        struct RequestBuffer : public PBD::RingBufferNPT<RequestObject> {
                 bool dead;
                 AbstractUI<RequestObject>& ui;
-                RequestBuffer (uint32_t size, AbstractUI<RequestObject>& uir) 
+                RequestBuffer (uint32_t size, AbstractUI<RequestObject>& uir)
                         : PBD::RingBufferNPT<RequestObject> (size)
-                        , dead (false) 
+                        , dead (false)
                         , ui (uir) {}
         };
        typedef typename RequestBuffer::rw_vector RequestBufferVector;
 
-#if defined(__MINGW32__)
-
+#if defined(COMPILER_MINGW) && defined(PTW32_VERSION)
        struct pthread_cmp
        {
                bool operator() (const ptw32_handle_t& thread1, const ptw32_handle_t& thread2)
@@ -75,10 +92,10 @@ class AbstractUI : public BaseUI
 
        RequestBufferMap request_buffers;
         static Glib::Threads::Private<RequestBuffer> per_thread_request_buffer;
-       
+
        Glib::Threads::Mutex               request_list_lock;
        std::list<RequestObject*> request_list;
-       
+
        RequestObject* get_request (RequestType);
        void handle_ui_requests ();
        void send_request (RequestObject *);