From c8de67d7a59d088548af55eccac77215e7f42097 Mon Sep 17 00:00:00 2001
From: John Emmas <johne53@tiscali.co.uk>
Date: Mon, 2 Sep 2013 16:54:17 +0100
Subject: 'libs/panners' - Streamline my previous API changes and include Tim's
 additions to support the GCC compiler

---
 libs/panners/1in2out/panner_1in2out.cc | 6 +++---
 libs/panners/1in2out/panner_1in2out.h  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libs/panners/1in2out')

diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc
index 79a63a2b47..dbc9911a77 100644
--- a/libs/panners/1in2out/panner_1in2out.cc
+++ b/libs/panners/1in2out/panner_1in2out.cc
@@ -67,7 +67,7 @@ static PanPluginDescriptor _descriptor = {
         Panner1in2out::factory
 };
 
-extern "C" { ARDOURPANNER_API PanPluginDescriptor* ARDOURPANNER_CAPICALLTYPE panner_descriptor () { return &_descriptor; } }
+extern "C" ARDOURPANNER_API PanPluginDescriptor* ARDOURPANNER_CAPICALLTYPE panner_descriptor () { return &_descriptor; }
 
 Panner1in2out::Panner1in2out (boost::shared_ptr<Pannable> p)
 	: Panner (p)
@@ -104,7 +104,7 @@ Panner1in2out::update ()
         desired_right = panR * (scale * panR + 1.0f - scale);
 }
 
-ARDOURPANNER_API void ARDOURPANNER_APICALLTYPE
+ARDOURPANNER_API void
 Panner1in2out::set_position (double p)
 {
         if (clamp_position (p)) {
@@ -112,7 +112,7 @@ Panner1in2out::set_position (double p)
         }
 }
 
-ARDOURPANNER_API bool ARDOURPANNER_APICALLTYPE
+ARDOURPANNER_API bool
 Panner1in2out::clamp_position (double& p)
 {
         /* any position between 0.0 and 1.0 is legal */
diff --git a/libs/panners/1in2out/panner_1in2out.h b/libs/panners/1in2out/panner_1in2out.h
index aa5428a329..f035115f6a 100644
--- a/libs/panners/1in2out/panner_1in2out.h
+++ b/libs/panners/1in2out/panner_1in2out.h
@@ -42,8 +42,8 @@ class Panner1in2out : public Panner
 	Panner1in2out (boost::shared_ptr<Pannable>);
 	~Panner1in2out ();
 
-    ARDOURPANNER_API void ARDOURPANNER_APICALLTYPE set_position (double);
-    ARDOURPANNER_API bool ARDOURPANNER_APICALLTYPE clamp_position (double&);
+    ARDOURPANNER_API void set_position (double);
+    ARDOURPANNER_API bool clamp_position (double&);
 	std::pair<double, double> position_range () const;
 
         double position() const;
-- 
cgit v1.2.3