X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2Fempathy-call-utils.c;h=a235e7b999a25fed1a3200169481c715953bd8b2;hp=545ec7ce80782af0908437b01cba3d76767c2182;hb=912bbee404f948ae85d8c5705857b7dde0595ea0;hpb=57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 545ec7ce..a235e7b9 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -19,21 +19,16 @@ */ #include "config.h" +#include "empathy-call-utils.h" -#include - +#include #include -#include - -#include - -#include "empathy-call-utils.h" +#include -#include -#include +#include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" static const gchar * get_error_display_message (GError *error) @@ -81,55 +76,25 @@ empathy_call_create_call_request (const gchar *contact, gboolean initial_audio, gboolean initial_video) { - return tp_asv_new ( + GHashTable *asv = tp_asv_new ( TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, contact, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, - initial_audio, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, - initial_video, NULL); -} -GHashTable * -empathy_call_create_streamed_media_request (const gchar *contact, - gboolean initial_audio, - gboolean initial_video) -{ - return tp_asv_new ( - TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, - TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, - TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, - TP_HANDLE_TYPE_CONTACT, - TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, - contact, - TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, G_TYPE_BOOLEAN, - initial_audio, - TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, G_TYPE_BOOLEAN, - initial_video, - NULL); -} + /* Only add InitialAudio or InitialVideo if they are true: it should work + * with genuinely voice-only CMs. */ + if (initial_audio) + tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, + initial_audio); + if (initial_video) + tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, + initial_video); -static void -create_streamed_media_channel_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GError *error = NULL; - - if (!tp_account_channel_request_create_channel_finish ( - TP_ACCOUNT_CHANNEL_REQUEST (source), - result, - &error)) - { - DEBUG ("Failed to create StreamedMedia channel: %s", error->message); - show_call_error (error); - g_error_free (error); - } + return asv; } static void @@ -137,45 +102,26 @@ create_call_channel_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - TpAccountChannelRequest *streamed_media_req = user_data; GError *error = NULL; if (tp_account_channel_request_create_channel_finish ( TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error)) - { - g_clear_object (&streamed_media_req); - return; - } + return; DEBUG ("Failed to create Call channel: %s", error->message); - if (streamed_media_req != NULL) - { - DEBUG ("Let's try with an StreamedMedia channel"); - g_error_free (error); - tp_account_channel_request_create_channel_async (streamed_media_req, - EMPATHY_AV_BUS_NAME, NULL, - create_streamed_media_channel_cb, - NULL); - return; - } - show_call_error (error); } -/* Try to request a Call channel and fallback to StreamedMedia if that fails */ -static void -call_new_with_streams (const gchar *contact, +void +empathy_call_new_with_streams (const gchar *contact, TpAccount *account, gboolean initial_audio, gboolean initial_video, gint64 timestamp) { GHashTable *call_request; - TpAccountChannelRequest *call_req, *streamed_media_req = NULL; -#ifdef HAVE_EMPATHY_AV - GHashTable *streamed_media_request; -#endif + TpAccountChannelRequest *call_req; /* Call */ call_request = empathy_call_create_call_request (contact, @@ -186,70 +132,12 @@ call_new_with_streams (const gchar *contact, g_hash_table_unref (call_request); -#ifdef HAVE_EMPATHY_AV - /* StreamedMedia */ - streamed_media_request = empathy_call_create_streamed_media_request ( - contact, initial_audio, initial_video); - - streamed_media_req = tp_account_channel_request_new (account, - streamed_media_request, - timestamp); - - g_hash_table_unref (streamed_media_request); -#endif - tp_account_channel_request_create_channel_async (call_req, - EMPATHY_CALL_BUS_NAME, NULL, create_call_channel_cb, streamed_media_req); + EMPATHY_CALL_TP_BUS_NAME, NULL, create_call_channel_cb, NULL); g_object_unref (call_req); } -void -empathy_call_new_with_streams (const gchar *contact, - TpAccount *account, - gboolean initial_audio, - gboolean initial_video, - gint64 timestamp) -{ - call_new_with_streams (contact, account, initial_audio, initial_video, - timestamp); -} - -void -empathy_call_set_stream_properties (GstElement *element, - gboolean echo_cancellation) -{ - GstStructure *props; - GSettings *gsettings_call; - gboolean echo_cancellation_setting; - - gsettings_call = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA); - - 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 && echo_cancellation_setting) - { - gst_structure_set (props, - "filter.want", G_TYPE_STRING, "echo-cancel", - NULL); - } - - g_object_set (element, "stream-properties", props, NULL); - gst_structure_free (props); - - g_object_unref (gsettings_call); -} - /* Copied from telepathy-yell call-channel.c */ void empathy_call_channel_send_video (TpCallChannel *self,