X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fbackends%2Fjack%2Fjack_api.cc;h=c8859a1fc97a8cd0d1dd1a005ef8625dcfda49db;hb=e3329000557015ce54691235769db8821e75666b;hp=0136161181e0068ef5dbc79bad4f539ab531277f;hpb=f4cf283f2683f7883f799a8ef6cd58084e610bb7;p=ardour.git

diff --git a/libs/backends/jack/jack_api.cc b/libs/backends/jack/jack_api.cc
index 0136161181..c8859a1fc9 100644
--- a/libs/backends/jack/jack_api.cc
+++ b/libs/backends/jack/jack_api.cc
@@ -19,12 +19,10 @@
 
 #include "jack_connection.h"
 #include "jack_audiobackend.h"
-#include "jack_portengine.h"
 
 using namespace ARDOUR;
 
 static boost::shared_ptr<JACKAudioBackend> backend;
-static boost::shared_ptr<JACKPortEngine> port_engine;
 static boost::shared_ptr<JackConnection> jack_connection;
 
 static boost::shared_ptr<AudioBackend>
@@ -41,20 +39,6 @@ backend_factory (AudioEngine& ae)
 	return backend;
 }
 
-static boost::shared_ptr<PortEngine>
-portengine_factory (PortManager& pm)
-{
-	if (!jack_connection) {
-		return boost::shared_ptr<PortEngine>();
-	}
-
-	if (!port_engine) {
-		port_engine.reset (new JACKPortEngine (pm, jack_connection));
-	}
-
-	return port_engine;
-}
-
 static int
 instantiate (const std::string& arg1, const std::string& arg2)
 {
@@ -70,7 +54,6 @@ instantiate (const std::string& arg1, const std::string& arg2)
 static int 
 deinstantiate ()
 {
-	port_engine.reset ();
 	backend.reset ();
 	jack_connection.reset ();
 
@@ -80,23 +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,
-		portengine_factory,
-		already_configured,
-	};
-}
+static ARDOUR::AudioBackendInfo _descriptor = {
+	"JACK",
+	instantiate,
+	deinstantiate,
+	backend_factory,
+	already_configured,
+};
+
+extern "C" ARDOURBACKEND_API ARDOUR::AudioBackendInfo* descriptor() { return &_descriptor; }