summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2010-12-02 16:34:03 +0530
committerArun Raghavan <arun.raghavan@collabora.co.uk>2011-03-28 14:41:00 +0530
commitf93b5e1869cc088acb2aec5a8a69015dc30acbe8 (patch)
treeb5d38615eab1ad80f9e18285c37d4d7afa5d6e2b
parentd866adee0ee9b79ebe81fac85fa2f31b522b568e (diff)
echo-cancel: Fix source may_move_to function
This is required to make sure that the source output between module-echo-cancel and ALSA can't get plugged to the virtual source or monitor of the virtual sink that we expose. This could be triggered by changing the profile of the underlying ALSA device.
-rw-r--r--src/modules/echo-cancel/module-echo-cancel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index 8ae45a5c..8f37fd25 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -1212,7 +1212,7 @@ static pa_bool_t source_output_may_move_to_cb(pa_source_output *o, pa_source *de
pa_assert_ctl_context();
pa_assert_se(u = o->userdata);
- return TRUE;
+ return (u->source != dest) && (u->sink != dest->monitor_of);
}
/* Called from main context */