]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-call-utils.c
call-utils: inline call_new_with_streams()
[empathy.git] / libempathy-gtk / empathy-call-utils.c
index 677d28fa5ae9f9aa09e1a78920e6641076e62166..a235e7b999a25fed1a3200169481c715953bd8b2 100644 (file)
  */
 
 #include "config.h"
+#include "empathy-call-utils.h"
 
-#include <glib/gi18n.h>
-
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
-#include <telepathy-glib/telepathy-glib.h>
+#include "empathy-request-util.h"
 
-#include <telepathy-yell/telepathy-yell.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
 
-#include "empathy-call-utils.h"
+static const gchar *
+get_error_display_message (GError *error)
+{
+  if (error->domain != TP_ERROR)
+    return _("There was an error starting the call");
 
-#include <libempathy/empathy-request-util.h>
+  switch (error->code)
+    {
+      case TP_ERROR_NETWORK_ERROR:
+        return _("Network error");
+      case TP_ERROR_NOT_CAPABLE:
+        return _("The specified contact doesn't support calls");
+      case TP_ERROR_OFFLINE:
+        return _("The specified contact is offline");
+      case TP_ERROR_INVALID_HANDLE:
+        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");
+    }
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+  return _("There was an error starting the call");
+}
 
 static void
 show_call_error (GError *error)
@@ -42,7 +62,7 @@ show_call_error (GError *error)
 
   dialog = gtk_message_dialog_new (NULL, 0,
       GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-      _("There was an error starting the call"));
+      "%s", get_error_display_message (error));
 
   g_signal_connect_swapped (dialog, "response",
       G_CALLBACK (gtk_widget_destroy),
@@ -56,86 +76,41 @@ empathy_call_create_call_request (const gchar *contact,
     gboolean initial_audio,
     gboolean initial_video)
 {
-  return tp_asv_new (
-    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-      TPY_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,
-    TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN,
-      initial_audio,
-    TPY_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 (
+  GHashTable *asv = tp_asv_new (
     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-      TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
+      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_STREAMED_MEDIA_INITIAL_AUDIO, G_TYPE_BOOLEAN,
-      initial_audio,
-    TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, G_TYPE_BOOLEAN,
-      initial_video,
     NULL);
-}
 
-static void
-create_call_channel_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GError *error = 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);
 
-  if (!tp_account_channel_request_create_channel_finish (
-           TP_ACCOUNT_CHANNEL_REQUEST (source),
-           result,
-           &error))
-    {
-      DEBUG ("Failed to create Call channel: %s", error->message);
-      show_call_error (error);
-      g_error_free (error);
-    }
+  return asv;
 }
 
 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;
   GError *error = NULL;
 
   if (tp_account_channel_request_create_channel_finish (
       TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error))
-    {
-      g_object_unref (call_req);
-      return;
-    }
-
-  DEBUG ("Failed to create StreamedMedia channel: %s", error->message);
+    return;
 
-  if (error->code != TP_ERROR_NOT_IMPLEMENTED)
-    {
-      show_call_error (error);
-      return;
-    }
+  DEBUG ("Failed to create Call channel: %s", error->message);
 
-  DEBUG ("Let's try with a Call channel");
-  g_error_free (error);
-  tp_account_channel_request_create_channel_async (call_req,
-      EMPATHY_CALL_BUS_NAME, NULL,
-      create_call_channel_cb,
-      NULL);
+  show_call_error (error);
 }
 
 void
@@ -145,27 +120,102 @@ empathy_call_new_with_streams (const gchar *contact,
     gboolean initial_video,
     gint64 timestamp)
 {
-  GHashTable *call_request, *streamed_media_request;
-  TpAccountChannelRequest *call_req, *streamed_media_req;
+  GHashTable *call_request;
+  TpAccountChannelRequest *call_req;
 
+  /* Call */
   call_request = empathy_call_create_call_request (contact,
       initial_audio,
       initial_video);
 
-  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 (call_request);
-  g_hash_table_unref (streamed_media_request);
-  g_object_unref (streamed_media_req);
+
+  tp_account_channel_request_create_channel_async (call_req,
+      EMPATHY_CALL_TP_BUS_NAME, NULL, create_call_channel_cb, NULL);
+
+  g_object_unref (call_req);
+}
+
+/* Copied from telepathy-yell call-channel.c */
+void
+empathy_call_channel_send_video (TpCallChannel *self,
+    gboolean send)
+{
+  GPtrArray *contents;
+  gboolean found = FALSE;
+  guint i;
+
+  g_return_if_fail (TP_IS_CALL_CHANNEL (self));
+
+  /* Loop over all the contents, if some of them a video set all their
+   * streams to sending, otherwise request a video channel in case we want to
+   * sent */
+  contents = tp_call_channel_get_contents (self);
+  for (i = 0 ; i < contents->len ; i++)
+    {
+      TpCallContent *content = g_ptr_array_index (contents, i);
+
+      if (tp_call_content_get_media_type (content) ==
+              TP_MEDIA_STREAM_TYPE_VIDEO)
+        {
+          GPtrArray *streams;
+          guint j;
+
+          found = TRUE;
+          streams = tp_call_content_get_streams (content);
+          for (j = 0; j < streams->len; j++)
+            {
+              TpCallStream *stream = g_ptr_array_index (streams, j);
+
+              tp_call_stream_set_sending_async (stream, send, NULL, NULL);
+            }
+        }
+    }
+
+  if (send && !found)
+    {
+      tp_call_channel_add_content_async (self, "video",
+          TP_MEDIA_STREAM_TYPE_VIDEO, TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL,
+          NULL, NULL);
+    }
+}
+
+/* Copied from telepathy-yell call-channel.c */
+TpSendingState
+empathy_call_channel_get_video_state (TpCallChannel *self)
+{
+  TpSendingState result = TP_SENDING_STATE_NONE;
+  GPtrArray *contents;
+  guint i;
+
+  g_return_val_if_fail (TP_IS_CALL_CHANNEL (self), TP_SENDING_STATE_NONE);
+
+  contents = tp_call_channel_get_contents (self);
+  for (i = 0 ; i < contents->len ; i++)
+    {
+      TpCallContent *content = g_ptr_array_index (contents, i);
+
+      if (tp_call_content_get_media_type (content) ==
+              TP_MEDIA_STREAM_TYPE_VIDEO)
+        {
+          GPtrArray *streams;
+          guint j;
+
+          streams = tp_call_content_get_streams (content);
+          for (j = 0; j < streams->len; j++)
+            {
+              TpCallStream *stream = g_ptr_array_index (streams, j);
+              TpSendingState state;
+
+              state = tp_call_stream_get_local_sending_state (stream);
+              if (state != TP_SENDING_STATE_PENDING_STOP_SENDING &&
+                  state > result)
+                result = state;
+            }
+        }
+    }
+
+  return result;
 }