diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2016-03-18 16:22:00 +0200 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2016-04-25 13:50:47 +0300 |
| commit | 09f11ee48279e28a73492ce5ccf7854808913f57 (patch) | |
| tree | 0056343a2574f79c30a7b95cf648e1a63a0ff087 | |
| parent | 95dd90ce06046fb574e4a2174545bdebeb7c460d (diff) | |
| download | pulseaudio-09f11ee48279e28a73492ce5ccf7854808913f57.tar.gz | |
filter-apply: simplify proplist updating
pa_sink_input_set_property() takes care of logging, so the logging
code is redundant.
| -rw-r--r-- | src/modules/module-filter-apply.c | 50 |
1 files changed, 4 insertions, 46 deletions
diff --git a/src/modules/module-filter-apply.c b/src/modules/module-filter-apply.c index f5ff0a33d..d09efb4ca 100644 --- a/src/modules/module-filter-apply.c +++ b/src/modules/module-filter-apply.c @@ -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); } |