aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-call-utils.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-11-10 03:25:17 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-11-11 22:01:08 +0800
commit92e94e644937590a6832f1321b1ce285cae38f86 (patch)
treefc3ddafba8a743dbf4778025dda742a355a1f1b0 /libempathy-gtk/empathy-call-utils.c
parent8b9ee2a0f048ce6263efe0d0660ed04a53861adf (diff)
downloadgsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar
gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.gz
gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.bz2
gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.lz
gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.xz
gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.zst
gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.zip
Don't turn on echo cancellation on the sink if it's for raw conferences
https://bugzilla.gnome.org/show_bug.cgi?id=663842
Diffstat (limited to 'libempathy-gtk/empathy-call-utils.c')
-rw-r--r--libempathy-gtk/empathy-call-utils.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index b6fe48d80..16526d354 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -255,18 +255,23 @@ empathy_call_set_stream_properties (GstElement *element,
{
GstStructure *props;
GSettings *gsettings_call;
+ gboolean echo_cancellation_setting;
gsettings_call = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
- echo_cancellation = echo_cancellation &&
- g_settings_get_boolean (gsettings_call,
+ echo_cancellation_setting = g_settings_get_boolean (gsettings_call,
EMPATHY_PREFS_CALL_ECHO_CANCELLATION);
+ DEBUG ("Echo cancellation: element allowed: %s, user enabled: %s",
+ echo_cancellation ? " yes" : "no",
+ echo_cancellation_setting ? " yes" : "no");
+
+
props = gst_structure_new ("props",
PA_PROP_MEDIA_ROLE, G_TYPE_STRING, "phone",
NULL);
- if (echo_cancellation)
+ if (echo_cancellation && echo_cancellation_setting)
{
gst_structure_set (props,
"filter.want", G_TYPE_STRING, "echo-cancel",