mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ladspa-sink, virtual-surround-sink: fix master sink argument handling

Browse source 
The old code worked incorrectly in several situations. For example,
trying to use the "master" argument wouldn't work, because if
"sink_master" wasn't specified, pa_namereg_get() would pick the default
sink as the master sink.
This commit is contained in:
Tanu Kaskinen 2017-04-14 18:20:40 +03:00
parent a42241ec95
commit 65f7ca4414
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/modules/module-ladspa-sink.c
View file

@ -967,6 +967,7 @@ int pa__init(pa_module*m) {
pa_channel_map map; pa_channel_map map;
pa_modargs *ma; pa_modargs *ma;
char *t; char *t;
const char *master_name;
pa_sink *master; pa_sink *master;
pa_sink_input_new_data sink_input_data; pa_sink_input_new_data sink_input_data;
pa_sink_new_data sink_data; pa_sink_new_data sink_data;
@ -987,12 +988,18 @@ int pa__init(pa_module*m) {
goto fail; goto fail;
} }
if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "sink_master", NULL), PA_NAMEREG_SINK))) { master_name = pa_modargs_get_value(ma, "sink_master", NULL);
if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "master", NULL), PA_NAMEREG_SINK))) { if (!master_name) {
pa_log("Master sink not found."); master_name = pa_modargs_get_value(ma, "master", NULL);
goto fail; if (master_name)
} else pa_log_warn("The 'master' module argument is deprecated and may be removed in the future, "
pa_log("Argument 'master' will be deprecated, please use 'sink_master' instead."); "please use the 'sink_master' argument instead.");
}
master = pa_namereg_get(m->core, master_name, PA_NAMEREG_SINK);
if (!master) {
pa_log("Master sink not found.");
goto fail;
} }
ss = master->sample_spec; ss = master->sample_spec;

19
src/modules/module-virtual-surround-sink.c
View file

@ -581,6 +581,7 @@ int pa__init(pa_module*m) {
pa_sample_spec ss, sink_input_ss; pa_sample_spec ss, sink_input_ss;
pa_channel_map map, sink_input_map; pa_channel_map map, sink_input_map;
pa_modargs *ma; pa_modargs *ma;
const char *master_name;
pa_sink *master = NULL; pa_sink *master = NULL;
pa_sink_input_new_data sink_input_data; pa_sink_input_new_data sink_input_data;
pa_sink_new_data sink_data; pa_sink_new_data sink_data;
@ -611,12 +612,18 @@ int pa__init(pa_module*m) {
goto fail; goto fail;
} }
if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "sink_master", NULL), PA_NAMEREG_SINK))) { master_name = pa_modargs_get_value(ma, "sink_master", NULL);
if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "master", NULL), PA_NAMEREG_SINK))) { if (!master_name) {
pa_log("Master sink not found."); master_name = pa_modargs_get_value(ma, "master", NULL);
goto fail; if (master_name)
} else pa_log_warn("The 'master' module argument is deprecated and may be removed in the future, "
pa_log("Argument 'master' will be deprecated, please use 'sink_master' instead."); "please use the 'sink_master' argument instead.");
}
master = pa_namereg_get(m->core, master_name, PA_NAMEREG_SINK);
if (!master) {
pa_log("Master sink not found.");
goto fail;
} }
pa_assert(master); pa_assert(master);