diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-02 16:41:56 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-02 16:41:56 -0400 |
commit | a431e73ccda3953fc290dbacecd4b2e8ef181676 (patch) | |
tree | cf08652be13247c09ba2a93d58a7ae029502b167 /libs/panners | |
parent | 2f7385572219cedd15d929799fb5f26a88f697a2 (diff) |
replace recently added attempt to use visibility macros with one based on gcc guidelines
I can see no reason to define the "C API Call Type", but perhaps it really is needed for some reason.
I have tested this on Linux only.
Diffstat (limited to 'libs/panners')
-rw-r--r-- | libs/panners/1in2out/panner_1in2out.cc | 3 | ||||
-rw-r--r-- | libs/panners/1in2out/wscript | 1 | ||||
-rw-r--r-- | libs/panners/2in2out/panner_2in2out.cc | 3 | ||||
-rw-r--r-- | libs/panners/2in2out/wscript | 1 | ||||
-rw-r--r-- | libs/panners/vbap/vbap.cc | 2 | ||||
-rw-r--r-- | libs/panners/vbap/wscript | 1 |
6 files changed, 8 insertions, 3 deletions
diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc index dbc9911a77..4a5ff51a4b 100644 --- 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) diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript index 70c34d0779..31ff7e7fd1 100644 --- a/libs/panners/1in2out/wscript +++ b/libs/panners/1in2out/wscript @@ -23,6 +23,7 @@ def build(bld): obj.source = [ 'panner_1in2out.cc' ] obj.export_includes = ['.'] obj.cxxflags = '-DPACKAGE="libardour_pan1in2out"' + obj.defines = [ 'ARDOURPANNER_DLL_EXPORTS' ] obj.includes = ['.'] obj.name = 'libardour_pan1in2out' obj.target = 'pan1in2out' diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc index a316b764c7..6740f56e65 100644 --- a/libs/panners/2in2out/panner_2in2out.cc +++ b/libs/panners/2in2out/panner_2in2out.cc @@ -49,6 +49,7 @@ #include "ardour/runtime_functions.h" #include "ardour/session.h" #include "ardour/utils.h" +#include "ardour/visibility.h" #include "ardour/mix.h" #include "panner_2in2out.h" @@ -67,7 +68,7 @@ static PanPluginDescriptor _descriptor = { Panner2in2out::factory }; -extern "C" { PanPluginDescriptor* panner_descriptor () { return &_descriptor; } } +extern "C" ARDOURPANNER_API PanPluginDescriptor* panner_descriptor () { return &_descriptor; } Panner2in2out::Panner2in2out (boost::shared_ptr<Pannable> p) : Panner (p) diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript index 8288ef28f7..2aeca322d0 100644 --- a/libs/panners/2in2out/wscript +++ b/libs/panners/2in2out/wscript @@ -23,6 +23,7 @@ def build(bld): obj.source = [ 'panner_2in2out.cc' ] obj.export_includes = ['.'] obj.cxxflags = '-DPACKAGE="libardour_pan2in2out"' + obj.defines = [ 'ARDOURPANNER_DLL_EXPORTS' ] obj.includes = ['.'] obj.name = 'libardour_pan2in2out' obj.target = 'pan2in2out' diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index 1cef98fc7d..f5cbca79e0 100644 --- a/libs/panners/vbap/vbap.cc +++ b/libs/panners/vbap/vbap.cc @@ -50,7 +50,7 @@ static PanPluginDescriptor _descriptor = { VBAPanner::factory }; -extern "C" { PanPluginDescriptor* panner_descriptor () { return &_descriptor; } } +extern "C" ARDOURPANNER_API PanPluginDescriptor* panner_descriptor () { return &_descriptor; } VBAPanner::Signal::Signal (Session&, VBAPanner&, uint32_t, uint32_t n_speakers) { diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript index c6ba94261f..9258277810 100644 --- a/libs/panners/vbap/wscript +++ b/libs/panners/vbap/wscript @@ -23,6 +23,7 @@ def build(bld): obj.source = [ 'vbap_speakers.cc', 'vbap.cc' ] obj.export_includes = ['.'] obj.cxxflags = '-DPACKAGE="libardour_panvbap"' + obj.defines = [ 'ARDOURPANNER_DLL_EXPORTS' ] obj.includes = ['.'] obj.name = 'libardour_panvbap' obj.target = 'panvbap' |