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

filter-apply: simplify proplist updating

Browse source 
pa_sink_input_set_property() takes care of logging, so the logging
code is redundant.
This commit is contained in:
Tanu Kaskinen 2016-03-18 16:22:00 +02:00
parent 95dd90ce06
commit 09f11ee482
1 changed files with 4 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/modules/module-filter-apply.c
View file

@ -272,55 +272,13 @@ static void trigger_housekeeping(struct userdata *u) {
static int do_move(pa_object *obj, pa_object *parent, bool restore, bool is_input) {
if (is_input) {
if (!restore) {
char *old_value;
if (pa_proplist_contains(PA_SINK_INPUT(obj)->proplist, "module-filter-apply.filter_device")) {
old_value = pa_xstrdup(pa_proplist_gets(PA_SINK_INPUT(obj)->proplist, "module-filter-apply.filter_device"));
if (!old_value)
old_value = pa_xstrdup("(data)");
} else
old_value = pa_xstrdup("(unset)");
if (!pa_streq(PA_SINK(parent)->name, old_value)) {
pa_proplist *pl;
pl = pa_proplist_new();
pa_proplist_sets(pl, "module-filter-apply.filter_device", PA_SINK(parent)->name);
pa_sink_input_update_proplist(PA_SINK_INPUT(obj), PA_UPDATE_REPLACE, pl);
pa_proplist_free(pl);
pa_log_debug("Sink input %u: proplist[module-filter-apply.filter_device]: %s -> %s",
PA_SINK_INPUT(obj)->index, old_value, PA_SINK(parent)->name);
}
pa_xfree(old_value);
}
if (!restore)
pa_sink_input_set_property(PA_SINK_INPUT(obj), "module-filter-apply.filter_device", PA_SINK(parent)->name);
return pa_sink_input_move_to(PA_SINK_INPUT(obj), PA_SINK(parent), restore);
} else {
if (!restore) {
char *old_value;
if (pa_proplist_contains(PA_SOURCE_OUTPUT(obj)->proplist, "module-filter-apply.filter_device")) {
old_value = pa_xstrdup(pa_proplist_gets(PA_SOURCE_OUTPUT(obj)->proplist, "module-filter-apply.filter_device"));
if (!old_value)
old_value = pa_xstrdup("(data)");
} else
old_value = pa_xstrdup("(unset)");
if (!pa_streq(PA_SOURCE(parent)->name, old_value)) {
pa_proplist *pl;
pl = pa_proplist_new();
pa_proplist_sets(pl, "module-filter-apply.filter_device", PA_SOURCE(parent)->name);
pa_source_output_update_proplist(PA_SOURCE_OUTPUT(obj), PA_UPDATE_REPLACE, pl);
pa_proplist_free(pl);
pa_log_debug("Source output %u: proplist[module-filter-apply.filter_device]: %s -> %s",
PA_SOURCE_OUTPUT(obj)->index, old_value, PA_SOURCE(parent)->name);
}
pa_xfree(old_value);
}
if (!restore)
pa_source_output_set_property(PA_SOURCE_OUTPUT(obj), "module-filter-apply.filter_device", PA_SOURCE(parent)->name);
return pa_source_output_move_to(PA_SOURCE_OUTPUT(obj), PA_SOURCE(parent), restore);
}