summaryrefslogtreecommitdiff
path: root/libs/panners/1in2out
diff options
context:
space:
mode:
authorJohn Emmas <johne53@tiscali.co.uk>2013-09-02 16:54:17 +0100
committerJohn Emmas <johne53@tiscali.co.uk>2013-09-02 16:54:17 +0100
commitc8de67d7a59d088548af55eccac77215e7f42097 (patch)
treeebec07aa5d297f2d5d9c4fc4c2d87e31c1573863 /libs/panners/1in2out
parenta6c85286fef1df3f8f025ee6012796898fc5d77f (diff)
'libs/panners' - Streamline my previous API changes and include Tim's additions to support the GCC compiler
Diffstat (limited to 'libs/panners/1in2out')
-rw-r--r--libs/panners/1in2out/panner_1in2out.cc6
-rw-r--r--libs/panners/1in2out/panner_1in2out.h4
2 files changed, 5 insertions, 5 deletions
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;