X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2Fempathy-call-utils.c;h=adf4987bad0e6b8197c38a97b0eadaf7b5e5b6b1;hp=425cda5d768ecb5b728641d1cfd56fece1879cd6;hb=7b6b8da406493311445f6c2470a005a542972693;hpb=9be16f5be776b52b54f6fc9b4f8bccb167177162 diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 425cda5d..adf4987b 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -23,6 +23,7 @@ #include #include +#include #include @@ -30,6 +31,7 @@ #include "empathy-call-utils.h" +#include #include #define DEBUG_FLAG EMPATHY_DEBUG_OTHER @@ -53,6 +55,8 @@ get_error_display_message (GError *error) return _("The specified contact is not valid"); case TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED: return _("Emergency calls are not supported on this protocol"); + case TP_ERROR_INSUFFICIENT_BALANCE: + return _("You don't have enough credit in order to place this call"); } return _("There was an error starting the call"); @@ -65,7 +69,7 @@ show_call_error (GError *error) dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - get_error_display_message (error)); + "%s", get_error_display_message (error)); g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), @@ -113,7 +117,7 @@ empathy_call_create_streamed_media_request (const gchar *contact, } static void -create_call_channel_cb (GObject *source, +create_streamed_media_channel_cb (GObject *source, GAsyncResult *result, gpointer user_data) { @@ -124,28 +128,29 @@ create_call_channel_cb (GObject *source, result, &error)) { - DEBUG ("Failed to create Call channel: %s", error->message); + DEBUG ("Failed to create StreamedMedia channel: %s", error->message); show_call_error (error); g_error_free (error); } } +#ifdef HAVE_CALL static void -create_streamed_media_channel_cb (GObject *source, +create_call_channel_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - TpAccountChannelRequest *call_req = 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_object_unref (call_req); + g_object_unref (streamed_media_req); return; } - DEBUG ("Failed to create StreamedMedia channel: %s", error->message); + DEBUG ("Failed to create Call channel: %s", error->message); if (error->code != TP_ERROR_NOT_IMPLEMENTED) { @@ -153,16 +158,17 @@ create_streamed_media_channel_cb (GObject *source, return; } - DEBUG ("Let's try with a Call channel"); + DEBUG ("Let's try with an StreamedMedia channel"); g_error_free (error); - tp_account_channel_request_create_channel_async (call_req, - EMPATHY_CALL_BUS_NAME, NULL, - create_call_channel_cb, + tp_account_channel_request_create_channel_async (streamed_media_req, + EMPATHY_AV_BUS_NAME, NULL, + create_streamed_media_channel_cb, NULL); } -void -empathy_call_new_with_streams (const gchar *contact, +/* Try to request a Call channel and fallback to StreamedMedia if that fails */ +static void +call_new_with_streams (const gchar *contact, TpAccount *account, gboolean initial_audio, gboolean initial_video, @@ -171,24 +177,103 @@ empathy_call_new_with_streams (const gchar *contact, GHashTable *call_request, *streamed_media_request; TpAccountChannelRequest *call_req, *streamed_media_req; + /* Call */ call_request = empathy_call_create_call_request (contact, initial_audio, initial_video); + call_req = tp_account_channel_request_new (account, call_request, timestamp); + + g_hash_table_unref (call_request); + + /* StreamedMedia */ streamed_media_request = empathy_call_create_streamed_media_request ( contact, initial_audio, initial_video); - call_req = tp_account_channel_request_new (account, call_request, timestamp); streamed_media_req = tp_account_channel_request_new (account, streamed_media_request, timestamp); - tp_account_channel_request_create_channel_async (streamed_media_req, - EMPATHY_AV_BUS_NAME, NULL, - create_streamed_media_channel_cb, - call_req); + g_hash_table_unref (streamed_media_request); + + tp_account_channel_request_create_channel_async (call_req, + EMPATHY_CALL_BUS_NAME, NULL, + create_call_channel_cb, + streamed_media_req); + + g_object_unref (call_req); +} + +#else /* HAVE_CALL */ + +static void +sm_new_with_streams (const gchar *contact, + TpAccount *account, + gboolean initial_audio, + gboolean initial_video, + gint64 timestamp) +{ + GHashTable *streamed_media_request; + TpAccountChannelRequest *streamed_media_req; + + /* 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 (call_request); g_hash_table_unref (streamed_media_request); + + tp_account_channel_request_create_channel_async (streamed_media_req, + EMPATHY_AV_BUS_NAME, NULL, create_streamed_media_channel_cb, NULL); + g_object_unref (streamed_media_req); } +#endif /* HAVE_CALL */ + +void +empathy_call_new_with_streams (const gchar *contact, + TpAccount *account, + gboolean initial_audio, + gboolean initial_video, + gint64 timestamp) +{ +#ifdef HAVE_CALL + call_new_with_streams (contact, account, initial_audio, initial_video, + timestamp); +#else + sm_new_with_streams (contact, account, initial_audio, initial_video, + timestamp); +#endif +} + +void +empathy_call_set_stream_properties (GstElement *element) +{ + 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, + EMPATHY_PREFS_CALL_ECHO_CANCELLATION); + + props = gst_structure_new ("props", + PA_PROP_MEDIA_ROLE, G_TYPE_STRING, "phone", + NULL); + + if (echo_cancellation) + { + 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); +}