[xine-cvs] HG: xine-lib: Don't use deprecated JACK API

[Matěj L. <ma...@la...>]

# HG changeset patch
# User Matěj Laitl <ma...@la...>
# Date 1255173128 -3600
# Node ID 01ca6bc817db00c198b27b84d194ea29433145f8
# Parent  cae1f560a3715c5266f3a4ccbd0c0c4411d9c191
Don't use deprecated JACK API

xine-lib jack audio output plugin still uses deprecated jack_client_new()
function. This function has been superseded by jack_client_open(). New API
has an advantage that jackd is allowed to alter name of the client in case
of ambiguity.

diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c
--- a/src/audio_out/audio_jack_out.c
+++ b/src/audio_out/audio_jack_out.c
@@ -308,19 +308,11 @@
 	     num_channels);
     goto err_out;
   }
-  /* Try to create a client called "xine" */
-  if ((client = jack_client_new ("xine")) == 0) {
-    /* If that doesn't work it could be because running two copies of xine - try using a unique name */
-    char client_name[20];
-    sprintf (client_name, "xine (%d)", (int) getpid ());
-
-    if ((client = jack_client_new (client_name)) == 0) {
-      xprintf (this->xine, XINE_VERBOSITY_LOG,
-	       "\njack_open_device: Error: Failed to connect to JACK server\n");
-      xprintf (this->xine, XINE_VERBOSITY_LOG,
-	       "jack_open_device: (did you start 'jackd' server?)\n");
-      goto err_out;
-    }
+  /* Try to create a client called "xine[-NN]" */
+  if ((client = jack_client_open ("xine", JackNullOption, NULL)) == 0) {
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "\njack_open_device: Error: Failed to connect to JACK server\n");
+    goto err_out;
   }
 
   /* Save the new client */
@@ -718,19 +710,11 @@
 #define A52_PASSTHRU	12
   int speakers;
 
-  /* Try to create a client called "xine" */
-  if ((client = jack_client_new ("xine")) == 0) {
-    /* If that doesn't work it could be because running two copies of xine - try using a unique name */
-    char name[20];
-    sprintf (name, "xine (%d)", (int) getpid ());
-
-    if ((client = jack_client_new (name)) == 0) {
-      xprintf (class->xine, XINE_VERBOSITY_LOG,
-	       "\nopen_jack_plugin: Error: Failed to connect to JACK server\n");
-      xprintf (class->xine, XINE_VERBOSITY_LOG,
-	       "open_jack_plugin: (did you start 'jackd' server?)\n");
-      return 0;
-    }
+  /* Try to create a client called "xine[-NN]" */
+  if ((client = jack_client_open ("xine", JackNullOption, NULL)) == 0) {
+    xprintf (class->xine, XINE_VERBOSITY_LOG,
+	     "\nopen_jack_plugin: Error: Failed to connect to JACK server\n");
+    return 0;
   }
 
   this = calloc(1, sizeof (jack_driver_t));