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

don't attempt to connect to empty remote name

Browse source 
Fixes jconvolver startup.

See #744
This commit is contained in:
Wim Taymans 2021-02-18 10:22:39 +01:00
parent 81ebc33b57
commit 7053936ffd
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pipewire-alsa/alsa-plugins/ctl_pipewire.c
View file

@ -1217,7 +1217,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pipewire)
} }
str = getenv("PIPEWIRE_REMOTE"); str = getenv("PIPEWIRE_REMOTE");
if (str != NULL) if (str != NULL && str[0] != '\0')
server = str; server = str;
if (fallback_name && name && !strcmp(name, fallback_name)) if (fallback_name && name && !strcmp(name, fallback_name))

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

@ -937,7 +937,7 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name,
return -ENOMEM; return -ENOMEM;
str = getenv("PIPEWIRE_REMOTE"); str = getenv("PIPEWIRE_REMOTE");
if (str != NULL) if (str != NULL && str[0] != '\0')
server_name = str; server_name = str;
str = getenv("PIPEWIRE_NODE"); str = getenv("PIPEWIRE_NODE");

4
src/modules/module-protocol-native/local-socket.c
View file

@ -50,9 +50,9 @@ get_remote(const struct spa_dict *props)
if (props) if (props)
name = spa_dict_lookup(props, PW_KEY_REMOTE_NAME); name = spa_dict_lookup(props, PW_KEY_REMOTE_NAME);
if (name == NULL) if (name == NULL || name[0] == '\0')
name = getenv("PIPEWIRE_REMOTE"); name = getenv("PIPEWIRE_REMOTE");
if (name == NULL) if (name == NULL || name[0] == '\0')
name = PW_DEFAULT_REMOTE; name = PW_DEFAULT_REMOTE;
return name; return name;
} }

4
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -5484,9 +5484,9 @@ get_server_name(struct pw_context *context)
if (props) if (props)
name = pw_properties_get(props, PW_KEY_REMOTE_NAME); name = pw_properties_get(props, PW_KEY_REMOTE_NAME);
if (name == NULL) if (name == NULL || name[0] == '\0')
name = getenv("PIPEWIRE_REMOTE"); name = getenv("PIPEWIRE_REMOTE");
if (name == NULL) if (name == NULL || name[0] == '\0')
name = PW_DEFAULT_REMOTE; name = PW_DEFAULT_REMOTE;
return name; return name;
} }