diff options
author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-11-10 03:00:10 +0800 |
---|---|---|
committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-11-11 22:01:07 +0800 |
commit | 8b9ee2a0f048ce6263efe0d0660ed04a53861adf (patch) | |
tree | 9ee947393f466ccf04f2154f910a8ac70e8a49cb /libempathy-gtk | |
parent | ffaa3afe49651493d0dcb01eba1b6dcd1134eed1 (diff) | |
download | gsoc2013-empathy-8b9ee2a0f048ce6263efe0d0660ed04a53861adf.tar gsoc2013-empathy-8b9ee2a0f048ce6263efe0d0660ed04a53861adf.tar.gz gsoc2013-empathy-8b9ee2a0f048ce6263efe0d0660ed04a53861adf.tar.bz2 gsoc2013-empathy-8b9ee2a0f048ce6263efe0d0660ed04a53861adf.tar.lz gsoc2013-empathy-8b9ee2a0f048ce6263efe0d0660ed04a53861adf.tar.xz gsoc2013-empathy-8b9ee2a0f048ce6263efe0d0660ed04a53861adf.tar.zst gsoc2013-empathy-8b9ee2a0f048ce6263efe0d0660ed04a53861adf.zip |
Don't turn on echo cancellation on the source if it's for raw conferences
https://bugzilla.gnome.org/show_bug.cgi?id=663842
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-call-utils.c | 7 | ||||
-rw-r--r-- | libempathy-gtk/empathy-call-utils.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index adf4987ba..b6fe48d80 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -250,15 +250,16 @@ empathy_call_new_with_streams (const gchar *contact, } void -empathy_call_set_stream_properties (GstElement *element) +empathy_call_set_stream_properties (GstElement *element, + gboolean echo_cancellation) { GstStructure *props; GSettings *gsettings_call; - gboolean echo_cancellation; gsettings_call = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA); - echo_cancellation = g_settings_get_boolean (gsettings_call, + echo_cancellation = echo_cancellation && + g_settings_get_boolean (gsettings_call, EMPATHY_PREFS_CALL_ECHO_CANCELLATION); props = gst_structure_new ("props", diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h index 87676161c..836103100 100644 --- a/libempathy-gtk/empathy-call-utils.h +++ b/libempathy-gtk/empathy-call-utils.h @@ -40,7 +40,8 @@ GHashTable * empathy_call_create_streamed_media_request (const gchar *contact, gboolean initial_audio, gboolean initial_video); -void empathy_call_set_stream_properties (GstElement *element); +void empathy_call_set_stream_properties (GstElement *element, + gboolean echo_cancellation); G_END_DECLS |