Merge branch 'master' into windows

[ardour.git] / libs / panners / 1in2out / panner_1in2out.cc

diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc
index 79a63a2b47da0595edbf07b2e83945146c7bd0d4..00024768e4f8a9c2d7b527f367edaa1e72aa5b18 100644 (file)
--- a/libs/panners/1in2out/panner_1in2out.cc
+++ b/libs/panners/1in2out/panner_1in2out.cc
@@ -51,6 +51,7 @@
 #include "ardour/buffer_set.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/pannable.h"
+#include "ardour/visibility.h"
 
 #include "i18n.h"
 #include "panner_1in2out.h"
@@ -67,7 +68,7 @@ static PanPluginDescriptor _descriptor = {
         Panner1in2out::factory
 };
 
-extern "C" { ARDOURPANNER_API PanPluginDescriptor* ARDOURPANNER_CAPICALLTYPE panner_descriptor () { return &_descriptor; } }
+extern "C" ARDOURPANNER_API PanPluginDescriptor*  panner_descriptor () { return &_descriptor; }
 
 Panner1in2out::Panner1in2out (boost::shared_ptr<Pannable> p)
        : Panner (p)
@@ -104,7 +105,7 @@ Panner1in2out::update ()
         desired_right = panR * (scale * panR + 1.0f - scale);
 }
 
-ARDOURPANNER_API void ARDOURPANNER_APICALLTYPE
+void
 Panner1in2out::set_position (double p)
 {
         if (clamp_position (p)) {
@@ -112,7 +113,7 @@ Panner1in2out::set_position (double p)
         }
 }
 
-ARDOURPANNER_API bool ARDOURPANNER_APICALLTYPE
+bool
 Panner1in2out::clamp_position (double& p)
 {
         /* any position between 0.0 and 1.0 is legal */