mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-17 08:56:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: improve node name and description

Browse source 
Use the same values as what the pulse plugin would do
This commit is contained in:
Wim Taymans 2019-08-12 12:27:51 +02:00
parent d81bbae7ea
commit dddaaf4db4
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
alsa-plugins/pcm_pipewire.c
View file

@ -814,8 +814,8 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name,
{ {
snd_pcm_pipewire_t *pw; snd_pcm_pipewire_t *pw;
int err; int err;
static unsigned int num = 0;
const char *str; const char *str;
struct pw_properties *props;
assert(pcmp); assert(pcmp);
pw = calloc(1, sizeof(*pw)); pw = calloc(1, sizeof(*pw));
@ -831,10 +831,8 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name,
pw->flags = flags; pw->flags = flags;
if (node_name == NULL) if (node_name == NULL)
err = asprintf(&pw->node_name, err = asprintf(&pw->node_name, "ALSA %s",
"alsa-pipewire.%s%s.%d.%d", name, stream == SND_PCM_STREAM_PLAYBACK ? "Playback" : "Capture");
stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C",
getpid(), num++);
else else
pw->node_name = strdup(node_name); pw->node_name = strdup(node_name);
@ -852,7 +850,14 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name,
pw->main_loop = pw_thread_loop_new(pw->loop, "alsa-pipewire"); pw->main_loop = pw_thread_loop_new(pw->loop, "alsa-pipewire");
pw->core = pw_core_new(pw->loop, NULL, 0); pw->core = pw_core_new(pw->loop, NULL, 0);
pw->remote = pw_remote_new(pw->core, NULL, 0); props = pw_properties_new(NULL, NULL);
str = pw_get_prgname();
if (str)
pw_properties_setf(props, PW_KEY_APP_NAME, "ALSA plug-in [%s]", str);
else
pw_properties_set(props, PW_KEY_APP_NAME, "ALSA plug-in");
pw->remote = pw_remote_new(pw->core, props, 0);
pw_remote_add_listener(pw->remote, &pw->remote_listener, &remote_events, pw); pw_remote_add_listener(pw->remote, &pw->remote_listener, &remote_events, pw);
if ((err = pw_thread_loop_start(pw->main_loop)) < 0) if ((err = pw_thread_loop_start(pw->main_loop)) < 0)