Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc

[ardour.git] / libs / ardour / ardour / panner.h

diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index e2a32e0dc492f59b6fcd39a9676d0c94915855b4..7dd9de6e0ab18e5ab4ff854b5c4834e97b745125 100644 (file)
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -30,41 +30,18 @@
 #include "pbd/signals.h"
 #include "pbd/stateful.h"
 
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/automation_control.h"
 #include "ardour/automatable.h"
+#include "ardour/visibility.h"
 
-#ifndef ARDOURPANNER_IS_IN_SHARED_LIB
-       #define ARDOURPANNER_IS_IN_SHARED_LIB 1
-#endif
-
-#if ARDOURPANNER_IS_IN_SHARED_LIB && !defined(ARDOURPANNER_API)
-       #define ARDOURPANNER_CAPICALLTYPE __cdecl
-
-       #if defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
-               #if defined(BUILDING_ARDOURPANNERS)
-                       #define ARDOURPANNER_LOCAL
-                       #define ARDOURPANNER_API   __declspec(dllexport)
-               #else
-                       #define ARDOURPANNER_LOCAL
-                       #define ARDOURPANNER_API   __declspec(dllimport)
-               #endif
-       #else
-               #if !defined(COMPILER_GCC)
-                       #warning "Attempting to export symbols with an unspecified compiler! GCC assumed!"
-               #endif
-
-               #define ARDOURPANNER_LOCAL __attribute__ ((visibility("hidden")))
-               #define ARDOURPANNER_API   __attribute__ ((visibility("default")))
-       #endif
-#elif !defined(ARDOURPANNER_API)
-       #define ARDOURPANNER_CAPICALLTYPE __cdecl
-
-       /* This library was built statically.    */
-       /* Visibility is determined by the code. */
-       #define ARDOURPANNER_API
-       #define ARDOURPANNER_LOCAL
-#endif
+#ifdef ARDOURPANNER_DLL_EXPORTS // defined if we are building the ARDOUR Panners DLLs (instead of using them)
+    #define ARDOURPANNER_API LIBARDOUR_HELPER_DLL_EXPORT
+#else
+    #define ARDOURPANNER_API LIBARDOUR_HELPER_DLL_IMPORT
+#endif 
+#define ARDOURPANNER_LOCAL LIBARDOUR_HELPER_DLL_LOCAL
 
 namespace ARDOUR {
 
@@ -74,7 +51,7 @@ class BufferSet;
 class AudioBuffer;
 class Speakers;
 
-class Panner : public PBD::Stateful, public PBD::ScopedConnectionList
+class LIBARDOUR_API Panner : public PBD::Stateful, public PBD::ScopedConnectionList
 {
 public:
        Panner (boost::shared_ptr<Pannable>);
@@ -204,7 +181,7 @@ protected:
 } // namespace
 
 extern "C" {
-struct PanPluginDescriptor {
+struct LIBARDOUR_API PanPluginDescriptor {
        std::string name;
        int32_t in;
        int32_t out;