diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2020-08-04 14:13:07 +0200 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2020-08-04 14:13:07 +0200 |
| commit | 5bf6acad06d940ad1b44f4dd2ea549255b021582 (patch) | |
| tree | 0cc69884adea3fff228df3eb41cc73cb39427fb4 /pipewire-alsa | |
| parent | 64067bafe3b474b5d17dc3b1b08cb08148aae256 (diff) | |
alsa: use PIPEWIRE_REMOTE env variable
Diffstat (limited to 'pipewire-alsa')
| -rw-r--r-- | pipewire-alsa/alsa-plugins/ctl_pipewire.c | 7 | ||||
| -rw-r--r-- | pipewire-alsa/alsa-plugins/pcm_pipewire.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/pipewire-alsa/alsa-plugins/ctl_pipewire.c b/pipewire-alsa/alsa-plugins/ctl_pipewire.c index 538c9534..5284933a 100644 --- a/pipewire-alsa/alsa-plugins/ctl_pipewire.c +++ b/pipewire-alsa/alsa-plugins/ctl_pipewire.c @@ -1209,6 +1209,10 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pipewire) return -EINVAL; } + str = getenv("PIPEWIRE_REMOTE"); + if (str != NULL) + server = str; + if (fallback_name && name && !strcmp(name, fallback_name)) fallback_name = NULL; /* no fallback for the same name */ @@ -1270,6 +1274,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pipewire) else pw_properties_set(props, PW_KEY_APP_NAME, "ALSA plug-in"); + if (server) + pw_properties_set(props, PW_KEY_REMOTE_NAME, server); + if ((err = pw_thread_loop_start(ctl->mainloop)) < 0) goto error; diff --git a/pipewire-alsa/alsa-plugins/pcm_pipewire.c b/pipewire-alsa/alsa-plugins/pcm_pipewire.c index bc79869f..a04291af 100644 --- a/pipewire-alsa/alsa-plugins/pcm_pipewire.c +++ b/pipewire-alsa/alsa-plugins/pcm_pipewire.c @@ -899,6 +899,10 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name, if (!pw) return -ENOMEM; + str = getenv("PIPEWIRE_REMOTE"); + if (str != NULL) + server_name = str; + str = getenv("PIPEWIRE_NODE"); pw_log_debug(NAME" %p: open %s %d %d %08x %d %s %d %d '%s'", pw, name, |