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: play the sample on the right sink

Browse source
This commit is contained in:
Wim Taymans 2020-11-17 12:59:09 +01:00
parent ff1b49eb81
commit 813af52072
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2233,7 +2233,7 @@ static void sample_play_ready(void *data, uint32_t index)
struct impl *impl = client->impl; struct impl *impl = client->impl;
struct message *reply; struct message *reply;
pw_log_info(NAME" %p: [%s] PLAY_SAMPLE tag:%u sink_index:%u", pw_log_info(NAME" %p: [%s] PLAY_SAMPLE tag:%u index:%u",
impl, client->name, ps->tag, index); impl, client->name, ps->tag, index);
reply = reply_new(client, ps->tag); reply = reply_new(client, ps->tag);
@ -2302,6 +2302,17 @@ static int do_play_sample(struct client *client, uint32_t command, uint32_t tag,
impl, client->name, commands[command].name, tag, impl, client->name, commands[command].name, tag,
sink_index, sink_name, name); sink_index, sink_name, name);
if ((sink_index == SPA_ID_INVALID && sink_name == NULL) ||
(sink_index != SPA_ID_INVALID && sink_name != NULL))
goto error_inval;
if (sink_name != NULL)
pw_properties_set(props,
PW_KEY_NODE_TARGET, sink_name);
else if (sink_index != SPA_ID_INVALID)
pw_properties_setf(props,
PW_KEY_NODE_TARGET, "%u", sink_index);
pw_properties_update(props, &client->props->dict); pw_properties_update(props, &client->props->dict);
sample = find_sample(impl, SPA_ID_INVALID, name); sample = find_sample(impl, SPA_ID_INVALID, name);
@ -2328,6 +2339,9 @@ error_errno:
error_proto: error_proto:
res = -EPROTO; res = -EPROTO;
goto error; goto error;
error_inval:
res = -EINVAL;
goto error;
error_noent: error_noent:
res = -ENOENT; res = -ENOENT;
goto error; goto error;