comparison audioio/AudioJACKTarget.cpp @ 56:75ad3f8f65aa

* use jack_client_open

     }
     symbols[name] = symbol;
     return symbol;
 }
 
+static jack_client_t *dynamic_jack_client_open(const char *client_name,
+                                               jack_options_t options,
+                                               jack_status_t *status, ...)
+{
+    typedef jack_client_t (*func)(const char *client_name,
+                                  jack_options_t options,
+                                  jack_status_t *status, ...);
+    void *s = symbol("jack_client_open");
+    if (!s) return 0;
+    func f = (func)s;
+    return f(client_name, options, status); // varargs not supported here
+}
+
 static int dynamic_jack_set_process_callback(jack_client_t *client,
                                              JackProcessCallback process_callback,
                                              void *arg)
 {
     typedef int (*func)(jack_client_t *client,

 dynamic1(int, jack_client_close, jack_client_t *, 1);
 dynamic1(jack_nframes_t, jack_port_get_latency, jack_port_t *, 0);
 dynamic1(const char *, jack_port_name, const jack_port_t *, 0);
 
 #define jack_client_new dynamic_jack_client_new
+#define jack_client_open dynamic_jack_client_open
 #define jack_get_buffer_size dynamic_jack_get_buffer_size
 #define jack_get_sample_rate dynamic_jack_get_sample_rate
 #define jack_set_process_callback dynamic_jack_set_process_callback
 #define jack_set_xrun_callback dynamic_jack_set_xrun_callback
 #define jack_activate dynamic_jack_activate

     AudioCallbackPlayTarget(source),
     m_client(0),
     m_bufferSize(0),
     m_sampleRate(0)
 {
-    char name[100];
-    strcpy(name, "Sonic Visualiser");
-    m_client = jack_client_new(name);
+    JackOptions options = JackNullOption;
+#ifdef HAVE_PORTAUDIO
+    options = JackNoStartServer;
+#endif
+
+    JackStatus status = JackStatus(0);
+    m_client = jack_client_open("Sonic Visualiser", options, &status);
 
     if (!m_client) {
-	sprintf(name, "Sonic Visualiser (%d)", (int)getpid());
-	m_client = jack_client_new(name);
-	if (!m_client) {
-	    std::cerr
-		<< "ERROR: AudioJACKTarget: Failed to connect to JACK server"
-		<< std::endl;
-	}
-    }
-
-    if (!m_client) return;
+        std::cerr << "AudioJACKTarget: Failed to connect to JACK server: status code "
+                  << status << std::endl;
+        return;
+    }
 
     m_bufferSize = jack_get_buffer_size(m_client);
     m_sampleRate = jack_get_sample_rate(m_client);
 
     jack_set_xrun_callback(m_client, xrunStatic, this);