call-utils: use TpAccountChannelRequest higher level API

[empathy.git] / libempathy-gtk / empathy-call-utils.c

diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 77fdb565acdf020046aac8d96fe485c61f2321f2..c6380ba89a0d89b32efef8b93dc7d159313cca45 100644 (file)
--- 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 <glib/gi18n.h>
-
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <pulse/pulseaudio.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include "empathy-call-utils.h"
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-request-util.h>
+#include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 static const gchar *
 get_error_display_message (GError *error)
@@ -76,25 +71,6 @@ show_call_error (GError *error)
   gtk_widget_show (dialog);
 }
 
-GHashTable *
-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,
-      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);
-}
-
 static void
 create_call_channel_cb (GObject *source,
     GAsyncResult *result,
@@ -111,76 +87,41 @@ create_call_channel_cb (GObject *source,
   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,
-    TpAccount *account,
-    gboolean initial_audio,
+TpAccountChannelRequest *
+empathy_call_create_call_request (TpAccount *account,
+    const gchar *contact,
     gboolean initial_video,
     gint64 timestamp)
 {
-  GHashTable *call_request;
   TpAccountChannelRequest *call_req;
 
-  /* Call */
-  call_request = empathy_call_create_call_request (contact,
-      initial_audio,
-      initial_video);
+  if (initial_video)
+    call_req = tp_account_channel_request_new_audio_video_call (account,
+        timestamp);
+  else
+    call_req = tp_account_channel_request_new_audio_call (account, timestamp);
 
-  call_req = tp_account_channel_request_new (account, call_request, timestamp);
+  tp_account_channel_request_set_target_id (call_req, TP_HANDLE_TYPE_CONTACT,
+      contact);
 
-  g_hash_table_unref (call_request);
-
-  tp_account_channel_request_create_channel_async (call_req,
-      EMPATHY_CALL_BUS_NAME, NULL, create_call_channel_cb, NULL);
-
-  g_object_unref (call_req);
+  return 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);
+  TpAccountChannelRequest *call_req;
 
-  if (echo_cancellation && echo_cancellation_setting)
-    {
-      gst_structure_set (props,
-          "filter.want", G_TYPE_STRING, "echo-cancel",
-          NULL);
-    }
+  call_req = empathy_call_create_call_request (account, contact, initial_video,
+      timestamp);
 
-  g_object_set (element, "stream-properties", props, NULL);
-  gst_structure_free (props);
+  tp_account_channel_request_create_channel_async (call_req,
+      EMPATHY_CALL_TP_BUS_NAME, NULL, create_call_channel_cb, NULL);
 
-  g_object_unref (gsettings_call);
+  g_object_unref (call_req);
 }
 
 /* Copied from telepathy-yell call-channel.c */