From c93cfc1ca64a3d7e37a3ca63f42abb73ce72bfb6 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 15 Apr 2014 13:56:08 +0300 Subject: [PATCH] echo-cancel: Remove redundant get_mute() callback The callback just called pa_source_output_get_mute(), which doesn't have any side effects, and the return value wasn't used either, so the callback was essentially a no-op. --- src/modules/echo-cancel/module-echo-cancel.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c index fbdb3b3a..9df2899d 100644 --- a/src/modules/echo-cancel/module-echo-cancel.c +++ b/src/modules/echo-cancel/module-echo-cancel.c @@ -646,20 +646,6 @@ static void sink_set_mute_cb(pa_sink *s) { pa_sink_input_set_mute(u->sink_input, s->muted, s->save_muted); } -/* Called from main context */ -static void source_get_mute_cb(pa_source *s) { - struct userdata *u; - - pa_source_assert_ref(s); - pa_assert_se(u = s->userdata); - - if (!PA_SOURCE_IS_LINKED(pa_source_get_state(s)) || - !PA_SOURCE_OUTPUT_IS_LINKED(pa_source_output_get_state(u->source_output))) - return; - - pa_source_output_get_mute(u->source_output); -} - /* Called from source I/O thread context. */ static void apply_diff_time(struct userdata *u, int64_t diff_time) { int64_t diff; @@ -1810,7 +1796,6 @@ int pa__init(pa_module*m) { u->source->parent.process_msg = source_process_msg_cb; u->source->set_state = source_set_state_cb; u->source->update_requested_latency = source_update_requested_latency_cb; - pa_source_set_get_mute_callback(u->source, source_get_mute_cb); pa_source_set_set_mute_callback(u->source, source_set_mute_cb); if (!u->use_volume_sharing) { pa_source_set_get_volume_callback(u->source, source_get_volume_cb); -- 2.39.2