summaryrefslogtreecommitdiff
path: root/libs/backends
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-09-13 12:32:50 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-09-13 12:32:50 -0400
commitdce6b71e825397ff086562b6177453369e48cec9 (patch)
tree6468852a855de238655b80f289115842a6a545fc /libs/backends
parent83a826095deaddb90b8236a757c384aa6f120e71 (diff)
use visibility control on JACK audio backend, so that we can import this change into windows branch
Diffstat (limited to 'libs/backends')
-rw-r--r--libs/backends/jack/jack_api.cc24
-rw-r--r--libs/backends/jack/wscript5
2 files changed, 12 insertions, 17 deletions
diff --git a/libs/backends/jack/jack_api.cc b/libs/backends/jack/jack_api.cc
index e02ccde2f1..836acfda11 100644
--- a/libs/backends/jack/jack_api.cc
+++ b/libs/backends/jack/jack_api.cc
@@ -66,19 +66,13 @@ already_configured ()
return JackConnection::server_running ();
}
-extern "C" {
-
-
- /* functions looked up using dlopen-and-cousins, and so naming scope
- * must be non-mangled.
- */
-
- ARDOUR::AudioBackendInfo descriptor = {
- "JACK",
- instantiate,
- deinstantiate,
- backend_factory,
- already_configured,
- };
-}
+static ARDOUR::AudioBackendInfo _descriptor = {
+ "JACK",
+ instantiate,
+ deinstantiate,
+ backend_factory,
+ already_configured,
+};
+
+extern "C" ARDOURBACKEND_API ARDOUR::AudioBackendInfo* descriptor() { return &_descriptor; }
diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index 3c47f3a652..98c39c7b16 100644
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -38,8 +38,9 @@ def build(bld):
obj.use = 'ardour libpbd'
obj.vnum = JACKBACKEND_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
- obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"']
-
+ obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
+ 'ARDOURBACKEND_DLL_EXPORTS'
+ ]
#
# device discovery code in the jack backend needs ALSA