diff options
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 1 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 6 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-menu.c | 6 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 1 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-new-call-dialog.c | 1 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 4 | ||||
| -rw-r--r-- | libempathy/empathy-call-factory.h | 82 | ||||
| -rw-r--r-- | libempathy/empathy-streamed-media-factory.c (renamed from libempathy/empathy-call-factory.c) | 90 | ||||
| -rw-r--r-- | libempathy/empathy-streamed-media-factory.h | 82 | ||||
| -rw-r--r-- | libempathy/empathy-streamed-media-handler.c | 8 | ||||
| -rw-r--r-- | libempathy/empathy-streamed-media-handler.h | 2 | ||||
| -rw-r--r-- | src/empathy-av.c | 12 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 1 | ||||
| -rw-r--r-- | src/empathy-streamed-media-window.c | 1 |
14 files changed, 146 insertions, 151 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 4ab3607ec..c558738df 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -34,7 +34,6 @@ #include <telepathy-glib/account-manager.h> #include <telepathy-glib/util.h> -#include <libempathy/empathy-call-factory.h> #include <libempathy/empathy-tp-contact-factory.h> #include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-contact-groups.h> diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 00d83ce5b..ac5d98f48 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -27,7 +27,7 @@ #include <gtk/gtk.h> #include <telepathy-logger/log-manager.h> -#include <libempathy/empathy-call-factory.h> +#include <libempathy/empathy-streamed-media-factory.h> #include <libempathy/empathy-contact-manager.h> #include <libempathy/empathy-dispatcher.h> #include <libempathy/empathy-utils.h> @@ -248,7 +248,7 @@ empathy_contact_audio_call_menu_item_activated (GtkMenuItem *item, EmpathyContact *contact) { - empathy_call_factory_new_call_with_streams (contact, TRUE, FALSE, + empathy_streamed_media_factory_new_call_with_streams (contact, TRUE, FALSE, gtk_get_current_event_time (), NULL); } @@ -279,7 +279,7 @@ static void empathy_contact_video_call_menu_item_activated (GtkMenuItem *item, EmpathyContact *contact) { - empathy_call_factory_new_call_with_streams (contact, TRUE, TRUE, + empathy_streamed_media_factory_new_call_with_streams (contact, TRUE, TRUE, gtk_get_current_event_time (), NULL); } diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 76d708156..faa4ff6aa 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -31,7 +31,7 @@ #include <folks/folks.h> #include <folks/folks-telepathy.h> -#include <libempathy/empathy-call-factory.h> +#include <libempathy/empathy-streamed-media-factory.h> #include <libempathy/empathy-dispatcher.h> #include <libempathy/empathy-individual-manager.h> #include <libempathy/empathy-chatroom-manager.h> @@ -543,7 +543,7 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item, { g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - empathy_call_factory_new_call_with_streams (contact, TRUE, FALSE, + empathy_streamed_media_factory_new_call_with_streams (contact, TRUE, FALSE, gtk_get_current_event_time (), NULL); } @@ -585,7 +585,7 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item, { g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - empathy_call_factory_new_call_with_streams (contact, TRUE, TRUE, + empathy_streamed_media_factory_new_call_with_streams (contact, TRUE, TRUE, gtk_get_current_event_time (), NULL); } diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index d384d7809..f2574408f 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -38,7 +38,6 @@ #include <folks/folks.h> #include <folks/folks-telepathy.h> -#include <libempathy/empathy-call-factory.h> #include <libempathy/empathy-individual-manager.h> #include <libempathy/empathy-contact-groups.h> #include <libempathy/empathy-dispatcher.h> diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c index ab9a86a6f..2d35fadec 100644 --- a/libempathy-gtk/empathy-new-call-dialog.c +++ b/libempathy-gtk/empathy-new-call-dialog.c @@ -30,7 +30,6 @@ #include <libempathy/empathy-tp-contact-factory.h> #include <libempathy/empathy-contact-manager.h> -#include <libempathy/empathy-call-factory.h> #include <libempathy/empathy-utils.h> #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT 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.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 <sjoerd.simons@collabora.co.uk> - * - * 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 <glib-object.h> - -#include <libempathy/empathy-streamed-media-handler.h> -#include <libempathy/empathy-dispatcher.h> - -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-call-factory.c b/libempathy/empathy-streamed-media-factory.c index 281434cbe..7e7785546 100644 --- a/libempathy/empathy-call-factory.c +++ b/libempathy/empathy-streamed-media-factory.c @@ -1,6 +1,6 @@ /* - * empathy-call-factory.c - Source for EmpathyCallFactory - * Copyright (C) 2008 Collabora Ltd. + * empathy-streamed-media-factory.c - Source for EmpathyStreamedMediaFactory + * Copyright (C) 2008-2011 Collabora Ltd. * @author Sjoerd Simons <sjoerd.simons@collabora.co.uk> * * This library is free software; you can redistribute it and/or @@ -29,13 +29,13 @@ #include "empathy-dispatcher.h" #include "empathy-marshal.h" -#include "empathy-call-factory.h" +#include "empathy-streamed-media-factory.h" #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include <libempathy/empathy-debug.h> -G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, G_TYPE_OBJECT) +G_DEFINE_TYPE(EmpathyStreamedMediaFactory, empathy_streamed_media_factory, G_TYPE_OBJECT) static void handle_channels_cb (TpSimpleHandler *handler, TpAccount *account, @@ -59,17 +59,17 @@ static guint signals[LAST_SIGNAL] = {0}; typedef struct { TpBaseClient *handler; gboolean dispose_has_run; -} EmpathyCallFactoryPriv; +} EmpathyStreamedMediaFactoryPriv; -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCallFactory) +#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStreamedMediaFactory) static GObject *call_factory = NULL; static void -empathy_call_factory_init (EmpathyCallFactory *obj) +empathy_streamed_media_factory_init (EmpathyStreamedMediaFactory *obj) { - EmpathyCallFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj, - EMPATHY_TYPE_CALL_FACTORY, EmpathyCallFactoryPriv); + EmpathyStreamedMediaFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj, + EMPATHY_TYPE_STREAMED_MEDIA_FACTORY, EmpathyStreamedMediaFactoryPriv); TpDBusDaemon *dbus; GError *error = NULL; @@ -116,12 +116,12 @@ empathy_call_factory_init (EmpathyCallFactory *obj) } static GObject * -empathy_call_factory_constructor (GType type, guint n_construct_params, +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_call_factory_parent_class)->constructor + 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); @@ -129,18 +129,18 @@ empathy_call_factory_constructor (GType type, guint n_construct_params, } static void -empathy_call_factory_finalize (GObject *object) +empathy_streamed_media_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); + 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_call_factory_dispose (GObject *object) +empathy_streamed_media_factory_dispose (GObject *object) { - EmpathyCallFactoryPriv *priv = GET_PRIV (object); + EmpathyStreamedMediaFactoryPriv *priv = GET_PRIV (object); if (priv->dispose_has_run) return; @@ -149,26 +149,26 @@ empathy_call_factory_dispose (GObject *object) 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); + 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_call_factory_class_init ( - EmpathyCallFactoryClass *empathy_call_factory_class) +empathy_streamed_media_factory_class_init ( + EmpathyStreamedMediaFactoryClass *empathy_streamed_media_factory_class) { - GObjectClass *object_class = G_OBJECT_CLASS (empathy_call_factory_class); + GObjectClass *object_class = G_OBJECT_CLASS (empathy_streamed_media_factory_class); - g_type_class_add_private (empathy_call_factory_class, - sizeof (EmpathyCallFactoryPriv)); + g_type_class_add_private (empathy_streamed_media_factory_class, + sizeof (EmpathyStreamedMediaFactoryPriv)); - object_class->constructor = empathy_call_factory_constructor; - object_class->dispose = empathy_call_factory_dispose; - object_class->finalize = empathy_call_factory_finalize; + 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_call_factory_class), + G_TYPE_FROM_CLASS (empathy_streamed_media_factory_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, _empathy_marshal_VOID__OBJECT_BOOLEAN, @@ -176,24 +176,24 @@ empathy_call_factory_class_init ( 2, EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, G_TYPE_BOOLEAN); } -EmpathyCallFactory * -empathy_call_factory_initialise (void) +EmpathyStreamedMediaFactory * +empathy_streamed_media_factory_initialise (void) { g_return_val_if_fail (call_factory == NULL, NULL); - return EMPATHY_CALL_FACTORY (g_object_new (EMPATHY_TYPE_CALL_FACTORY, NULL)); + return EMPATHY_STREAMED_MEDIA_FACTORY (g_object_new (EMPATHY_TYPE_STREAMED_MEDIA_FACTORY, NULL)); } -EmpathyCallFactory * -empathy_call_factory_get (void) +EmpathyStreamedMediaFactory * +empathy_streamed_media_factory_get (void) { g_return_val_if_fail (call_factory != NULL, NULL); - return EMPATHY_CALL_FACTORY (call_factory); + return EMPATHY_STREAMED_MEDIA_FACTORY (call_factory); } GHashTable * -empathy_call_factory_create_request (EmpathyContact *contact, +empathy_streamed_media_factory_create_request (EmpathyContact *contact, gboolean initial_audio, gboolean initial_video) { @@ -226,8 +226,8 @@ create_media_channel_cb (GObject *source, } /** - * empathy_call_factory_new_call_with_streams: - * @factory: an #EmpathyCallFactory + * 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 @@ -235,7 +235,7 @@ create_media_channel_cb (GObject *source, * Initiate a new call with @contact. */ void -empathy_call_factory_new_call_with_streams (EmpathyContact *contact, +empathy_streamed_media_factory_new_call_with_streams (EmpathyContact *contact, gboolean initial_audio, gboolean initial_video, gint64 timestamp, @@ -245,7 +245,7 @@ empathy_call_factory_new_call_with_streams (EmpathyContact *contact, TpAccount *account; TpAccountChannelRequest *req; - request = empathy_call_factory_create_request (contact, initial_audio, + request = empathy_streamed_media_factory_create_request (contact, initial_audio, initial_video); account = empathy_contact_get_account (contact); @@ -260,7 +260,7 @@ empathy_call_factory_new_call_with_streams (EmpathyContact *contact, } static void -create_call_handler (EmpathyCallFactory *factory, +create_streamed_media_handler (EmpathyStreamedMediaFactory *factory, EmpathyTpStreamedMedia *call) { EmpathyStreamedMediaHandler *handler; @@ -278,12 +278,12 @@ create_call_handler (EmpathyCallFactory *factory, static void call_status_changed_cb (EmpathyTpStreamedMedia *call, GParamSpec *spec, - EmpathyCallFactory *self) + EmpathyStreamedMediaFactory *self) { if (empathy_tp_streamed_media_get_status (call) <= EMPATHY_TP_STREAMED_MEDIA_STATUS_READYING) return; - create_call_handler (self, call); + create_streamed_media_handler (self, call); g_signal_handlers_disconnect_by_func (call, call_status_changed_cb, self); g_object_unref (call); @@ -299,7 +299,7 @@ handle_channels_cb (TpSimpleHandler *handler, TpHandleChannelsContext *context, gpointer user_data) { - EmpathyCallFactory *self = user_data; + EmpathyStreamedMediaFactory *self = user_data; GList *l; for (l = channels; l != NULL; l = g_list_next (l)) @@ -325,7 +325,7 @@ handle_channels_cb (TpSimpleHandler *handler, continue; } - create_call_handler (self, call); + create_streamed_media_handler (self, call); g_object_unref (call); } @@ -333,10 +333,10 @@ handle_channels_cb (TpSimpleHandler *handler, } gboolean -empathy_call_factory_register (EmpathyCallFactory *self, +empathy_streamed_media_factory_register (EmpathyStreamedMediaFactory *self, GError **error) { - EmpathyCallFactoryPriv *priv = GET_PRIV (self); + 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 <sjoerd.simons@collabora.co.uk> + * + * 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 <glib-object.h> + +#include <libempathy/empathy-streamed-media-handler.h> +#include <libempathy/empathy-dispatcher.h> + +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 <sjoerd.simons@collabora.co.uk> * * This library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ #include <telepathy-farsight/stream.h> #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 <sjoerd.simons@collabora.co.uk> * diff --git a/src/empathy-av.c b/src/empathy-av.c index 6aef1fdd1..cfe71d1a5 100644 --- a/src/empathy-av.c +++ b/src/empathy-av.c @@ -28,7 +28,7 @@ #include <telepathy-glib/debug-sender.h> -#include <libempathy/empathy-call-factory.h> +#include <libempathy/empathy-streamed-media-factory.h> #include <libempathy-gtk/empathy-ui-utils.h> #include "empathy-streamed-media-window.h" @@ -47,17 +47,17 @@ static GtkApplication *app = NULL; static gboolean activated = FALSE; static gboolean use_timer = TRUE; -static EmpathyCallFactory *call_factory = NULL; +static EmpathyStreamedMediaFactory *call_factory = NULL; static void -new_call_handler_cb (EmpathyCallFactory *factory, +new_call_handler_cb (EmpathyStreamedMediaFactory *factory, EmpathyStreamedMediaHandler *handler, gboolean outgoing, gpointer user_data) { EmpathyStreamedMediaWindow *window; - DEBUG ("Create a new call window"); + DEBUG ("Create a new StreamedMedia window"); window = empathy_streamed_media_window_new (handler); @@ -86,12 +86,12 @@ activate_cb (GApplication *application) } g_assert (call_factory == NULL); - call_factory = empathy_call_factory_initialise (); + call_factory = empathy_streamed_media_factory_initialise (); g_signal_connect (G_OBJECT (call_factory), "new-streamed-media-handler", G_CALLBACK (new_call_handler_cb), NULL); - if (!empathy_call_factory_register (call_factory, &error)) + if (!empathy_streamed_media_factory_register (call_factory, &error)) { g_critical ("Failed to register Handler: %s", error->message); g_error_free (error); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index ffe8e597f..96950c5f9 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -36,7 +36,6 @@ #include <libempathy/empathy-tp-streamed-media.h> #include <libempathy/empathy-tp-file.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-call-factory.h> #include <libempathy/empathy-gsettings.h> #include <extensions/extensions.h> diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index c324d45c0..2408f975a 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -36,7 +36,6 @@ #include <gst/farsight/fs-element-added-notifier.h> #include <libempathy/empathy-tp-contact-factory.h> -#include <libempathy/empathy-call-factory.h> #include <libempathy/empathy-utils.h> #include <libempathy-gtk/empathy-avatar-image.h> #include <libempathy-gtk/empathy-video-widget.h> |