summaryrefslogtreecommitdiff
path: root/src/modules/echo-cancel
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-04-15 13:56:08 +0300
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-05-02 15:50:15 +0300
commitc93cfc1ca64a3d7e37a3ca63f42abb73ce72bfb6 (patch)
treebb3c617961bb541dc19fff191ec3c8f0ef840d3f /src/modules/echo-cancel
parent5f64ebdfc57f1a5728a7f84d9c69d3a815f467f1 (diff)
downloadpulseaudio-c93cfc1ca64a3d7e37a3ca63f42abb73ce72bfb6.tar.gz
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.
Diffstat (limited to 'src/modules/echo-cancel')
-rw-r--r--src/modules/echo-cancel/module-echo-cancel.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index fbdb3b3ad..9df2899d8 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);