mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: allow setting playback/capture_node as node name

Browse source 
See !314
This commit is contained in:
Wim Taymans 2020-10-24 15:53:12 +02:00
parent 952326323e
commit 3567efb7f8
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pipewire-alsa/alsa-plugins/pcm_pipewire.c
View file

@ -58,7 +58,7 @@ typedef struct {
snd_pcm_ioplug_t io; snd_pcm_ioplug_t io;
char *node_name; char *node_name;
uint32_t target; char *target;
int fd; int fd;
int error; int error;
@ -132,6 +132,7 @@ static void snd_pcm_pipewire_free(snd_pcm_pipewire_t *pw)
spa_system_close(pw->system, pw->fd); spa_system_close(pw->system, pw->fd);
if (pw->main_loop) if (pw->main_loop)
pw_thread_loop_destroy(pw->main_loop); pw_thread_loop_destroy(pw->main_loop);
free(pw->target);
free(pw); free(pw);
} }
@ -412,6 +413,9 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io)
if (pw_properties_get(props, PW_KEY_NODE_LATENCY) == NULL) if (pw_properties_get(props, PW_KEY_NODE_LATENCY) == NULL)
pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%lu/%u", pw->min_avail, io->rate); pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%lu/%u", pw->min_avail, io->rate);
if (pw->target != NULL &&
pw_properties_get(props, PW_KEY_NODE_TARGET) == NULL)
pw_properties_setf(props, PW_KEY_NODE_TARGET, "%s", pw->target);
if (pw_properties_get(props, PW_KEY_MEDIA_TYPE) == NULL) if (pw_properties_get(props, PW_KEY_MEDIA_TYPE) == NULL)
pw_properties_set(props, PW_KEY_MEDIA_TYPE, "Audio"); pw_properties_set(props, PW_KEY_MEDIA_TYPE, "Audio");
@ -433,7 +437,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io)
io->stream == SND_PCM_STREAM_PLAYBACK ? io->stream == SND_PCM_STREAM_PLAYBACK ?
PW_DIRECTION_OUTPUT : PW_DIRECTION_OUTPUT :
PW_DIRECTION_INPUT, PW_DIRECTION_INPUT,
pw->target, PW_ID_ANY,
pw->flags | pw->flags |
PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_AUTOCONNECT |
PW_STREAM_FLAG_MAP_BUFFERS | PW_STREAM_FLAG_MAP_BUFFERS |
@ -891,14 +895,14 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name,
goto error; goto error;
} }
pw->target = PW_ID_ANY; pw->target = NULL;
if (str != NULL) if (str != NULL)
pw->target = atoi(str); pw->target = strdup(str);
else { else {
if (stream == SND_PCM_STREAM_PLAYBACK) if (stream == SND_PCM_STREAM_PLAYBACK)
pw->target = playback_node ? (uint32_t)atoi(playback_node) : PW_ID_ANY; pw->target = playback_node ? strdup(playback_node) : NULL;
else else
pw->target = capture_node ? (uint32_t)atoi(capture_node) : PW_ID_ANY; pw->target = capture_node ? strdup(capture_node) : NULL;
} }
pw->main_loop = pw_thread_loop_new("alsa-pipewire", NULL); pw->main_loop = pw_thread_loop_new("alsa-pipewire", NULL);