mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: rename combine sinks option

Browse source 
Let's call it "sinks" in the docs, but keep the Pulseaudio name for
backward compat.
This commit is contained in:
Pauli Virtanen 2023-11-20 02:12:02 +02:00 • committed by Wim Taymans
parent 6d71fc637c
commit 90bd9adb6b
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/module-protocol-pulse/modules/module-combine-sink.c
View file

@ -30,8 +30,7 @@
static const char *const pulse_module_options = static const char *const pulse_module_options =
"sink_name=<name of the sink> " "sink_name=<name of the sink> "
"sink_properties=<properties for the sink> " "sink_properties=<properties for the sink> "
/* not a great name, but for backwards compatibility... */ "sinks=<sinks to combine> "
"slaves=<sinks to combine> "
"rate=<sample rate> " "rate=<sample rate> "
"channels=<number of channels> " "channels=<number of channels> "
"channel_map=<channel map> " "channel_map=<channel map> "
@ -286,8 +285,10 @@ static int module_combine_sink_prepare(struct module * const module)
if ((str = pw_properties_get(props, "sink_properties")) != NULL) if ((str = pw_properties_get(props, "sink_properties")) != NULL)
module_args_add_props(combine_props, str); module_args_add_props(combine_props, str);
if ((str = pw_properties_get(props, "slaves")) != NULL) { if ((str = pw_properties_get(props, "sinks")) != NULL ||
(str = pw_properties_get(props, "slaves")) != NULL) {
sink_names = pw_split_strv(str, ",", MAX_SINKS, &num_sinks); sink_names = pw_split_strv(str, ",", MAX_SINKS, &num_sinks);
pw_properties_set(props, "sinks", NULL);
pw_properties_set(props, "slaves", NULL); pw_properties_set(props, "slaves", NULL);
} }
if ((str = pw_properties_get(props, "remix")) != NULL) { if ((str = pw_properties_get(props, "remix")) != NULL) {