mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: handle NULL as default sink/source

Browse source 
Fixes #444
This commit is contained in:
Wim Taymans 2020-12-05 13:30:02 +01:00
parent 8c4145291e
commit cfe43cbea7
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2759,7 +2759,8 @@ static struct pw_manager_object *find_device(struct client *client,
sel.type = object_is_source; sel.type = object_is_source;
def = DEFAULT_SOURCE; def = DEFAULT_SOURCE;
} }
if (sel.value != NULL && strcmp(sel.value, def) == 0) if (id == SPA_ID_INVALID &&
(sel.value == NULL || strcmp(sel.value, def) == 0))
sel.value = get_default(client, sink); sel.value = get_default(client, sink);
return select_object(client->manager, &sel); return select_object(client->manager, &sel);
@ -3174,8 +3175,6 @@ static int do_lookup(struct client *client, uint32_t command, uint32_t tag, stru
TAG_STRING, &name, TAG_STRING, &name,
TAG_INVALID)) < 0) TAG_INVALID)) < 0)
return -EPROTO; return -EPROTO;
if (name == NULL)
return -EINVAL;
pw_log_info(NAME" %p: [%s] LOOKUP tag:%u name:'%s'", impl, client->name, tag, name); pw_log_info(NAME" %p: [%s] LOOKUP tag:%u name:'%s'", impl, client->name, tag, name);
@ -3856,11 +3855,10 @@ static int do_get_info(struct client *client, uint32_t command, uint32_t tag, st
if (fill_func == NULL) if (fill_func == NULL)
goto error_invalid; goto error_invalid;
if ((sel.id == SPA_ID_INVALID && sel.value == NULL) || if (sel.id != SPA_ID_INVALID && sel.value != NULL)
(sel.id != SPA_ID_INVALID && sel.value != NULL))
goto error_invalid; goto error_invalid;
if (sel.value != NULL && def != NULL && strcmp(sel.value, def) == 0) if (sel.value == NULL || (def != NULL && strcmp(sel.value, def)) == 0)
sel.value = get_default(client, command == COMMAND_GET_SINK_INFO); sel.value = get_default(client, command == COMMAND_GET_SINK_INFO);
pw_log_info(NAME" %p: [%s] %s tag:%u idx:%u name:%s", impl, client->name, pw_log_info(NAME" %p: [%s] %s tag:%u idx:%u name:%s", impl, client->name,
@ -4243,9 +4241,6 @@ static int do_set_default(struct client *client, uint32_t command, uint32_t tag,
TAG_INVALID)) < 0) TAG_INVALID)) < 0)
return -EPROTO; return -EPROTO;
if (name == NULL)
return -EINVAL;
pw_log_info(NAME" %p: [%s] %s tag:%u name:%s", impl, client->name, pw_log_info(NAME" %p: [%s] %s tag:%u name:%s", impl, client->name,
commands[command].name, tag, name); commands[command].name, tag, name);