mirror of
https://gitlab.freedesktop.org/pipewire/pipewire
synced 2024-07-22 18:54:36 +00:00
don't attempt to connect to empty remote name
Fixes jconvolver startup. See #744
This commit is contained in:
parent
81ebc33b57
commit
7053936ffd
|
@ -1217,7 +1217,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pipewire)
|
|||
}
|
||||
|
||||
str = getenv("PIPEWIRE_REMOTE");
|
||||
if (str != NULL)
|
||||
if (str != NULL && str[0] != '\0')
|
||||
server = str;
|
||||
|
||||
if (fallback_name && name && !strcmp(name, fallback_name))
|
||||
|
|
|
@ -937,7 +937,7 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name,
|
|||
return -ENOMEM;
|
||||
|
||||
str = getenv("PIPEWIRE_REMOTE");
|
||||
if (str != NULL)
|
||||
if (str != NULL && str[0] != '\0')
|
||||
server_name = str;
|
||||
|
||||
str = getenv("PIPEWIRE_NODE");
|
||||
|
|
|
@ -50,9 +50,9 @@ get_remote(const struct spa_dict *props)
|
|||
|
||||
if (props)
|
||||
name = spa_dict_lookup(props, PW_KEY_REMOTE_NAME);
|
||||
if (name == NULL)
|
||||
if (name == NULL || name[0] == '\0')
|
||||
name = getenv("PIPEWIRE_REMOTE");
|
||||
if (name == NULL)
|
||||
if (name == NULL || name[0] == '\0')
|
||||
name = PW_DEFAULT_REMOTE;
|
||||
return name;
|
||||
}
|
||||
|
|
|
@ -5484,9 +5484,9 @@ get_server_name(struct pw_context *context)
|
|||
|
||||
if (props)
|
||||
name = pw_properties_get(props, PW_KEY_REMOTE_NAME);
|
||||
if (name == NULL)
|
||||
if (name == NULL || name[0] == '\0')
|
||||
name = getenv("PIPEWIRE_REMOTE");
|
||||
if (name == NULL)
|
||||
if (name == NULL || name[0] == '\0')
|
||||
name = PW_DEFAULT_REMOTE;
|
||||
return name;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue