revert incorrect include path changes and removal of export macros for two libardour...

[ardour.git] / libs / backends / jack / jack_api.cc

diff --git a/libs/backends/jack/jack_api.cc b/libs/backends/jack/jack_api.cc
index e02ccde2f1a662ee96f5520746ca1a0633f4751d..c8859a1fc97a8cd0d1dd1a005ef8625dcfda49db 100644 (file)
--- a/libs/backends/jack/jack_api.cc
+++ b/libs/backends/jack/jack_api.cc
@@ -63,22 +63,16 @@ deinstantiate ()
 static bool
 already_configured ()
 {
-       return JackConnection::server_running ();
+       return !JackConnection::in_control ();
 }
 
-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; }