*/
#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 <telepathy-yell/telepathy-yell.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
-#include "empathy-call-utils.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)
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,
- 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 (
- 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);
-}
-
-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);
- }
-}
-
-#ifdef HAVE_CALL
static void
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_object_unref (streamed_media_req);
- return;
- }
+ return;
DEBUG ("Failed to create Call channel: %s", error->message);
- if (error->code != TP_ERROR_NOT_IMPLEMENTED)
- {
- show_call_error (error);
- return;
- }
-
- 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);
+ 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, *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);
+ TpAccountChannelRequest *call_req;
- g_hash_table_unref (call_request);
+ 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);
- /* StreamedMedia */
- streamed_media_request = empathy_call_create_streamed_media_request (
- contact, initial_audio, initial_video);
+ tp_account_channel_request_set_target_id (call_req, TP_HANDLE_TYPE_CONTACT,
+ contact);
- streamed_media_req = tp_account_channel_request_new (account,
- streamed_media_request,
- timestamp);
-
- 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);
+ return call_req;
}
-#else /* HAVE_CALL */
-
-static void
-sm_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 *streamed_media_request;
- TpAccountChannelRequest *streamed_media_req;
+ TpAccountChannelRequest *call_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,
+ call_req = empathy_call_create_call_request (account, contact, initial_video,
timestamp);
- 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 */
+ tp_account_channel_request_create_channel_async (call_req,
+ EMPATHY_CALL_TP_BUS_NAME, NULL, create_call_channel_cb, NULL);
-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
+ g_object_unref (call_req);
}
+/* Copied from telepathy-yell call-channel.c */
void
-empathy_call_set_stream_properties (GstElement *element,
- gboolean echo_cancellation)
+empathy_call_channel_send_video (TpCallChannel *self,
+ gboolean send)
{
- GstStructure *props;
- GSettings *gsettings_call;
- gboolean echo_cancellation_setting;
+ GPtrArray *contents;
+ gboolean found = FALSE;
+ guint i;
- gsettings_call = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
+ g_return_if_fail (TP_IS_CALL_CHANNEL (self));
- echo_cancellation_setting = g_settings_get_boolean (gsettings_call,
- EMPATHY_PREFS_CALL_ECHO_CANCELLATION);
+ /* 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);
+ }
+ }
+ }
- DEBUG ("Echo cancellation: element allowed: %s, user enabled: %s",
- echo_cancellation ? " yes" : "no",
- echo_cancellation_setting ? " yes" : "no");
+ 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;
- props = gst_structure_new ("props",
- PA_PROP_MEDIA_ROLE, G_TYPE_STRING, "phone",
- NULL);
+ g_return_val_if_fail (TP_IS_CALL_CHANNEL (self), TP_SENDING_STATE_NONE);
- if (echo_cancellation && echo_cancellation_setting)
+ contents = tp_call_channel_get_contents (self);
+ for (i = 0 ; i < contents->len ; i++)
{
- gst_structure_set (props,
- "filter.want", G_TYPE_STRING, "echo-cancel",
- NULL);
+ 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;
+ }
+ }
}
- g_object_set (element, "stream-properties", props, NULL);
- gst_structure_free (props);
-
- g_object_unref (gsettings_call);
+ return result;
}