]> git.alsa-project.org Git - alsa-plugins.git/commitdiff
jack: use program_invocation_short_name
authorArsen Arsenović <arsen@aarsen.me>
Sun, 24 Jan 2021 15:44:13 +0000 (16:44 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 17 Jun 2022 08:21:44 +0000 (10:21 +0200)
Fixes: https://github.com/alsa-project/alsa-plugins/pull/18
Signed-off-by: Arsen Arsenović <arsen@aarsen.me>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
jack/pcm_jack.c

index 9aa051ac419bedda93f318ef31dcd8d837687cfa..f266a35180e30c3fc4567dbbc953d895991e4706 100644 (file)
@@ -20,7 +20,9 @@
  *
  */
 
+#define _GNU_SOURCE
 #include <stdbool.h>
+#include <errno.h>
 #include <byteswap.h>
 #include <sys/shm.h>
 #include <sys/types.h>
@@ -600,12 +602,16 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
                return -EINVAL;
        }
 
-       if (client_name == NULL)
+       if (client_name == NULL) {
+               const char *pname = program_invocation_short_name;
+               if (!pname[0]) {
+                       pname = "alsa-jack";
+               }
                err = snprintf(jack_client_name, sizeof(jack_client_name),
-                              "alsa-jack.%s%s.%d.%d", name,
+                              "%s.%s.%d.%d", pname,
                               stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C",
                               getpid(), num++);
-       else
+       else
                err = snprintf(jack_client_name, sizeof(jack_client_name),
                               "%s", client_name);