From f22e466ab6e525a148145f66aed3ce4a0f23128a Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Wed, 9 Feb 2011 16:29:24 +0000 Subject: EmpathyCallFactory -> EmpathyStreamedMediaFactory --- libempathy/Makefile.am | 4 +- libempathy/empathy-call-factory.c | 342 ---------------------------- libempathy/empathy-call-factory.h | 82 ------- libempathy/empathy-streamed-media-factory.c | 342 ++++++++++++++++++++++++++++ libempathy/empathy-streamed-media-factory.h | 82 +++++++ libempathy/empathy-streamed-media-handler.c | 8 +- libempathy/empathy-streamed-media-handler.h | 2 +- 7 files changed, 431 insertions(+), 431 deletions(-) delete mode 100644 libempathy/empathy-call-factory.c delete mode 100644 libempathy/empathy-call-factory.h create mode 100644 libempathy/empathy-streamed-media-factory.c create mode 100644 libempathy/empathy-streamed-media-factory.h (limited to 'libempathy') diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 025515604..b2d88885f 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -28,7 +28,6 @@ noinst_LTLIBRARIES = libempathy.la libempathy_headers = \ empathy-account-settings.h \ empathy-auth-factory.h \ - empathy-call-factory.h \ empathy-chatroom-manager.h \ empathy-chatroom.h \ empathy-connection-managers.h \ @@ -53,6 +52,7 @@ libempathy_headers = \ empathy-server-sasl-handler.h \ empathy-server-tls-handler.h \ empathy-status-presets.h \ + empathy-streamed-media-factory.h \ empathy-streamed-media-handler.h \ empathy-time.h \ empathy-tls-certificate.h \ @@ -70,7 +70,6 @@ libempathy_la_SOURCES = \ $(libempathy_headers) \ empathy-account-settings.c \ empathy-auth-factory.c \ - empathy-call-factory.c \ empathy-chatroom-manager.c \ empathy-chatroom.c \ empathy-connection-managers.c \ @@ -93,6 +92,7 @@ libempathy_la_SOURCES = \ empathy-server-sasl-handler.c \ empathy-server-tls-handler.c \ empathy-status-presets.c \ + empathy-streamed-media-factory.c \ empathy-streamed-media-handler.c \ empathy-time.c \ empathy-tls-certificate.c \ diff --git a/libempathy/empathy-call-factory.c b/libempathy/empathy-call-factory.c deleted file mode 100644 index 281434cbe..000000000 --- a/libempathy/empathy-call-factory.c +++ /dev/null @@ -1,342 +0,0 @@ -/* - * empathy-call-factory.c - Source for EmpathyCallFactory - * Copyright (C) 2008 Collabora Ltd. - * @author Sjoerd Simons - * - * 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. - * - * 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 - */ - - -#include -#include - -#include -#include -#include -#include - -#include "empathy-dispatcher.h" -#include "empathy-marshal.h" -#include "empathy-call-factory.h" -#include "empathy-utils.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include - -G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, G_TYPE_OBJECT) - -static void handle_channels_cb (TpSimpleHandler *handler, - TpAccount *account, - TpConnection *connection, - GList *channels, - GList *requests_satisfied, - gint64 user_action_time, - TpHandleChannelsContext *context, - gpointer user_data); - -/* signal enum */ -enum -{ - NEW_STREAMED_MEDIA_HANDLER, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = {0}; - -/* private structure */ -typedef struct { - TpBaseClient *handler; - gboolean dispose_has_run; -} EmpathyCallFactoryPriv; - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCallFactory) - -static GObject *call_factory = NULL; - -static void -empathy_call_factory_init (EmpathyCallFactory *obj) -{ - EmpathyCallFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj, - EMPATHY_TYPE_CALL_FACTORY, EmpathyCallFactoryPriv); - TpDBusDaemon *dbus; - GError *error = NULL; - - obj->priv = priv; - - dbus = tp_dbus_daemon_dup (&error); - if (dbus == NULL) - { - g_warning ("Failed to get TpDBusDaemon: %s", error->message); - g_error_free (error); - return; - } - - priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, - "Empathy.AudioVideo", FALSE, handle_channels_cb, obj, NULL); - - tp_base_client_take_handler_filter (priv->handler, 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, - NULL)); - - tp_base_client_take_handler_filter (priv->handler, 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_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE, - NULL)); - - tp_base_client_take_handler_filter (priv->handler, 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_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE, - NULL)); - - tp_base_client_add_handler_capabilities_varargs (priv->handler, - "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp", - "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p", - "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264", - NULL); - - g_object_unref (dbus); -} - -static GObject * -empathy_call_factory_constructor (GType type, guint n_construct_params, - GObjectConstructParam *construct_params) -{ - g_return_val_if_fail (call_factory == NULL, NULL); - - call_factory = G_OBJECT_CLASS (empathy_call_factory_parent_class)->constructor - (type, n_construct_params, construct_params); - g_object_add_weak_pointer (call_factory, (gpointer)&call_factory); - - return call_factory; -} - -static void -empathy_call_factory_finalize (GObject *object) -{ - /* free any data held directly by the object here */ - - if (G_OBJECT_CLASS (empathy_call_factory_parent_class)->finalize) - G_OBJECT_CLASS (empathy_call_factory_parent_class)->finalize (object); -} - -static void -empathy_call_factory_dispose (GObject *object) -{ - EmpathyCallFactoryPriv *priv = GET_PRIV (object); - - if (priv->dispose_has_run) - return; - - priv->dispose_has_run = TRUE; - - tp_clear_object (&priv->handler); - - if (G_OBJECT_CLASS (empathy_call_factory_parent_class)->dispose) - G_OBJECT_CLASS (empathy_call_factory_parent_class)->dispose (object); -} - -static void -empathy_call_factory_class_init ( - EmpathyCallFactoryClass *empathy_call_factory_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (empathy_call_factory_class); - - g_type_class_add_private (empathy_call_factory_class, - sizeof (EmpathyCallFactoryPriv)); - - object_class->constructor = empathy_call_factory_constructor; - object_class->dispose = empathy_call_factory_dispose; - object_class->finalize = empathy_call_factory_finalize; - - signals[NEW_STREAMED_MEDIA_HANDLER] = - g_signal_new ("new-streamed-media-handler", - G_TYPE_FROM_CLASS (empathy_call_factory_class), - G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _empathy_marshal_VOID__OBJECT_BOOLEAN, - G_TYPE_NONE, - 2, EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, G_TYPE_BOOLEAN); -} - -EmpathyCallFactory * -empathy_call_factory_initialise (void) -{ - g_return_val_if_fail (call_factory == NULL, NULL); - - return EMPATHY_CALL_FACTORY (g_object_new (EMPATHY_TYPE_CALL_FACTORY, NULL)); -} - -EmpathyCallFactory * -empathy_call_factory_get (void) -{ - g_return_val_if_fail (call_factory != NULL, NULL); - - return EMPATHY_CALL_FACTORY (call_factory); -} - -GHashTable * -empathy_call_factory_create_request (EmpathyContact *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_HANDLE, G_TYPE_UINT, - empathy_contact_get_handle (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_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 media channel: %s", error->message); - g_error_free (error); - } -} - -/** - * empathy_call_factory_new_call_with_streams: - * @factory: an #EmpathyCallFactory - * @contact: an #EmpathyContact - * @initial_audio: if %TRUE the call will be started with audio - * @initial_video: if %TRUE the call will be started with video - * - * Initiate a new call with @contact. - */ -void -empathy_call_factory_new_call_with_streams (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video, - gint64 timestamp, - gpointer user_data) -{ - GHashTable *request; - TpAccount *account; - TpAccountChannelRequest *req; - - request = empathy_call_factory_create_request (contact, initial_audio, - initial_video); - - account = empathy_contact_get_account (contact); - - req = tp_account_channel_request_new (account, request, timestamp); - - tp_account_channel_request_create_channel_async (req, NULL, NULL, - create_media_channel_cb, NULL); - - g_hash_table_unref (request); - g_object_unref (req); -} - -static void -create_call_handler (EmpathyCallFactory *factory, - EmpathyTpStreamedMedia *call) -{ - EmpathyStreamedMediaHandler *handler; - - g_return_if_fail (factory != NULL); - - handler = empathy_streamed_media_handler_new_for_channel (call); - - g_signal_emit (factory, signals[NEW_STREAMED_MEDIA_HANDLER], 0, - handler, FALSE); - - g_object_unref (handler); -} - -static void -call_status_changed_cb (EmpathyTpStreamedMedia *call, - GParamSpec *spec, - EmpathyCallFactory *self) -{ - if (empathy_tp_streamed_media_get_status (call) <= EMPATHY_TP_STREAMED_MEDIA_STATUS_READYING) - return; - - create_call_handler (self, call); - - g_signal_handlers_disconnect_by_func (call, call_status_changed_cb, self); - g_object_unref (call); -} - -static void -handle_channels_cb (TpSimpleHandler *handler, - TpAccount *account, - TpConnection *connection, - GList *channels, - GList *requests_satisfied, - gint64 user_action_time, - TpHandleChannelsContext *context, - gpointer user_data) -{ - EmpathyCallFactory *self = user_data; - GList *l; - - for (l = channels; l != NULL; l = g_list_next (l)) - { - TpChannel *channel = l->data; - EmpathyTpStreamedMedia *call; - - if (tp_proxy_get_invalidated (channel) != NULL) - continue; - - if (tp_channel_get_channel_type_id (channel) != - TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA) - continue; - - call = empathy_tp_streamed_media_new (account, channel); - - if (empathy_tp_streamed_media_get_status (call) <= EMPATHY_TP_STREAMED_MEDIA_STATUS_READYING) - { - /* We have to wait that the TpStreamedMedia is ready as the - * call-handler rely on it. */ - tp_g_signal_connect_object (call, "notify::status", - G_CALLBACK (call_status_changed_cb), self, 0); - continue; - } - - create_call_handler (self, call); - g_object_unref (call); - } - - tp_handle_channels_context_accept (context); -} - -gboolean -empathy_call_factory_register (EmpathyCallFactory *self, - GError **error) -{ - EmpathyCallFactoryPriv *priv = GET_PRIV (self); - - return tp_base_client_register (priv->handler, error); -} diff --git a/libempathy/empathy-call-factory.h b/libempathy/empathy-call-factory.h deleted file mode 100644 index 36c08911b..000000000 --- a/libempathy/empathy-call-factory.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * empathy-call-factory.h - Header for EmpathyCallFactory - * Copyright (C) 2008 Collabora Ltd. - * @author Sjoerd Simons - * - * 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. - * - * 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 - */ - -#ifndef __EMPATHY_CALL_FACTORY_H__ -#define __EMPATHY_CALL_FACTORY_H__ - -#include - -#include -#include - -G_BEGIN_DECLS - -typedef struct _EmpathyCallFactory EmpathyCallFactory; -typedef struct _EmpathyCallFactoryClass EmpathyCallFactoryClass; - -struct _EmpathyCallFactoryClass { - GObjectClass parent_class; -}; - -struct _EmpathyCallFactory { - GObject parent; - gpointer priv; -}; - -GType empathy_call_factory_get_type (void); - -/* TYPE MACROS */ -#define EMPATHY_TYPE_CALL_FACTORY \ - (empathy_call_factory_get_type ()) -#define EMPATHY_CALL_FACTORY(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_CALL_FACTORY, \ - EmpathyCallFactory)) -#define EMPATHY_CALL_FACTORY_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_CALL_FACTORY, \ - EmpathyCallFactoryClass)) -#define EMPATHY_IS_CALL_FACTORY(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_CALL_FACTORY)) -#define EMPATHY_IS_CALL_FACTORY_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_CALL_FACTORY)) -#define EMPATHY_CALL_FACTORY_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CALL_FACTORY, \ - EmpathyCallFactoryClass)) - - -EmpathyCallFactory *empathy_call_factory_initialise (void); - -EmpathyCallFactory *empathy_call_factory_get (void); - -void empathy_call_factory_new_call_with_streams (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video, - gint64 timestamp, - gpointer user_data); - -gboolean empathy_call_factory_register (EmpathyCallFactory *self, - GError **error); - -GHashTable * empathy_call_factory_create_request (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video); - -G_END_DECLS - -#endif /* #ifndef __EMPATHY_CALL_FACTORY_H__*/ diff --git a/libempathy/empathy-streamed-media-factory.c b/libempathy/empathy-streamed-media-factory.c new file mode 100644 index 000000000..7e7785546 --- /dev/null +++ b/libempathy/empathy-streamed-media-factory.c @@ -0,0 +1,342 @@ +/* + * empathy-streamed-media-factory.c - Source for EmpathyStreamedMediaFactory + * Copyright (C) 2008-2011 Collabora Ltd. + * @author Sjoerd Simons + * + * 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. + * + * 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 + */ + + +#include +#include + +#include +#include +#include +#include + +#include "empathy-dispatcher.h" +#include "empathy-marshal.h" +#include "empathy-streamed-media-factory.h" +#include "empathy-utils.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_VOIP +#include + +G_DEFINE_TYPE(EmpathyStreamedMediaFactory, empathy_streamed_media_factory, G_TYPE_OBJECT) + +static void handle_channels_cb (TpSimpleHandler *handler, + TpAccount *account, + TpConnection *connection, + GList *channels, + GList *requests_satisfied, + gint64 user_action_time, + TpHandleChannelsContext *context, + gpointer user_data); + +/* signal enum */ +enum +{ + NEW_STREAMED_MEDIA_HANDLER, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = {0}; + +/* private structure */ +typedef struct { + TpBaseClient *handler; + gboolean dispose_has_run; +} EmpathyStreamedMediaFactoryPriv; + +#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStreamedMediaFactory) + +static GObject *call_factory = NULL; + +static void +empathy_streamed_media_factory_init (EmpathyStreamedMediaFactory *obj) +{ + EmpathyStreamedMediaFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj, + EMPATHY_TYPE_STREAMED_MEDIA_FACTORY, EmpathyStreamedMediaFactoryPriv); + TpDBusDaemon *dbus; + GError *error = NULL; + + obj->priv = priv; + + dbus = tp_dbus_daemon_dup (&error); + if (dbus == NULL) + { + g_warning ("Failed to get TpDBusDaemon: %s", error->message); + g_error_free (error); + return; + } + + priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, + "Empathy.AudioVideo", FALSE, handle_channels_cb, obj, NULL); + + tp_base_client_take_handler_filter (priv->handler, 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, + NULL)); + + tp_base_client_take_handler_filter (priv->handler, 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_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE, + NULL)); + + tp_base_client_take_handler_filter (priv->handler, 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_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE, + NULL)); + + tp_base_client_add_handler_capabilities_varargs (priv->handler, + "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp", + "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p", + "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264", + NULL); + + g_object_unref (dbus); +} + +static GObject * +empathy_streamed_media_factory_constructor (GType type, guint n_construct_params, + GObjectConstructParam *construct_params) +{ + g_return_val_if_fail (call_factory == NULL, NULL); + + call_factory = G_OBJECT_CLASS (empathy_streamed_media_factory_parent_class)->constructor + (type, n_construct_params, construct_params); + g_object_add_weak_pointer (call_factory, (gpointer)&call_factory); + + return call_factory; +} + +static void +empathy_streamed_media_factory_finalize (GObject *object) +{ + /* free any data held directly by the object here */ + + if (G_OBJECT_CLASS (empathy_streamed_media_factory_parent_class)->finalize) + G_OBJECT_CLASS (empathy_streamed_media_factory_parent_class)->finalize (object); +} + +static void +empathy_streamed_media_factory_dispose (GObject *object) +{ + EmpathyStreamedMediaFactoryPriv *priv = GET_PRIV (object); + + if (priv->dispose_has_run) + return; + + priv->dispose_has_run = TRUE; + + tp_clear_object (&priv->handler); + + if (G_OBJECT_CLASS (empathy_streamed_media_factory_parent_class)->dispose) + G_OBJECT_CLASS (empathy_streamed_media_factory_parent_class)->dispose (object); +} + +static void +empathy_streamed_media_factory_class_init ( + EmpathyStreamedMediaFactoryClass *empathy_streamed_media_factory_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (empathy_streamed_media_factory_class); + + g_type_class_add_private (empathy_streamed_media_factory_class, + sizeof (EmpathyStreamedMediaFactoryPriv)); + + object_class->constructor = empathy_streamed_media_factory_constructor; + object_class->dispose = empathy_streamed_media_factory_dispose; + object_class->finalize = empathy_streamed_media_factory_finalize; + + signals[NEW_STREAMED_MEDIA_HANDLER] = + g_signal_new ("new-streamed-media-handler", + G_TYPE_FROM_CLASS (empathy_streamed_media_factory_class), + G_SIGNAL_RUN_LAST, 0, + NULL, NULL, + _empathy_marshal_VOID__OBJECT_BOOLEAN, + G_TYPE_NONE, + 2, EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, G_TYPE_BOOLEAN); +} + +EmpathyStreamedMediaFactory * +empathy_streamed_media_factory_initialise (void) +{ + g_return_val_if_fail (call_factory == NULL, NULL); + + return EMPATHY_STREAMED_MEDIA_FACTORY (g_object_new (EMPATHY_TYPE_STREAMED_MEDIA_FACTORY, NULL)); +} + +EmpathyStreamedMediaFactory * +empathy_streamed_media_factory_get (void) +{ + g_return_val_if_fail (call_factory != NULL, NULL); + + return EMPATHY_STREAMED_MEDIA_FACTORY (call_factory); +} + +GHashTable * +empathy_streamed_media_factory_create_request (EmpathyContact *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_HANDLE, G_TYPE_UINT, + empathy_contact_get_handle (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_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 media channel: %s", error->message); + g_error_free (error); + } +} + +/** + * empathy_streamed_media_factory_new_call_with_streams: + * @factory: an #EmpathyStreamedMediaFactory + * @contact: an #EmpathyContact + * @initial_audio: if %TRUE the call will be started with audio + * @initial_video: if %TRUE the call will be started with video + * + * Initiate a new call with @contact. + */ +void +empathy_streamed_media_factory_new_call_with_streams (EmpathyContact *contact, + gboolean initial_audio, + gboolean initial_video, + gint64 timestamp, + gpointer user_data) +{ + GHashTable *request; + TpAccount *account; + TpAccountChannelRequest *req; + + request = empathy_streamed_media_factory_create_request (contact, initial_audio, + initial_video); + + account = empathy_contact_get_account (contact); + + req = tp_account_channel_request_new (account, request, timestamp); + + tp_account_channel_request_create_channel_async (req, NULL, NULL, + create_media_channel_cb, NULL); + + g_hash_table_unref (request); + g_object_unref (req); +} + +static void +create_streamed_media_handler (EmpathyStreamedMediaFactory *factory, + EmpathyTpStreamedMedia *call) +{ + EmpathyStreamedMediaHandler *handler; + + g_return_if_fail (factory != NULL); + + handler = empathy_streamed_media_handler_new_for_channel (call); + + g_signal_emit (factory, signals[NEW_STREAMED_MEDIA_HANDLER], 0, + handler, FALSE); + + g_object_unref (handler); +} + +static void +call_status_changed_cb (EmpathyTpStreamedMedia *call, + GParamSpec *spec, + EmpathyStreamedMediaFactory *self) +{ + if (empathy_tp_streamed_media_get_status (call) <= EMPATHY_TP_STREAMED_MEDIA_STATUS_READYING) + return; + + create_streamed_media_handler (self, call); + + g_signal_handlers_disconnect_by_func (call, call_status_changed_cb, self); + g_object_unref (call); +} + +static void +handle_channels_cb (TpSimpleHandler *handler, + TpAccount *account, + TpConnection *connection, + GList *channels, + GList *requests_satisfied, + gint64 user_action_time, + TpHandleChannelsContext *context, + gpointer user_data) +{ + EmpathyStreamedMediaFactory *self = user_data; + GList *l; + + for (l = channels; l != NULL; l = g_list_next (l)) + { + TpChannel *channel = l->data; + EmpathyTpStreamedMedia *call; + + if (tp_proxy_get_invalidated (channel) != NULL) + continue; + + if (tp_channel_get_channel_type_id (channel) != + TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA) + continue; + + call = empathy_tp_streamed_media_new (account, channel); + + if (empathy_tp_streamed_media_get_status (call) <= EMPATHY_TP_STREAMED_MEDIA_STATUS_READYING) + { + /* We have to wait that the TpStreamedMedia is ready as the + * call-handler rely on it. */ + tp_g_signal_connect_object (call, "notify::status", + G_CALLBACK (call_status_changed_cb), self, 0); + continue; + } + + create_streamed_media_handler (self, call); + g_object_unref (call); + } + + tp_handle_channels_context_accept (context); +} + +gboolean +empathy_streamed_media_factory_register (EmpathyStreamedMediaFactory *self, + GError **error) +{ + EmpathyStreamedMediaFactoryPriv *priv = GET_PRIV (self); + + return tp_base_client_register (priv->handler, error); +} diff --git a/libempathy/empathy-streamed-media-factory.h b/libempathy/empathy-streamed-media-factory.h new file mode 100644 index 000000000..ab433bb48 --- /dev/null +++ b/libempathy/empathy-streamed-media-factory.h @@ -0,0 +1,82 @@ +/* + * empathy-streamed-media-factory.h - Header for EmpathyStreamedMediaFactory + * Copyright (C) 2008-2011 Collabora Ltd. + * @author Sjoerd Simons + * + * 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. + * + * 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 + */ + +#ifndef __EMPATHY_STREAMED_MEDIA_FACTORY_H__ +#define __EMPATHY_STREAMED_MEDIA_FACTORY_H__ + +#include + +#include +#include + +G_BEGIN_DECLS + +typedef struct _EmpathyStreamedMediaFactory EmpathyStreamedMediaFactory; +typedef struct _EmpathyStreamedMediaFactoryClass EmpathyStreamedMediaFactoryClass; + +struct _EmpathyStreamedMediaFactoryClass { + GObjectClass parent_class; +}; + +struct _EmpathyStreamedMediaFactory { + GObject parent; + gpointer priv; +}; + +GType empathy_streamed_media_factory_get_type (void); + +/* TYPE MACROS */ +#define EMPATHY_TYPE_STREAMED_MEDIA_FACTORY \ + (empathy_streamed_media_factory_get_type ()) +#define EMPATHY_STREAMED_MEDIA_FACTORY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_STREAMED_MEDIA_FACTORY, \ + EmpathyStreamedMediaFactory)) +#define EMPATHY_STREAMED_MEDIA_FACTORY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_STREAMED_MEDIA_FACTORY, \ + EmpathyStreamedMediaFactoryClass)) +#define EMPATHY_IS_STREAMED_MEDIA_FACTORY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_STREAMED_MEDIA_FACTORY)) +#define EMPATHY_IS_STREAMED_MEDIA_FACTORY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_STREAMED_MEDIA_FACTORY)) +#define EMPATHY_STREAMED_MEDIA_FACTORY_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_STREAMED_MEDIA_FACTORY, \ + EmpathyStreamedMediaFactoryClass)) + + +EmpathyStreamedMediaFactory *empathy_streamed_media_factory_initialise (void); + +EmpathyStreamedMediaFactory *empathy_streamed_media_factory_get (void); + +void empathy_streamed_media_factory_new_call_with_streams (EmpathyContact *contact, + gboolean initial_audio, + gboolean initial_video, + gint64 timestamp, + gpointer user_data); + +gboolean empathy_streamed_media_factory_register (EmpathyStreamedMediaFactory *self, + GError **error); + +GHashTable * empathy_streamed_media_factory_create_request (EmpathyContact *contact, + gboolean initial_audio, + gboolean initial_video); + +G_END_DECLS + +#endif /* #ifndef __EMPATHY_STREAMED_MEDIA_FACTORY_H__*/ diff --git a/libempathy/empathy-streamed-media-handler.c b/libempathy/empathy-streamed-media-handler.c index 7fa49cde7..152cf644e 100644 --- a/libempathy/empathy-streamed-media-handler.c +++ b/libempathy/empathy-streamed-media-handler.c @@ -1,6 +1,6 @@ /* - * empathy-call-handler.c - Source for EmpathyStreamedMediaHandler - * Copyright (C) 2008-2009 Collabora Ltd. + * empathy-streamed-media-handler.c - Source for EmpathyStreamedMediaHandler + * Copyright (C) 2008-2011 Collabora Ltd. * @author Sjoerd Simons * * This library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ #include #include "empathy-streamed-media-handler.h" -#include "empathy-call-factory.h" +#include "empathy-streamed-media-factory.h" #include "empathy-marshal.h" #include "empathy-utils.h" @@ -806,7 +806,7 @@ empathy_streamed_media_handler_start_call (EmpathyStreamedMediaHandler *handler, g_assert (priv->contact != NULL); account = empathy_contact_get_account (priv->contact); - request = empathy_call_factory_create_request (priv->contact, + request = empathy_streamed_media_factory_create_request (priv->contact, priv->initial_audio, priv->initial_video); req = tp_account_channel_request_new (account, request, timestamp); diff --git a/libempathy/empathy-streamed-media-handler.h b/libempathy/empathy-streamed-media-handler.h index b6d7049c2..ab655b8e4 100644 --- a/libempathy/empathy-streamed-media-handler.h +++ b/libempathy/empathy-streamed-media-handler.h @@ -1,5 +1,5 @@ /* - * empathy-call-handler.h - Header for EmpathyStreamedMediaHandler + * empathy-streamed-media-handler.h - Header for EmpathyStreamedMediaHandler * Copyright (C) 2008-2009 Collabora Ltd. * @author Sjoerd Simons * -- cgit