/*
- * Copyright (C) 2007 Elliot Fairweather
+ * Copyright (C) 2007 Elliot Fairweather
+ * Copyright (C) 2007-2008 Collabora Ltd.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
- * Authors: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
+ * Authors: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
+ * Xavier Claessens <xclaesse@gmail.com>
*/
#include <string.h>
-#include <dbus/dbus-glib.h>
-#include <libtelepathy/tp-chan-type-streamed-media-gen.h>
-#include <libtelepathy/tp-connmgr.h>
#include <telepathy-glib/proxy-subclass.h>
#include <telepathy-glib/dbus.h>
-
-#include <libmissioncontrol/mc-account.h>
-
-#include <extensions/extensions.h>
-#include <libempathy/empathy-contact-factory.h>
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-tp-group.h>
-#include <libempathy/empathy-utils.h>
+#include <telepathy-glib/interfaces.h>
#include "empathy-tp-call.h"
+#include "empathy-tp-contact-factory.h"
+#include "empathy-utils.h"
-#define DEBUG_DOMAIN "TpCall"
-
-#define GET_PRIV(object) (G_TYPE_INSTANCE_GET_PRIVATE \
- ((object), EMPATHY_TYPE_TP_CALL, EmpathyTpCallPriv))
-
-#define STREAM_ENGINE_BUS_NAME "org.freedesktop.Telepathy.StreamEngine"
-#define STREAM_ENGINE_OBJECT_PATH "/org/freedesktop/Telepathy/StreamEngine"
-
-typedef struct _EmpathyTpCallPriv EmpathyTpCallPriv;
+#define DEBUG_FLAG EMPATHY_DEBUG_TP
+#include "empathy-debug.h"
-struct _EmpathyTpCallPriv
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpCall)
+typedef struct
{
- TpConn *connection;
- TpChan *channel;
- TpProxy *stream_engine;
- TpDBusDaemon *dbus_daemon;
- EmpathyTpGroup *group;
+ gboolean dispose_has_run;
+ TpChannel *channel;
EmpathyContact *contact;
gboolean is_incoming;
guint status;
- gboolean stream_engine_started;
EmpathyTpCallStream *audio;
EmpathyTpCallStream *video;
-};
-
-enum
-{
- STATUS_CHANGED_SIGNAL,
- RECEIVING_VIDEO_SIGNAL,
- SENDING_VIDEO_SIGNAL,
- LAST_SIGNAL
-};
+} EmpathyTpCallPriv;
enum
{
PROP_0,
- PROP_CONNECTION,
PROP_CHANNEL,
PROP_CONTACT,
PROP_IS_INCOMING,
PROP_VIDEO_STREAM
};
-static guint signals[LAST_SIGNAL];
-
G_DEFINE_TYPE (EmpathyTpCall, empathy_tp_call, G_TYPE_OBJECT)
static void
-tp_call_stream_state_changed_cb (DBusGProxy *channel,
- guint stream_id,
- guint stream_state,
- EmpathyTpCall *call)
-{
- EmpathyTpCallPriv *priv = GET_PRIV (call);
-
- empathy_debug (DEBUG_DOMAIN,
- "Stream state changed - stream id: %d, state state: %d",
- stream_id, stream_state);
-
- if (stream_id == priv->audio->id)
- {
- priv->audio->state = stream_state;
- }
- else if (stream_id == priv->video->id)
- {
- priv->video->state = stream_state;
- if (stream_state == TP_MEDIA_STREAM_STATE_CONNECTED)
- {
- if (priv->video->direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE)
- {
- empathy_debug (DEBUG_DOMAIN, "RECEIVING");
- g_signal_emit (call, signals[RECEIVING_VIDEO_SIGNAL], 0, TRUE);
- }
- if (priv->video->direction & TP_MEDIA_STREAM_DIRECTION_SEND)
- {
- empathy_debug (DEBUG_DOMAIN, "SENDING");
- g_signal_emit (call, signals[SENDING_VIDEO_SIGNAL], 0, TRUE);
- }
- }
- }
-
- g_signal_emit (call, signals[STATUS_CHANGED_SIGNAL], 0);
-}
-
-static void
-tp_call_identify_streams (EmpathyTpCall *call)
+tp_call_add_stream (EmpathyTpCall *call,
+ guint stream_id,
+ guint contact_handle,
+ guint stream_type,
+ guint stream_state,
+ guint stream_direction)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- GPtrArray *stream_infos;
- DBusGProxy *streamed_iface;
- GError *error = NULL;
- guint i;
-
- empathy_debug (DEBUG_DOMAIN, "Identifying audio/video streams");
-
- streamed_iface = tp_chan_get_interface (priv->channel,
- TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
-
- if (!tp_chan_type_streamed_media_list_streams (streamed_iface, &stream_infos,
- &error))
- {
- empathy_debug (DEBUG_DOMAIN, "Couldn't list audio/video streams: %s",
- error->message);
- g_clear_error (&error);
- return;
- }
- for (i = 0; i < stream_infos->len; i++)
+ switch (stream_type)
{
- GValueArray *values;
- guint stream_id;
- guint stream_handle;
- guint stream_type;
- guint stream_state;
- guint stream_direction;
-
- values = g_ptr_array_index (stream_infos, i);
- stream_id = g_value_get_uint (g_value_array_get_nth (values, 0));
- stream_handle = g_value_get_uint (g_value_array_get_nth (values, 1));
- stream_type = g_value_get_uint (g_value_array_get_nth (values, 2));
- stream_state = g_value_get_uint (g_value_array_get_nth (values, 3));
- stream_direction = g_value_get_uint (g_value_array_get_nth (values, 4));
-
- switch (stream_type)
- {
- case TP_MEDIA_STREAM_TYPE_AUDIO:
- empathy_debug (DEBUG_DOMAIN,
- "Audio stream - id: %d, state: %d, direction: %d",
- stream_id, stream_state, stream_direction);
- priv->audio->exists = TRUE;
- priv->audio->id = stream_id;
- priv->audio->state = stream_state;
- priv->audio->direction = stream_direction;
- break;
- case TP_MEDIA_STREAM_TYPE_VIDEO:
- empathy_debug (DEBUG_DOMAIN,
- "Video stream - id: %d, state: %d, direction: %d",
- stream_id, stream_state, stream_direction);
- priv->video->exists = TRUE;
- priv->video->id = stream_id;
- priv->video->state = stream_state;
- priv->video->direction = stream_direction;
- break;
- default:
- empathy_debug (DEBUG_DOMAIN, "Unknown stream type: %d",
- stream_type);
- }
-
- g_value_array_free (values);
+ case TP_MEDIA_STREAM_TYPE_AUDIO:
+ DEBUG ("Audio stream - id: %d, state: %d, direction: %d",
+ stream_id, stream_state, stream_direction);
+ priv->audio->exists = TRUE;
+ priv->audio->id = stream_id;
+ priv->audio->state = stream_state;
+ priv->audio->direction = stream_direction;
+ g_object_notify (G_OBJECT (call), "audio-stream");
+ break;
+ case TP_MEDIA_STREAM_TYPE_VIDEO:
+ DEBUG ("Video stream - id: %d, state: %d, direction: %d",
+ stream_id, stream_state, stream_direction);
+ priv->video->exists = TRUE;
+ priv->video->id = stream_id;
+ priv->video->state = stream_state;
+ priv->video->direction = stream_direction;
+ g_object_notify (G_OBJECT (call), "video-stream");
+ break;
+ default:
+ DEBUG ("Unknown stream type: %d", stream_type);
}
}
static void
-tp_call_stream_added_cb (DBusGProxy *channel,
+tp_call_stream_added_cb (TpChannel *channel,
guint stream_id,
guint contact_handle,
guint stream_type,
- EmpathyTpCall *call)
+ gpointer user_data,
+ GObject *call)
{
- empathy_debug (DEBUG_DOMAIN,
- "Stream added - stream id: %d, contact handle: %d, stream type: %d",
+ DEBUG ("Stream added - stream id: %d, contact handle: %d, stream type: %d",
stream_id, contact_handle, stream_type);
- tp_call_identify_streams (call);
+ tp_call_add_stream (EMPATHY_TP_CALL (call), stream_id, contact_handle,
+ stream_type, TP_MEDIA_STREAM_STATE_DISCONNECTED,
+ TP_MEDIA_STREAM_DIRECTION_NONE);
}
-
static void
-tp_call_stream_removed_cb (DBusGProxy *channel,
+tp_call_stream_removed_cb (TpChannel *channel,
guint stream_id,
- EmpathyTpCall *call)
+ gpointer user_data,
+ GObject *call)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- empathy_debug (DEBUG_DOMAIN, "Stream removed - stream id: %d", stream_id);
+ DEBUG ("Stream removed - stream id: %d", stream_id);
if (stream_id == priv->audio->id)
{
priv->audio->exists = FALSE;
+ g_object_notify (call, "audio-stream");
}
else if (stream_id == priv->video->id)
{
priv->video->exists = FALSE;
+ g_object_notify (call, "video-stream");
}
}
static void
-tp_call_channel_closed_cb (TpChan *channel,
- EmpathyTpCall *call)
+tp_call_stream_state_changed_cb (TpChannel *proxy,
+ guint stream_id,
+ guint stream_state,
+ gpointer user_data,
+ GObject *call)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- DBusGProxy *streamed_iface;
- DBusGProxy *group_iface;
- empathy_debug (DEBUG_DOMAIN, "Channel closed");
+ DEBUG ("Stream state changed - stream id: %d, state state: %d",
+ stream_id, stream_state);
- priv->status = EMPATHY_TP_CALL_STATUS_CLOSED;
- g_signal_emit (call, signals[STATUS_CHANGED_SIGNAL], 0);
-
- streamed_iface = tp_chan_get_interface (priv->channel,
- TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
- group_iface = tp_chan_get_interface (priv->channel,
- TELEPATHY_CHAN_IFACE_GROUP_QUARK);
-
- dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->channel), "Closed",
- G_CALLBACK (tp_call_channel_closed_cb), (gpointer) call);
- dbus_g_proxy_disconnect_signal (streamed_iface, "StreamStateChanged",
- G_CALLBACK (tp_call_stream_state_changed_cb), (gpointer) call);
- dbus_g_proxy_disconnect_signal (streamed_iface, "StreamAdded",
- G_CALLBACK (tp_call_stream_added_cb), (gpointer) call);
- dbus_g_proxy_disconnect_signal (streamed_iface, "StreamRemoved",
- G_CALLBACK (tp_call_stream_removed_cb), (gpointer) call);
+ if (stream_id == priv->audio->id)
+ {
+ priv->audio->state = stream_state;
+ g_object_notify (call, "audio-stream");
+ }
+ else if (stream_id == priv->video->id)
+ {
+ priv->video->state = stream_state;
+ g_object_notify (call, "video-stream");
+ }
}
static void
-tp_call_stream_direction_changed_cb (DBusGProxy *channel,
+tp_call_stream_direction_changed_cb (TpChannel *channel,
guint stream_id,
guint stream_direction,
- guint flags,
- EmpathyTpCall *call)
+ guint pending_flags,
+ gpointer user_data,
+ GObject *call)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- empathy_debug (DEBUG_DOMAIN,
- "Stream direction changed - stream: %d, direction: %d",
+ DEBUG ("Stream direction changed - stream: %d, direction: %d",
stream_id, stream_direction);
if (stream_id == priv->audio->id)
{
priv->audio->direction = stream_direction;
+ g_object_notify (call, "audio-stream");
}
else if (stream_id == priv->video->id)
{
priv->video->direction = stream_direction;
+ g_object_notify (call, "video-stream");
+ }
+}
- if (stream_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE)
- {
- empathy_debug (DEBUG_DOMAIN, "RECEIVING");
- g_signal_emit (call, signals[RECEIVING_VIDEO_SIGNAL], 0, TRUE);
- }
- else
- {
- empathy_debug (DEBUG_DOMAIN, "NOT RECEIVING");
- g_signal_emit (call, signals[RECEIVING_VIDEO_SIGNAL], 0, FALSE);
- }
+static void
+tp_call_request_streams_cb (TpChannel *channel,
+ const GPtrArray *streams,
+ const GError *error,
+ gpointer user_data,
+ GObject *call)
+{
+ guint i;
- if (stream_direction & TP_MEDIA_STREAM_DIRECTION_SEND)
- {
- empathy_debug (DEBUG_DOMAIN, "SENDING");
- g_signal_emit (call, signals[SENDING_VIDEO_SIGNAL], 0, TRUE);
- }
- else
- {
- empathy_debug (DEBUG_DOMAIN, "NOT SENDING");
- g_signal_emit (call, signals[SENDING_VIDEO_SIGNAL], 0, FALSE);
- }
+ if (error)
+ {
+ DEBUG ("Error requesting streams: %s", error->message);
+ return;
}
+
+ for (i = 0; i < streams->len; i++)
+ {
+ GValueArray *values;
+ guint stream_id;
+ guint contact_handle;
+ guint stream_type;
+ guint stream_state;
+ guint stream_direction;
+
+ values = g_ptr_array_index (streams, i);
+ stream_id = g_value_get_uint (g_value_array_get_nth (values, 0));
+ contact_handle = g_value_get_uint (g_value_array_get_nth (values, 1));
+ stream_type = g_value_get_uint (g_value_array_get_nth (values, 2));
+ stream_state = g_value_get_uint (g_value_array_get_nth (values, 3));
+ stream_direction = g_value_get_uint (g_value_array_get_nth (values, 4));
+
+ tp_call_add_stream (EMPATHY_TP_CALL (call), stream_id, contact_handle,
+ stream_type, stream_state, stream_direction);
+ }
}
static void
EmpathyCapabilities capabilities)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- DBusGProxy *streamed_iface;
GArray *stream_types;
guint handle;
guint stream_type;
- GError *error = NULL;
- empathy_debug (DEBUG_DOMAIN, "Requesting new stream for capabilities %d",
+ if (capabilities == EMPATHY_CAPABILITIES_UNKNOWN)
+ capabilities = EMPATHY_CAPABILITIES_AUDIO | EMPATHY_CAPABILITIES_VIDEO;
+
+ DEBUG ("Requesting new stream for capabilities %d",
capabilities);
- streamed_iface = tp_chan_get_interface (priv->channel,
- TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
stream_types = g_array_new (FALSE, FALSE, sizeof (guint));
handle = empathy_contact_get_handle (priv->contact);
g_array_append_val (stream_types, stream_type);
}
- if (!tp_chan_type_streamed_media_request_streams (streamed_iface, handle,
- stream_types, NULL, &error))
- {
- empathy_debug (DEBUG_DOMAIN, "Couldn't request new stream: %s",
- error->message);
- g_clear_error (&error);
- }
+ tp_cli_channel_type_streamed_media_call_request_streams (priv->channel, -1,
+ handle, stream_types, tp_call_request_streams_cb, NULL, NULL,
+ G_OBJECT (call));
g_array_free (stream_types, TRUE);
}
static void
-tp_call_request_streams_capabilities_cb (EmpathyContact *contact,
- GParamSpec *property,
- gpointer user_data)
-{
- EmpathyTpCall *call = EMPATHY_TP_CALL (user_data);
-
- g_signal_handlers_disconnect_by_func (contact,
- tp_call_request_streams_capabilities_cb,
- user_data);
-
- tp_call_request_streams_for_capabilities (call,
- empathy_contact_get_capabilities (contact));
-}
-
-static void
-tp_call_request_streams (EmpathyTpCall *call)
+tp_call_got_contact_cb (EmpathyTpContactFactory *factory,
+ EmpathyContact *contact,
+ const GError *error,
+ gpointer user_data,
+ GObject *call)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- EmpathyCapabilities capabilities;
- DBusGProxy *capabilities_iface;
-
- empathy_debug (DEBUG_DOMAIN,
- "Requesting appropriate audio/video streams from contact");
-
- /* FIXME: SIP don't have capabilities interface but we know it supports
- * only audio and not video. */
- capabilities_iface = tp_conn_get_interface (priv->connection,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES);
- if (!capabilities_iface)
- {
- capabilities = EMPATHY_CAPABILITIES_AUDIO;
- }
- else
+ if (error)
{
- capabilities = empathy_contact_get_capabilities (priv->contact);
- if (capabilities == EMPATHY_CAPABILITIES_UNKNOWN)
- {
- g_signal_connect (priv->contact, "notify::capabilities",
- G_CALLBACK (tp_call_request_streams_capabilities_cb), call);
- return;
- }
+ DEBUG ("Error: %s", error->message);
+ return;
}
- tp_call_request_streams_for_capabilities (call, capabilities);
+ priv->contact = g_object_ref (contact);
+ priv->is_incoming = TRUE;
+ priv->status = EMPATHY_TP_CALL_STATUS_PENDING;
+ g_object_notify (G_OBJECT (call), "is-incoming");
+ g_object_notify (G_OBJECT (call), "contact");
+ g_object_notify (G_OBJECT (call), "status");
}
static void
-tp_call_is_ready (EmpathyTpCall *call)
+tp_call_update_status (EmpathyTpCall *call)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- GList *members;
- GList *local_pendings;
- GList *remote_pendings;
-
- if (priv->status > EMPATHY_TP_CALL_STATUS_READYING)
- return;
+ TpHandle self_handle;
+ const TpIntSet *set;
+ TpIntSetIter iter;
- members = empathy_tp_group_get_members (priv->group);
- if (!members)
- return;
-
- local_pendings = empathy_tp_group_get_local_pendings (priv->group);
- remote_pendings = empathy_tp_group_get_remote_pendings (priv->group);
+ g_object_ref (call);
- if (local_pendings &&
- empathy_contact_is_user (((EmpathyPendingInfo *) local_pendings->data)->member))
- {
- empathy_debug (DEBUG_DOMAIN,
- "Incoming call is ready - %p",
- ((EmpathyPendingInfo *) local_pendings->data)->member);
- priv->is_incoming = TRUE;
- priv->contact = g_object_ref (members->data);
- }
- else if (remote_pendings && empathy_contact_is_user (members->data))
+ self_handle = tp_channel_group_get_self_handle (priv->channel);
+ set = tp_channel_group_get_members (priv->channel);
+ tp_intset_iter_init (&iter, set);
+ while (tp_intset_iter_next (&iter))
{
- empathy_debug (DEBUG_DOMAIN,
- "Outgoing call is ready - %p", remote_pendings->data);
- priv->is_incoming = FALSE;
- priv->contact = g_object_ref (remote_pendings->data);
- tp_call_request_streams (call);
- }
-
- g_list_foreach (members, (GFunc) g_object_unref, NULL);
- g_list_free (members);
- g_list_foreach (local_pendings, (GFunc) empathy_pending_info_free, NULL);
- g_list_free (local_pendings);
- g_list_foreach (remote_pendings, (GFunc) g_object_unref, NULL);
- g_list_free (remote_pendings);
-
- if (priv->contact)
- {
- priv->status = EMPATHY_TP_CALL_STATUS_PENDING;
- g_signal_emit (call, signals[STATUS_CHANGED_SIGNAL], 0);
- }
-}
-
-static void
-tp_call_member_added_cb (EmpathyTpGroup *group,
- EmpathyContact *contact,
- EmpathyContact *actor,
- guint reason,
- const gchar *message,
- EmpathyTpCall *call)
-{
- EmpathyTpCallPriv *priv = GET_PRIV (call);
-
- empathy_debug (DEBUG_DOMAIN, "New member added callback %p", contact);
- tp_call_is_ready (call);
+ if (priv->contact == NULL && iter.element != self_handle)
+ {
+ EmpathyTpContactFactory *factory;
+ TpConnection *connection;
+
+ /* We found the remote contact */
+ connection = tp_channel_borrow_connection (priv->channel);
+ factory = empathy_tp_contact_factory_dup_singleton (connection);
+ empathy_tp_contact_factory_get_from_handle (factory, iter.element,
+ tp_call_got_contact_cb, NULL, NULL, G_OBJECT (call));
+ g_object_unref (factory);
+ }
- if (priv->status == EMPATHY_TP_CALL_STATUS_PENDING)
- {
- if ((priv->is_incoming && contact != priv->contact) ||
- (!priv->is_incoming && contact == priv->contact))
+ if (priv->status == EMPATHY_TP_CALL_STATUS_PENDING &&
+ ((priv->is_incoming && iter.element == self_handle) ||
+ (!priv->is_incoming && iter.element != self_handle)))
{
priv->status = EMPATHY_TP_CALL_STATUS_ACCEPTED;
- g_signal_emit (call, signals[STATUS_CHANGED_SIGNAL], 0);
+ g_object_notify (G_OBJECT (call), "status");
}
}
+
+ g_object_unref (call);
}
-static void
-tp_call_local_pending_cb (EmpathyTpGroup *group,
- EmpathyContact *contact,
- EmpathyContact *actor,
- guint reason,
- const gchar *message,
- EmpathyTpCall *call)
+void
+empathy_tp_call_to (EmpathyTpCall *call, EmpathyContact *contact)
{
- empathy_debug (DEBUG_DOMAIN, "New local pending added callback %p", contact);
- tp_call_is_ready (call);
+ EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+ priv->contact = g_object_ref (contact);
+ priv->is_incoming = FALSE;
+ priv->status = EMPATHY_TP_CALL_STATUS_PENDING;
+ g_object_notify (G_OBJECT (call), "is-incoming");
+ g_object_notify (G_OBJECT (call), "contact");
+ g_object_notify (G_OBJECT (call), "status");
+ tp_call_request_streams_for_capabilities (call, EMPATHY_CAPABILITIES_AUDIO);
}
static void
-tp_call_remote_pending_cb (EmpathyTpGroup *group,
- EmpathyContact *contact,
- EmpathyContact *actor,
- guint reason,
- const gchar *message,
- EmpathyTpCall *call)
+tp_call_channel_invalidated_cb (TpChannel *channel,
+ GQuark domain,
+ gint code,
+ gchar *message,
+ EmpathyTpCall *call)
{
- empathy_debug (DEBUG_DOMAIN, "New remote pending added callback %p", contact);
- tp_call_is_ready (call);
+ EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+ DEBUG ("Channel invalidated: %s", message);
+ priv->status = EMPATHY_TP_CALL_STATUS_CLOSED;
+ g_object_notify (G_OBJECT (call), "status");
}
static void
GObject *call)
{
if (error)
- {
- empathy_debug (DEBUG_DOMAIN, "Error %s: %s",
- user_data, error->message);
- }
-}
-
-static void
-tp_call_invalidated_cb (TpProxy *stream_engine,
- GQuark domain,
- gint code,
- gchar *message,
- EmpathyTpCall *call)
-{
- empathy_debug (DEBUG_DOMAIN, "Stream engine proxy invalidated: %s",
- message);
- empathy_tp_call_close_channel (call);
-}
-
-static void
-tp_call_watch_name_owner_cb (TpDBusDaemon *daemon,
- const gchar *name,
- const gchar *new_owner,
- gpointer call)
-{
- EmpathyTpCallPriv *priv = GET_PRIV (call);
-
- /* G_STR_EMPTY(new_owner) means either stream-engine has not started yet or
- * has crashed. We want to close the channel if stream-engine has crashed.
- * */
- empathy_debug (DEBUG_DOMAIN,
- "Watch SE: name='%s' SE started='%s' new_owner='%s'",
- name, priv->stream_engine_started ? "yes" : "no",
- new_owner ? new_owner : "none");
- if (priv->stream_engine_started && G_STR_EMPTY (new_owner))
- {
- empathy_debug (DEBUG_DOMAIN, "Stream engine falled off the bus");
- empathy_tp_call_close_channel (call);
- }
- priv->stream_engine_started = ! G_STR_EMPTY (new_owner);
-}
-
-static void
-tp_call_start_stream_engine (EmpathyTpCall *call)
-{
- EmpathyTpCallPriv *priv = GET_PRIV (call);
-
- empathy_debug (DEBUG_DOMAIN, "Revving up the stream engine");
-
- priv->stream_engine = g_object_new (TP_TYPE_PROXY,
- "bus-name", STREAM_ENGINE_BUS_NAME,
- "dbus-connection", tp_get_bus (),
- "object-path", STREAM_ENGINE_OBJECT_PATH,
- NULL);
- tp_proxy_add_interface_by_id (priv->stream_engine,
- EMP_IFACE_QUARK_STREAM_ENGINE);
- tp_proxy_add_interface_by_id (priv->stream_engine,
- EMP_IFACE_QUARK_CHANNEL_HANDLER);
-
- g_signal_connect (priv->stream_engine, "invalidated",
- G_CALLBACK (tp_call_invalidated_cb),
- call);
-
- /* FIXME: dbus daemon should be unique */
- priv->dbus_daemon = tp_dbus_daemon_new (tp_get_bus ());
- tp_dbus_daemon_watch_name_owner (priv->dbus_daemon, STREAM_ENGINE_BUS_NAME,
- tp_call_watch_name_owner_cb,
- call, NULL);
-
- emp_cli_channel_handler_call_handle_channel (priv->stream_engine, -1,
- dbus_g_proxy_get_bus_name (DBUS_G_PROXY (priv->connection)),
- dbus_g_proxy_get_path (DBUS_G_PROXY (priv->connection)),
- priv->channel->type,
- dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
- priv->channel->handle_type, priv->channel->handle,
- tp_call_async_cb,
- "calling handle channel", NULL,
- G_OBJECT (call));
+ DEBUG ("Error %s: %s", (gchar*) user_data, error->message);
}
static GObject *
GObject *object;
EmpathyTpCall *call;
EmpathyTpCallPriv *priv;
- DBusGProxy *streamed_iface;
- MissionControl *mc;
- McAccount *account;
object = G_OBJECT_CLASS (empathy_tp_call_parent_class)->constructor (type,
n_construct_params, construct_params);
call = EMPATHY_TP_CALL (object);
priv = GET_PRIV (call);
- dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->channel), "Closed",
- G_CALLBACK (tp_call_channel_closed_cb), (gpointer) call, NULL);
-
- streamed_iface = tp_chan_get_interface (priv->channel,
- TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
- dbus_g_proxy_connect_signal (streamed_iface, "StreamStateChanged",
- G_CALLBACK (tp_call_stream_state_changed_cb),
- (gpointer) call, NULL);
- dbus_g_proxy_connect_signal (streamed_iface, "StreamDirectionChanged",
- G_CALLBACK (tp_call_stream_direction_changed_cb),
- (gpointer) call, NULL);
- dbus_g_proxy_connect_signal (streamed_iface, "StreamAdded",
- G_CALLBACK (tp_call_stream_added_cb), (gpointer) call, NULL);
- dbus_g_proxy_connect_signal (streamed_iface, "StreamRemoved",
- G_CALLBACK (tp_call_stream_removed_cb), (gpointer) call, NULL);
-
- mc = empathy_mission_control_new ();
- account = mission_control_get_account_for_connection (mc, priv->connection,
- NULL);
- priv->group = empathy_tp_group_new (account, priv->channel);
- g_object_unref (mc);
-
- g_signal_connect (G_OBJECT (priv->group), "member-added",
- G_CALLBACK (tp_call_member_added_cb), (gpointer) call);
- g_signal_connect (G_OBJECT (priv->group), "local-pending",
- G_CALLBACK (tp_call_local_pending_cb), (gpointer) call);
- g_signal_connect (G_OBJECT (priv->group), "remote-pending",
- G_CALLBACK (tp_call_remote_pending_cb), (gpointer) call);
-
- tp_call_start_stream_engine (call);
- /* FIXME: unnecessary for outgoing? */
- tp_call_identify_streams (call);
+ /* Setup streamed media channel */
+ g_signal_connect (priv->channel, "invalidated",
+ G_CALLBACK (tp_call_channel_invalidated_cb), call);
+ tp_cli_channel_type_streamed_media_connect_to_stream_added (priv->channel,
+ tp_call_stream_added_cb, NULL, NULL, G_OBJECT (call), NULL);
+ tp_cli_channel_type_streamed_media_connect_to_stream_removed (priv->channel,
+ tp_call_stream_removed_cb, NULL, NULL, G_OBJECT (call), NULL);
+ tp_cli_channel_type_streamed_media_connect_to_stream_state_changed (priv->channel,
+ tp_call_stream_state_changed_cb, NULL, NULL, G_OBJECT (call), NULL);
+ tp_cli_channel_type_streamed_media_connect_to_stream_direction_changed (priv->channel,
+ tp_call_stream_direction_changed_cb, NULL, NULL, G_OBJECT (call), NULL);
+ tp_cli_channel_type_streamed_media_call_list_streams (priv->channel, -1,
+ tp_call_request_streams_cb, NULL, NULL, G_OBJECT (call));
+
+ /* Update status when members changes */
+ tp_call_update_status (call);
+ g_signal_connect_swapped (priv->channel, "group-members-changed",
+ G_CALLBACK (tp_call_update_status), call);
return object;
}
-
-static void
-tp_call_finalize (GObject *object)
+static void
+tp_call_dispose (GObject *object)
{
EmpathyTpCallPriv *priv = GET_PRIV (object);
- empathy_debug (DEBUG_DOMAIN, "Finalizing: %p", object);
+ DEBUG ("Disposing: %p, %d", object, priv->dispose_has_run);
- g_slice_free (EmpathyTpCallStream, priv->audio);
- g_slice_free (EmpathyTpCallStream, priv->video);
- g_object_unref (priv->group);
+ if (priv->dispose_has_run)
+ return;
- if (priv->connection != NULL)
- g_object_unref (priv->connection);
+ priv->dispose_has_run = TRUE;
if (priv->channel != NULL)
- g_object_unref (priv->channel);
+ {
+ g_signal_handlers_disconnect_by_func (priv->channel,
+ tp_call_channel_invalidated_cb, object);
- if (priv->stream_engine != NULL)
- g_object_unref (priv->stream_engine);
+ g_object_unref (priv->channel);
+ priv->channel = NULL;
+ }
if (priv->contact != NULL)
g_object_unref (priv->contact);
- if (priv->dbus_daemon != NULL)
- {
- tp_dbus_daemon_cancel_name_owner_watch (priv->dbus_daemon,
- STREAM_ENGINE_BUS_NAME,
- tp_call_watch_name_owner_cb,
- object);
- g_object_unref (priv->dbus_daemon);
- }
+ if (G_OBJECT_CLASS (empathy_tp_call_parent_class)->dispose)
+ G_OBJECT_CLASS (empathy_tp_call_parent_class)->dispose (object);
+}
+
+static void
+tp_call_finalize (GObject *object)
+{
+ EmpathyTpCallPriv *priv = GET_PRIV (object);
+
+ DEBUG ("Finalizing: %p", object);
+
+ g_slice_free (EmpathyTpCallStream, priv->audio);
+ g_slice_free (EmpathyTpCallStream, priv->video);
(G_OBJECT_CLASS (empathy_tp_call_parent_class)->finalize) (object);
}
-static void
+static void
tp_call_set_property (GObject *object,
guint prop_id,
const GValue *value,
switch (prop_id)
{
- case PROP_CONNECTION:
- priv->connection = g_value_dup_object (value);
- break;
case PROP_CHANNEL:
priv->channel = g_value_dup_object (value);
break;
- case PROP_CONTACT:
- /* FIXME should this one be writable in the first place ? */
- g_assert (priv->contact == NULL);
- priv->contact = g_value_dup_object (value);
- break;
- case PROP_IS_INCOMING:
- priv->is_incoming = g_value_get_boolean (value);
- break;
- case PROP_STATUS:
- priv->status = g_value_get_uint (value);
- break;
- case PROP_AUDIO_STREAM:
- priv->audio = g_value_get_pointer (value);
- break;
- case PROP_VIDEO_STREAM:
- priv->video = g_value_get_pointer (value);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
-
static void
tp_call_get_property (GObject *object,
guint prop_id,
switch (prop_id)
{
- case PROP_CONNECTION:
- g_value_set_object (value, priv->connection);
- break;
case PROP_CHANNEL:
g_value_set_object (value, priv->channel);
break;
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- emp_cli_init ();
-
object_class->constructor = tp_call_constructor;
+ object_class->dispose = tp_call_dispose;
object_class->finalize = tp_call_finalize;
object_class->set_property = tp_call_set_property;
object_class->get_property = tp_call_get_property;
g_type_class_add_private (klass, sizeof (EmpathyTpCallPriv));
- signals[STATUS_CHANGED_SIGNAL] =
- g_signal_new ("status-changed", G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
- signals[RECEIVING_VIDEO_SIGNAL] =
- g_signal_new ("receiving-video", G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
- signals[SENDING_VIDEO_SIGNAL] =
- g_signal_new ("sending-video", G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
- g_object_class_install_property (object_class, PROP_CONNECTION,
- g_param_spec_object ("connection", "connection", "connection",
- TELEPATHY_CONN_TYPE,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
g_object_class_install_property (object_class, PROP_CHANNEL,
g_param_spec_object ("channel", "channel", "channel",
- TELEPATHY_CHAN_TYPE,
+ TP_TYPE_CHANNEL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
g_object_class_install_property (object_class, PROP_CONTACT,
static void
empathy_tp_call_init (EmpathyTpCall *call)
{
- EmpathyTpCallPriv *priv = GET_PRIV (call);
+ EmpathyTpCallPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (call,
+ EMPATHY_TYPE_TP_CALL, EmpathyTpCallPriv);
+ call->priv = priv;
priv->status = EMPATHY_TP_CALL_STATUS_READYING;
priv->contact = NULL;
- priv->stream_engine_started = FALSE;
priv->audio = g_slice_new0 (EmpathyTpCallStream);
priv->video = g_slice_new0 (EmpathyTpCallStream);
priv->audio->exists = FALSE;
}
EmpathyTpCall *
-empathy_tp_call_new (TpConn *connection, TpChan *channel)
+empathy_tp_call_new (TpChannel *channel)
{
+ g_return_val_if_fail (TP_IS_CHANNEL (channel), NULL);
+
return g_object_new (EMPATHY_TYPE_TP_CALL,
- "connection", connection,
"channel", channel,
NULL);
}
empathy_tp_call_accept_incoming_call (EmpathyTpCall *call)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- EmpathyContact *self_contact;
+ TpHandle self_handle;
+ GArray handles = {(gchar *) &self_handle, 1};
+
+ g_return_if_fail (EMPATHY_IS_TP_CALL (call));
+ g_return_if_fail (priv->status == EMPATHY_TP_CALL_STATUS_PENDING);
+ g_return_if_fail (priv->is_incoming);
- empathy_debug (DEBUG_DOMAIN, "Accepting incoming call");
+ DEBUG ("Accepting incoming call");
- self_contact = empathy_tp_group_get_self_contact (priv->group);
- empathy_tp_group_add_member (priv->group, self_contact, NULL);
- g_object_unref (self_contact);
+ self_handle = tp_channel_group_get_self_handle (priv->channel);
+ tp_cli_channel_interface_group_call_add_members (priv->channel, -1,
+ &handles, NULL, NULL, NULL, NULL, NULL);
}
void
-empathy_tp_call_request_video_stream_direction (EmpathyTpCall *call,
- gboolean is_sending)
+empathy_tp_call_close (EmpathyTpCall *call)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- DBusGProxy *streamed_iface;
- guint new_direction;
- GError *error = NULL;
- empathy_debug (DEBUG_DOMAIN,
- "Requesting video stream direction - is_sending: %d", is_sending);
+ g_return_if_fail (EMPATHY_IS_TP_CALL (call));
- if (!priv->video->exists)
- {
- tp_call_request_streams_for_capabilities (call, EMPATHY_CAPABILITIES_VIDEO);
+ if (priv->status == EMPATHY_TP_CALL_STATUS_CLOSED)
return;
- }
- streamed_iface = tp_chan_get_interface (priv->channel,
- TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
+ DEBUG ("Closing channel");
- if (is_sending)
- {
- new_direction = priv->video->direction | TP_MEDIA_STREAM_DIRECTION_SEND;
- }
- else
- {
- new_direction = priv->video->direction & ~TP_MEDIA_STREAM_DIRECTION_SEND;
- }
+ tp_cli_channel_call_close (priv->channel, -1,
+ NULL, NULL, NULL, NULL);
- if (!tp_chan_type_streamed_media_request_stream_direction (streamed_iface,
- priv->video->id, new_direction, &error))
- {
- empathy_debug (DEBUG_DOMAIN,
- "Couldn't request video stream direction: %s", error->message);
- g_clear_error (&error);
- }
+ priv->status = EMPATHY_TP_CALL_STATUS_CLOSED;
+ g_object_notify (G_OBJECT (call), "status");
}
void
-empathy_tp_call_close_channel (EmpathyTpCall *call)
+empathy_tp_call_request_video_stream_direction (EmpathyTpCall *call,
+ gboolean is_sending)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- GError *error = NULL;
+ guint new_direction;
- if (priv->status == EMPATHY_TP_CALL_STATUS_CLOSED)
- return;
+ g_return_if_fail (EMPATHY_IS_TP_CALL (call));
+ g_return_if_fail (priv->status == EMPATHY_TP_CALL_STATUS_ACCEPTED);
- empathy_debug (DEBUG_DOMAIN, "Closing channel");
+ DEBUG ("Requesting video stream direction - is_sending: %d", is_sending);
- if (!tp_chan_close (DBUS_G_PROXY (priv->channel), &error))
+ if (!priv->video->exists)
{
- empathy_debug (DEBUG_DOMAIN, "Error closing channel: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
+ if (is_sending)
+ tp_call_request_streams_for_capabilities (call,
+ EMPATHY_CAPABILITIES_VIDEO);
+ return;
}
- else
- priv->status = EMPATHY_TP_CALL_STATUS_CLOSED;
-}
-
-void
-empathy_tp_call_add_preview_video (EmpathyTpCall *call,
- guint preview_video_socket_id)
-{
- EmpathyTpCallPriv *priv = GET_PRIV (call);
-
- empathy_debug (DEBUG_DOMAIN, "Adding preview video");
- emp_cli_stream_engine_call_add_preview_window (priv->stream_engine, -1,
- preview_video_socket_id,
- tp_call_async_cb,
- "adding preview window", NULL,
- G_OBJECT (call));
-}
-
-void
-empathy_tp_call_remove_preview_video (EmpathyTpCall *call,
- guint preview_video_socket_id)
-{
- EmpathyTpCallPriv *priv = GET_PRIV (call);
-
- empathy_debug (DEBUG_DOMAIN, "Removing preview video");
-
- emp_cli_stream_engine_call_remove_preview_window (priv->stream_engine, -1,
- preview_video_socket_id,
- tp_call_async_cb,
- "removing preview window", NULL,
- G_OBJECT (call));
-}
-
-void
-empathy_tp_call_add_output_video (EmpathyTpCall *call,
- guint output_video_socket_id)
-{
- EmpathyTpCallPriv *priv = GET_PRIV (call);
-
- empathy_debug (DEBUG_DOMAIN, "Adding output video - socket: %d",
- output_video_socket_id);
+ if (is_sending)
+ new_direction = priv->video->direction | TP_MEDIA_STREAM_DIRECTION_SEND;
+ else
+ new_direction = priv->video->direction & ~TP_MEDIA_STREAM_DIRECTION_SEND;
- emp_cli_stream_engine_call_set_output_window (priv->stream_engine, -1,
- dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
- priv->video->id, output_video_socket_id,
- tp_call_async_cb,
- "setting output window", NULL,
- G_OBJECT (call));
+ tp_cli_channel_type_streamed_media_call_request_stream_direction (priv->channel,
+ -1, priv->video->id, new_direction,
+ (tp_cli_channel_type_streamed_media_callback_for_request_stream_direction)
+ tp_call_async_cb, NULL, NULL, G_OBJECT (call));
}
void
-empathy_tp_call_set_output_volume (EmpathyTpCall *call,
- guint volume)
+empathy_tp_call_start_tone (EmpathyTpCall *call, TpDTMFEvent event)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- if (priv->status == EMPATHY_TP_CALL_STATUS_CLOSED)
- return;
+ g_return_if_fail (EMPATHY_IS_TP_CALL (call));
+ g_return_if_fail (priv->status == EMPATHY_TP_CALL_STATUS_ACCEPTED);
- empathy_debug (DEBUG_DOMAIN, "Setting output volume: %d", volume);
+ if (!priv->audio->exists)
+ return;
- emp_cli_stream_engine_call_set_output_volume (priv->stream_engine, -1,
- dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
- priv->audio->id, volume,
- tp_call_async_cb,
- "setting output volume", NULL,
- G_OBJECT (call));
+ tp_cli_channel_interface_dtmf_call_start_tone (priv->channel, -1,
+ priv->audio->id, event,
+ (tp_cli_channel_interface_dtmf_callback_for_start_tone) tp_call_async_cb,
+ "starting tone", NULL, G_OBJECT (call));
}
void
-empathy_tp_call_mute_output (EmpathyTpCall *call,
- gboolean is_muted)
+empathy_tp_call_stop_tone (EmpathyTpCall *call)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- if (priv->status == EMPATHY_TP_CALL_STATUS_CLOSED)
- return;
+ g_return_if_fail (EMPATHY_IS_TP_CALL (call));
+ g_return_if_fail (priv->status == EMPATHY_TP_CALL_STATUS_ACCEPTED);
- empathy_debug (DEBUG_DOMAIN, "Setting output mute: %d", is_muted);
+ if (!priv->audio->exists)
+ return;
- emp_cli_stream_engine_call_mute_output (priv->stream_engine, -1,
- dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
- priv->audio->id, is_muted,
- tp_call_async_cb,
- "muting output", NULL,
- G_OBJECT (call));
+ tp_cli_channel_interface_dtmf_call_stop_tone (priv->channel, -1,
+ priv->audio->id,
+ (tp_cli_channel_interface_dtmf_callback_for_stop_tone) tp_call_async_cb,
+ "stoping tone", NULL, G_OBJECT (call));
}
-void
-empathy_tp_call_mute_input (EmpathyTpCall *call,
- gboolean is_muted)
+gboolean
+empathy_tp_call_has_dtmf (EmpathyTpCall *call)
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- if (priv->status == EMPATHY_TP_CALL_STATUS_CLOSED)
- return;
+ g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE);
- empathy_debug (DEBUG_DOMAIN, "Setting input mute: %d", is_muted);
-
- emp_cli_stream_engine_call_mute_input (priv->stream_engine, -1,
- dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
- priv->audio->id, is_muted,
- tp_call_async_cb,
- "muting input", NULL,
- G_OBJECT (call));
+ return tp_proxy_has_interface_by_id (priv->channel,
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF);
}
projects / empathy.git / blobdiff