]> git.0d.be Git - empathy.git/commitdiff
EmpathyCallHandler -> EmpathyStreamedMediaHandler
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 3 Feb 2011 13:45:45 +0000 (13:45 +0000)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 3 Feb 2011 15:00:33 +0000 (15:00 +0000)
libempathy/Makefile.am
libempathy/empathy-call-factory.c
libempathy/empathy-call-factory.h
libempathy/empathy-call-handler.c [deleted file]
libempathy/empathy-call-handler.h [deleted file]
libempathy/empathy-streamed-media-handler.c [new file with mode: 0644]
libempathy/empathy-streamed-media-handler.h [new file with mode: 0644]
src/empathy-av.c
src/empathy-call-window.c
src/empathy-call-window.h

index 497d8d99b0b3fc60eba82d6b9cd1905f89b2a9b0..0255156042e03b79cc3e758c3a40d376692479f2 100644 (file)
@@ -29,7 +29,6 @@ libempathy_headers =                          \
        empathy-account-settings.h              \
        empathy-auth-factory.h                  \
        empathy-call-factory.h                  \
-       empathy-call-handler.h                  \
        empathy-chatroom-manager.h              \
        empathy-chatroom.h                      \
        empathy-connection-managers.h           \
@@ -54,6 +53,7 @@ libempathy_headers =                          \
        empathy-server-sasl-handler.h           \
        empathy-server-tls-handler.h            \
        empathy-status-presets.h                \
+       empathy-streamed-media-handler.h        \
        empathy-time.h                          \
        empathy-tls-certificate.h               \
        empathy-tls-verifier.h                  \
@@ -71,7 +71,6 @@ libempathy_la_SOURCES =                                       \
        empathy-account-settings.c                      \
        empathy-auth-factory.c                          \
        empathy-call-factory.c                          \
-       empathy-call-handler.c                          \
        empathy-chatroom-manager.c                      \
        empathy-chatroom.c                              \
        empathy-connection-managers.c                   \
@@ -94,6 +93,7 @@ libempathy_la_SOURCES =                                       \
        empathy-server-sasl-handler.c                   \
        empathy-server-tls-handler.c                    \
        empathy-status-presets.c                        \
+       empathy-streamed-media-handler.c                \
        empathy-time.c                                  \
        empathy-tls-certificate.c                       \
        empathy-tls-verifier.c                          \
index 6e523aada7de29b92281d1e72a13fc1f20674453..4ec3e976b5bbc21f5a09ec6d91f39c1e07566749 100644 (file)
@@ -49,7 +49,7 @@ static void handle_channels_cb (TpSimpleHandler *handler,
 /* signal enum */
 enum
 {
-    NEW_CALL_HANDLER,
+    NEW_STREAMED_MEDIA_HANDLER,
     LAST_SIGNAL
 };
 
@@ -166,14 +166,14 @@ empathy_call_factory_class_init (
   object_class->dispose = empathy_call_factory_dispose;
   object_class->finalize = empathy_call_factory_finalize;
 
-  signals[NEW_CALL_HANDLER] =
+  signals[NEW_STREAMED_MEDIA_HANDLER] =
     g_signal_new ("new-call-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_CALL_HANDLER, G_TYPE_BOOLEAN);
+      2, EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, G_TYPE_BOOLEAN);
 }
 
 EmpathyCallFactory *
@@ -263,13 +263,13 @@ static void
 create_call_handler (EmpathyCallFactory *factory,
   EmpathyTpStreamedMedia *call)
 {
-  EmpathyCallHandler *handler;
+  EmpathyStreamedMediaHandler *handler;
 
   g_return_if_fail (factory != NULL);
 
-  handler = empathy_call_handler_new_for_channel (call);
+  handler = empathy_streamed_media_handler_new_for_channel (call);
 
-  g_signal_emit (factory, signals[NEW_CALL_HANDLER], 0,
+  g_signal_emit (factory, signals[NEW_STREAMED_MEDIA_HANDLER], 0,
     handler, FALSE);
 
   g_object_unref (handler);
index 7b160dda46d798f0e44bf2358c0ae5d7e413e277..36c08911bb253dbd9e267b0bec6fad654a8e6d1f 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <libempathy/empathy-call-handler.h>
+#include <libempathy/empathy-streamed-media-handler.h>
 #include <libempathy/empathy-dispatcher.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-call-handler.c b/libempathy/empathy-call-handler.c
deleted file mode 100644 (file)
index c3ce5fe..0000000
+++ /dev/null
@@ -1,924 +0,0 @@
-/*
- * empathy-call-handler.c - Source for EmpathyCallHandler
- * Copyright (C) 2008-2009 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
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
-
-#include <telepathy-farsight/channel.h>
-#include <telepathy-farsight/stream.h>
-
-#include "empathy-call-handler.h"
-#include "empathy-call-factory.h"
-#include "empathy-marshal.h"
-#include "empathy-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
-
-G_DEFINE_TYPE(EmpathyCallHandler, empathy_call_handler, G_TYPE_OBJECT)
-
-/* signal enum */
-enum {
-  CONFERENCE_ADDED,
-  SRC_PAD_ADDED,
-  SINK_PAD_ADDED,
-  REQUEST_RESOURCE,
-  CLOSED,
-  STREAM_CLOSED,
-  CANDIDATES_CHANGED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
-enum {
-  PROP_TP_STREAMED_MEDIA = 1,
-  PROP_GST_BUS,
-  PROP_CONTACT,
-  PROP_INITIAL_AUDIO,
-  PROP_INITIAL_VIDEO,
-  PROP_SEND_AUDIO_CODEC,
-  PROP_SEND_VIDEO_CODEC,
-  PROP_RECV_AUDIO_CODECS,
-  PROP_RECV_VIDEO_CODECS,
-  PROP_AUDIO_REMOTE_CANDIDATE,
-  PROP_VIDEO_REMOTE_CANDIDATE,
-  PROP_AUDIO_LOCAL_CANDIDATE,
-  PROP_VIDEO_LOCAL_CANDIDATE,
-};
-
-/* private structure */
-
-typedef struct {
-  gboolean dispose_has_run;
-  EmpathyTpStreamedMedia *call;
-  EmpathyContact *contact;
-  TfChannel *tfchannel;
-  gboolean initial_audio;
-  gboolean initial_video;
-
-  FsCodec *send_audio_codec;
-  FsCodec *send_video_codec;
-  GList *recv_audio_codecs;
-  GList *recv_video_codecs;
-  FsCandidate *audio_remote_candidate;
-  FsCandidate *video_remote_candidate;
-  FsCandidate *audio_local_candidate;
-  FsCandidate *video_local_candidate;
-} EmpathyCallHandlerPriv;
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCallHandler)
-
-static void
-empathy_call_handler_dispose (GObject *object)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (object);
-
-  if (priv->dispose_has_run)
-    return;
-
-  priv->dispose_has_run = TRUE;
-
-  if (priv->contact != NULL)
-    g_object_unref (priv->contact);
-
-  priv->contact = NULL;
-
-  if (priv->tfchannel != NULL)
-    g_object_unref (priv->tfchannel);
-
-  priv->tfchannel = NULL;
-
-  if (priv->call != NULL)
-    {
-      empathy_tp_streamed_media_close (priv->call);
-      g_object_unref (priv->call);
-    }
-
-  priv->call = NULL;
-
-  /* release any references held by the object here */
-  if (G_OBJECT_CLASS (empathy_call_handler_parent_class)->dispose)
-    G_OBJECT_CLASS (empathy_call_handler_parent_class)->dispose (object);
-}
-
-static void
-empathy_call_handler_finalize (GObject *object)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (object);
-
-  fs_codec_destroy (priv->send_audio_codec);
-  fs_codec_destroy (priv->send_video_codec);
-  fs_codec_list_destroy (priv->recv_audio_codecs);
-  fs_codec_list_destroy (priv->recv_video_codecs);
-  fs_candidate_destroy (priv->audio_remote_candidate);
-  fs_candidate_destroy (priv->video_remote_candidate);
-  fs_candidate_destroy (priv->audio_local_candidate);
-  fs_candidate_destroy (priv->video_local_candidate);
-
-  if (G_OBJECT_CLASS (empathy_call_handler_parent_class)->finalize)
-    G_OBJECT_CLASS (empathy_call_handler_parent_class)->finalize (object);
-}
-
-static void
-empathy_call_handler_init (EmpathyCallHandler *obj)
-{
-  EmpathyCallHandlerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj,
-    EMPATHY_TYPE_CALL_HANDLER, EmpathyCallHandlerPriv);
-
-  obj->priv = priv;
-}
-
-static void
-empathy_call_handler_constructed (GObject *object)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (object);
-
-  if (priv->contact == NULL)
-    {
-      g_object_get (priv->call, "contact", &(priv->contact), NULL);
-    }
-}
-
-static void
-empathy_call_handler_set_property (GObject *object,
-  guint property_id, const GValue *value, GParamSpec *pspec)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (object);
-
-  switch (property_id)
-    {
-      case PROP_CONTACT:
-        priv->contact = g_value_dup_object (value);
-        break;
-      case PROP_TP_STREAMED_MEDIA:
-        priv->call = g_value_dup_object (value);
-        break;
-      case PROP_INITIAL_AUDIO:
-        priv->initial_audio = g_value_get_boolean (value);
-        break;
-      case PROP_INITIAL_VIDEO:
-        priv->initial_video = g_value_get_boolean (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-empathy_call_handler_get_property (GObject *object,
-  guint property_id, GValue *value, GParamSpec *pspec)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (object);
-
-  switch (property_id)
-    {
-      case PROP_CONTACT:
-        g_value_set_object (value, priv->contact);
-        break;
-      case PROP_TP_STREAMED_MEDIA:
-        g_value_set_object (value, priv->call);
-        break;
-      case PROP_INITIAL_AUDIO:
-        g_value_set_boolean (value, priv->initial_audio);
-        break;
-      case PROP_INITIAL_VIDEO:
-        g_value_set_boolean (value, priv->initial_video);
-        break;
-      case PROP_SEND_AUDIO_CODEC:
-        g_value_set_boxed (value, priv->send_audio_codec);
-        break;
-      case PROP_SEND_VIDEO_CODEC:
-        g_value_set_boxed (value, priv->send_video_codec);
-        break;
-      case PROP_RECV_AUDIO_CODECS:
-        g_value_set_boxed (value, priv->recv_audio_codecs);
-        break;
-      case PROP_RECV_VIDEO_CODECS:
-        g_value_set_boxed (value, priv->recv_video_codecs);
-        break;
-      case PROP_AUDIO_REMOTE_CANDIDATE:
-        g_value_set_boxed (value, priv->audio_remote_candidate);
-        break;
-      case PROP_VIDEO_REMOTE_CANDIDATE:
-        g_value_set_boxed (value, priv->video_remote_candidate);
-        break;
-      case PROP_AUDIO_LOCAL_CANDIDATE:
-        g_value_set_boxed (value, priv->audio_local_candidate);
-        break;
-      case PROP_VIDEO_LOCAL_CANDIDATE:
-        g_value_set_boxed (value, priv->video_local_candidate);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-
-static void
-empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  g_type_class_add_private (klass, sizeof (EmpathyCallHandlerPriv));
-
-  object_class->constructed = empathy_call_handler_constructed;
-  object_class->set_property = empathy_call_handler_set_property;
-  object_class->get_property = empathy_call_handler_get_property;
-  object_class->dispose = empathy_call_handler_dispose;
-  object_class->finalize = empathy_call_handler_finalize;
-
-  param_spec = g_param_spec_object ("contact",
-    "contact", "The remote contact",
-    EMPATHY_TYPE_CONTACT,
-    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_CONTACT, param_spec);
-
-  param_spec = g_param_spec_object ("tp-call",
-    "tp-call", "The calls channel wrapper",
-    EMPATHY_TYPE_TP_STREAMED_MEDIA,
-    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_TP_STREAMED_MEDIA, param_spec);
-
-  param_spec = g_param_spec_boolean ("initial-audio",
-    "initial-audio", "Whether the call should start with audio",
-    TRUE,
-    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_INITIAL_AUDIO,
-      param_spec);
-
-  param_spec = g_param_spec_boolean ("initial-video",
-    "initial-video", "Whether the call should start with video",
-    FALSE,
-    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_INITIAL_VIDEO,
-    param_spec);
-
-  param_spec = g_param_spec_boxed ("send-audio-codec",
-    "send audio codec", "Codec used to encode the outgoing video stream",
-    FS_TYPE_CODEC,
-    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_SEND_AUDIO_CODEC,
-    param_spec);
-
-  param_spec = g_param_spec_boxed ("send-video-codec",
-    "send video codec", "Codec used to encode the outgoing video stream",
-    FS_TYPE_CODEC,
-    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_SEND_VIDEO_CODEC,
-    param_spec);
-
-  param_spec = g_param_spec_boxed ("recv-audio-codecs",
-    "recvs audio codec", "Codecs used to decode the incoming audio stream",
-    FS_TYPE_CODEC_LIST,
-    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_RECV_AUDIO_CODECS,
-    param_spec);
-
-  param_spec = g_param_spec_boxed ("recv-video-codecs",
-    "recvs video codec", "Codecs used to decode the incoming video stream",
-    FS_TYPE_CODEC_LIST,
-    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_RECV_VIDEO_CODECS,
-    param_spec);
-
-  param_spec = g_param_spec_boxed ("audio-remote-candidate",
-    "audio remote candidate",
-    "Remote candidate used for the audio stream",
-    FS_TYPE_CANDIDATE,
-    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class,
-      PROP_AUDIO_REMOTE_CANDIDATE, param_spec);
-
-  param_spec = g_param_spec_boxed ("video-remote-candidate",
-    "video remote candidate",
-    "Remote candidate used for the video stream",
-    FS_TYPE_CANDIDATE,
-    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class,
-      PROP_VIDEO_REMOTE_CANDIDATE, param_spec);
-
-  param_spec = g_param_spec_boxed ("audio-local-candidate",
-    "audio local candidate",
-    "Local candidate used for the audio stream",
-    FS_TYPE_CANDIDATE,
-    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class,
-      PROP_AUDIO_REMOTE_CANDIDATE, param_spec);
-
-  param_spec = g_param_spec_boxed ("video-local-candidate",
-    "video local candidate",
-    "Local candidate used for the video stream",
-    FS_TYPE_CANDIDATE,
-    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class,
-      PROP_VIDEO_REMOTE_CANDIDATE, param_spec);
-
-  signals[CONFERENCE_ADDED] =
-    g_signal_new ("conference-added", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
-      G_TYPE_NONE,
-      1, FS_TYPE_CONFERENCE);
-
-  signals[SRC_PAD_ADDED] =
-    g_signal_new ("src-pad-added", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _empathy_marshal_BOOLEAN__OBJECT_UINT,
-      G_TYPE_BOOLEAN,
-      2, GST_TYPE_PAD, G_TYPE_UINT);
-
-  signals[SINK_PAD_ADDED] =
-    g_signal_new ("sink-pad-added", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _empathy_marshal_BOOLEAN__OBJECT_UINT,
-      G_TYPE_BOOLEAN,
-      2, GST_TYPE_PAD, G_TYPE_UINT);
-
-  signals[REQUEST_RESOURCE] =
-    g_signal_new ("request-resource", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0,
-      g_signal_accumulator_true_handled, NULL,
-      _empathy_marshal_BOOLEAN__UINT_UINT,
-      G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT);
-
-  signals[CLOSED] =
-    g_signal_new ("closed", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
-      G_TYPE_NONE,
-      0);
-
-  signals[STREAM_CLOSED] =
-    g_signal_new ("stream-closed", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
-      G_TYPE_NONE, 1, TF_TYPE_STREAM);
-
-  signals[CANDIDATES_CHANGED] =
-    g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
-      G_TYPE_NONE, 1, G_TYPE_UINT);
-}
-
-/**
- * empathy_call_handler_new_for_contact:
- * @contact: an #EmpathyContact
- *
- * Creates a new #EmpathyCallHandler with contact @contact.
- *
- * Return value: a new #EmpathyCallHandler
- */
-EmpathyCallHandler *
-empathy_call_handler_new_for_contact (EmpathyContact *contact)
-{
-  return EMPATHY_CALL_HANDLER (g_object_new (EMPATHY_TYPE_CALL_HANDLER,
-    "contact", contact, NULL));
-}
-
-EmpathyCallHandler *
-empathy_call_handler_new_for_channel (EmpathyTpStreamedMedia *call)
-{
-  return EMPATHY_CALL_HANDLER (g_object_new (EMPATHY_TYPE_CALL_HANDLER,
-    "tp-call", call,
-    "initial-video", empathy_tp_streamed_media_is_receiving_video (call),
-    NULL));
-}
-
-static void
-update_sending_codec (EmpathyCallHandler *self,
-    FsCodec *codec,
-    FsSession *session)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-  FsMediaType type;
-
-  if (codec == NULL || session == NULL)
-    return;
-
-  g_object_get (session, "media-type", &type, NULL);
-
-  if (type == FS_MEDIA_TYPE_AUDIO)
-    {
-      priv->send_audio_codec = fs_codec_copy (codec);
-      g_object_notify (G_OBJECT (self), "send-audio-codec");
-    }
-  else if (type == FS_MEDIA_TYPE_VIDEO)
-    {
-      priv->send_video_codec = fs_codec_copy (codec);
-      g_object_notify (G_OBJECT (self), "send-video-codec");
-    }
-}
-
-static void
-update_receiving_codec (EmpathyCallHandler *self,
-    GList *codecs,
-    FsStream *stream)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-  FsSession *session;
-  FsMediaType type;
-
-  if (codecs == NULL || stream == NULL)
-    return;
-
-  g_object_get (stream, "session", &session, NULL);
-  if (session == NULL)
-    return;
-
-  g_object_get (session, "media-type", &type, NULL);
-
-  if (type == FS_MEDIA_TYPE_AUDIO)
-    {
-      priv->recv_audio_codecs = fs_codec_list_copy (codecs);
-      g_object_notify (G_OBJECT (self), "recv-audio-codecs");
-    }
-  else if (type == FS_MEDIA_TYPE_VIDEO)
-    {
-      priv->recv_video_codecs = fs_codec_list_copy (codecs);
-      g_object_notify (G_OBJECT (self), "recv-video-codecs");
-    }
-
-  g_object_unref (session);
-}
-
-static void
-update_candidates (EmpathyCallHandler *self,
-    FsCandidate *remote_candidate,
-    FsCandidate *local_candidate,
-    FsStream *stream)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-  FsSession *session;
-  FsMediaType type;
-
-  if (stream == NULL)
-    return;
-
-  g_object_get (stream, "session", &session, NULL);
-  if (session == NULL)
-    return;
-
-  g_object_get (session, "media-type", &type, NULL);
-
-  if (type == FS_MEDIA_TYPE_AUDIO)
-    {
-      if (remote_candidate != NULL)
-        {
-          fs_candidate_destroy (priv->audio_remote_candidate);
-          priv->audio_remote_candidate = fs_candidate_copy (remote_candidate);
-          g_object_notify (G_OBJECT (self), "audio-remote-candidate");
-        }
-
-      if (local_candidate != NULL)
-        {
-          fs_candidate_destroy (priv->audio_local_candidate);
-          priv->audio_local_candidate = fs_candidate_copy (local_candidate);
-          g_object_notify (G_OBJECT (self), "audio-local-candidate");
-        }
-
-      g_signal_emit (G_OBJECT (self), signals[CANDIDATES_CHANGED], 0,
-          FS_MEDIA_TYPE_AUDIO);
-    }
-  else if (type == FS_MEDIA_TYPE_VIDEO)
-    {
-      if (remote_candidate != NULL)
-        {
-          fs_candidate_destroy (priv->video_remote_candidate);
-          priv->video_remote_candidate = fs_candidate_copy (remote_candidate);
-          g_object_notify (G_OBJECT (self), "video-remote-candidate");
-        }
-
-      if (local_candidate != NULL)
-        {
-          fs_candidate_destroy (priv->video_local_candidate);
-          priv->video_local_candidate = fs_candidate_copy (local_candidate);
-          g_object_notify (G_OBJECT (self), "video-local-candidate");
-        }
-
-      g_signal_emit (G_OBJECT (self), signals[CANDIDATES_CHANGED], 0,
-          FS_MEDIA_TYPE_VIDEO);
-    }
-
-  g_object_unref (session);
-}
-
-void
-empathy_call_handler_bus_message (EmpathyCallHandler *handler,
-  GstBus *bus, GstMessage *message)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (handler);
-  const GstStructure *s = gst_message_get_structure (message);
-
-  if (priv->tfchannel == NULL)
-    return;
-
-  if (s != NULL &&
-      gst_structure_has_name (s, "farsight-send-codec-changed"))
-    {
-      const GValue *val;
-      FsCodec *codec;
-      FsSession *session;
-
-      val = gst_structure_get_value (s, "codec");
-      codec = g_value_get_boxed (val);
-
-      val = gst_structure_get_value (s, "session");
-      session = g_value_get_object (val);
-
-      update_sending_codec (handler, codec, session);
-    }
-  else if (s != NULL &&
-      gst_structure_has_name (s, "farsight-recv-codecs-changed"))
-    {
-      const GValue *val;
-      GList *codecs;
-      FsStream *stream;
-
-      val = gst_structure_get_value (s, "codecs");
-      codecs = g_value_get_boxed (val);
-
-      val = gst_structure_get_value (s, "stream");
-      stream = g_value_get_object (val);
-
-      update_receiving_codec (handler, codecs, stream);
-    }
-  else if (s != NULL &&
-      gst_structure_has_name (s, "farsight-new-active-candidate-pair"))
-    {
-      const GValue *val;
-      FsCandidate *remote_candidate, *local_candidate;
-      FsStream *stream;
-
-      val = gst_structure_get_value (s, "remote-candidate");
-      remote_candidate = g_value_get_boxed (val);
-
-      val = gst_structure_get_value (s, "local-candidate");
-      local_candidate = g_value_get_boxed (val);
-
-      val = gst_structure_get_value (s, "stream");
-      stream = g_value_get_object (val);
-
-      update_candidates (handler, remote_candidate, local_candidate, stream);
-    }
-
-  tf_channel_bus_message (priv->tfchannel, message);
-}
-
-static void
-empathy_call_handler_tf_channel_session_created_cb (TfChannel *tfchannel,
-  FsConference *conference, FsParticipant *participant,
-  EmpathyCallHandler *self)
-{
-  g_signal_emit (G_OBJECT (self), signals[CONFERENCE_ADDED], 0,
-    GST_ELEMENT (conference));
-}
-
-static gboolean
-src_pad_added_error_idle (gpointer data)
-{
-  TfStream *stream = data;
-
-  tf_stream_error (stream, TP_MEDIA_STREAM_ERROR_MEDIA_ERROR,
-      "Could not link sink");
-  g_object_unref (stream);
-
-  return FALSE;
-}
-
-static void
-empathy_call_handler_tf_stream_src_pad_added_cb (TfStream *stream,
-  GstPad *pad, FsCodec *codec, EmpathyCallHandler  *handler)
-{
-  guint media_type;
-  gboolean retval;
-
-  g_object_get (stream, "media-type", &media_type, NULL);
-
-  g_signal_emit (G_OBJECT (handler), signals[SRC_PAD_ADDED], 0,
-      pad, media_type, &retval);
-
-  if (!retval)
-    g_idle_add (src_pad_added_error_idle, g_object_ref (stream));
-}
-
-
-static gboolean
-empathy_call_handler_tf_stream_request_resource_cb (TfStream *stream,
-  guint direction, EmpathyTpStreamedMedia *call)
-{
-  gboolean ret;
-  guint media_type;
-
-  g_object_get (G_OBJECT (stream), "media-type", &media_type, NULL);
-
-  g_signal_emit (G_OBJECT (call),
-    signals[REQUEST_RESOURCE], 0, media_type, direction, &ret);
-
-  return ret;
-}
-
-static void
-empathy_call_handler_tf_stream_closed_cb (TfStream *stream,
-  EmpathyCallHandler *handler)
-{
-  g_signal_emit (handler, signals[STREAM_CLOSED], 0, stream);
-}
-
-static void
-empathy_call_handler_tf_channel_stream_created_cb (TfChannel *tfchannel,
-  TfStream *stream, EmpathyCallHandler *handler)
-{
-  guint media_type;
-  GstPad *spad;
-  gboolean retval;
-  FsStream *fs_stream;
-  GList *codecs;
-  FsSession *session;
-  FsCodec *codec;
-
-  g_signal_connect (stream, "src-pad-added",
-      G_CALLBACK (empathy_call_handler_tf_stream_src_pad_added_cb), handler);
-  g_signal_connect (stream, "request-resource",
-      G_CALLBACK (empathy_call_handler_tf_stream_request_resource_cb),
-        handler);
-  g_signal_connect (stream, "closed",
-      G_CALLBACK (empathy_call_handler_tf_stream_closed_cb), handler);
-
-  g_object_get (stream, "media-type", &media_type,
-    "sink-pad", &spad, NULL);
-
-  g_signal_emit (G_OBJECT (handler), signals[SINK_PAD_ADDED], 0,
-      spad, media_type, &retval);
-
- if (!retval)
-      tf_stream_error (stream, TP_MEDIA_STREAM_ERROR_MEDIA_ERROR,
-          "Could not link source");
-
- /* Get sending codec */
- g_object_get (stream, "farsight-session", &session, NULL);
- g_object_get (session, "current-send-codec", &codec, NULL);
-
- update_sending_codec (handler, codec, session);
-
- tp_clear_object (&session);
- tp_clear_object (&codec);
-
- /* Get receiving codec */
- g_object_get (stream, "farsight-stream", &fs_stream, NULL);
- g_object_get (fs_stream, "current-recv-codecs", &codecs, NULL);
-
- update_receiving_codec (handler, codecs, fs_stream);
-
- fs_codec_list_destroy (codecs);
- tp_clear_object (&fs_stream);
-
- gst_object_unref (spad);
-}
-
-static void
-empathy_call_handler_tf_channel_closed_cb (TfChannel *tfchannel,
-  EmpathyCallHandler *handler)
-{
-  g_signal_emit (G_OBJECT (handler), signals[CLOSED], 0);
-}
-
-static GList *
-empathy_call_handler_tf_channel_codec_config_cb (TfChannel *channel,
-  guint stream_id, FsMediaType media_type, guint direction, gpointer user_data)
-{
-  gchar *filename = empathy_file_lookup ("codec-preferences", "data");
-  GList *codecs;
-  GError *error = NULL;
-
-  codecs = fs_codec_list_from_keyfile (filename, &error);
-  g_free (filename);
-
-  if (!codecs)
-    {
-      g_warning ("No codec-preferences file: %s",
-          error ? error->message : "No error message");
-    }
-  g_clear_error (&error);
-
-  return codecs;
-}
-
-static void
-empathy_call_handler_start_tpfs (EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-  TpChannel *channel;
-
-  g_object_get (priv->call, "channel", &channel, NULL);
-
-  g_assert (channel != NULL);
-
-  priv->tfchannel = tf_channel_new (channel);
-
-  /* Set up the telepathy farsight channel */
-  g_signal_connect (priv->tfchannel, "session-created",
-      G_CALLBACK (empathy_call_handler_tf_channel_session_created_cb), self);
-  g_signal_connect (priv->tfchannel, "stream-created",
-      G_CALLBACK (empathy_call_handler_tf_channel_stream_created_cb), self);
-  g_signal_connect (priv->tfchannel, "closed",
-      G_CALLBACK (empathy_call_handler_tf_channel_closed_cb), self);
-  g_signal_connect (priv->tfchannel, "stream-get-codec-config",
-      G_CALLBACK (empathy_call_handler_tf_channel_codec_config_cb), self);
-
-  g_object_unref (channel);
-}
-
-static void
-empathy_call_handler_request_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyCallHandler *self = EMPATHY_CALL_HANDLER (user_data);
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-  TpChannel *channel;
-  GError *error = NULL;
-  TpAccountChannelRequest *req = TP_ACCOUNT_CHANNEL_REQUEST (source);
-  TpAccount *account;
-
-  channel = tp_account_channel_request_create_and_handle_channel_finish (req,
-      result, NULL, &error);
-  if (channel == NULL)
-    {
-      DEBUG ("Failed to create the channel: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  account = tp_account_channel_request_get_account (req);
-
-  priv->call = empathy_tp_streamed_media_new (account, channel);
-
-  g_object_notify (G_OBJECT (self), "tp-call");
-
-  empathy_call_handler_start_tpfs (self);
-
-  g_object_unref (channel);
-}
-
-void
-empathy_call_handler_start_call (EmpathyCallHandler *handler,
-    gint64 timestamp)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (handler);
-  TpAccountChannelRequest *req;
-  TpAccount *account;
-  GHashTable *request;
-
-  if (priv->call != NULL)
-    {
-      empathy_call_handler_start_tpfs (handler);
-      empathy_tp_streamed_media_accept_incoming_call (priv->call);
-      return;
-    }
-
-  /* No TpStreamedMedia object (we are redialing). Request a new media channel that
-   * will be used to create a new EmpathyTpStreamedMedia. */
-  g_assert (priv->contact != NULL);
-
-  account = empathy_contact_get_account (priv->contact);
-  request = empathy_call_factory_create_request (priv->contact,
-      priv->initial_audio, priv->initial_video);
-
-  req = tp_account_channel_request_new (account, request, timestamp);
-
-  tp_account_channel_request_create_and_handle_channel_async (req, NULL,
-      empathy_call_handler_request_cb, handler);
-
-  g_object_unref (req);
-  g_hash_table_unref (request);
-}
-
-/**
- * empathy_call_handler_stop_call:
- * @handler: an #EmpathyCallHandler
- *
- * Closes the #EmpathyCallHandler's call and frees its resources.
- */
-void
-empathy_call_handler_stop_call (EmpathyCallHandler *handler)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (handler);
-
-  if (priv->call != NULL)
-    {
-      empathy_tp_streamed_media_leave (priv->call);
-      g_object_unref (priv->call);
-    }
-
-  priv->call = NULL;
-}
-
-/**
- * empathy_call_handler_has_initial_video:
- * @handler: an #EmpathyCallHandler
- *
- * Return %TRUE if the call managed by this #EmpathyCallHandler was
- * created with video enabled
- *
- * Return value: %TRUE if the call was created as a video conversation.
- */
-gboolean
-empathy_call_handler_has_initial_video (EmpathyCallHandler *handler)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (handler);
-
-  return priv->initial_video;
-}
-
-FsCodec *
-empathy_call_handler_get_send_audio_codec (EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-
-  return priv->send_audio_codec;
-}
-
-FsCodec *
-empathy_call_handler_get_send_video_codec (EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-
-  return priv->send_video_codec;
-}
-
-GList *
-empathy_call_handler_get_recv_audio_codecs (EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-
-  return priv->recv_audio_codecs;
-}
-
-GList *
-empathy_call_handler_get_recv_video_codecs (EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-
-  return priv->recv_video_codecs;
-}
-
-FsCandidate *
-empathy_call_handler_get_audio_remote_candidate (
-    EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-
-  return priv->audio_remote_candidate;
-}
-
-FsCandidate *
-empathy_call_handler_get_audio_local_candidate (
-    EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-
-  return priv->audio_local_candidate;
-}
-
-FsCandidate *
-empathy_call_handler_get_video_remote_candidate (
-    EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-
-  return priv->video_remote_candidate;
-}
-
-FsCandidate *
-empathy_call_handler_get_video_local_candidate (
-    EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-
-  return priv->video_local_candidate;
-}
diff --git a/libempathy/empathy-call-handler.h b/libempathy/empathy-call-handler.h
deleted file mode 100644 (file)
index 1e0fd71..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * empathy-call-handler.h - Header for EmpathyCallHandler
- * Copyright (C) 2008-2009 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_HANDLER_H__
-#define __EMPATHY_CALL_HANDLER_H__
-
-#include <glib-object.h>
-
-#include <gst/gst.h>
-#include <gst/farsight/fs-conference-iface.h>
-
-#include <libempathy/empathy-tp-streamed-media.h>
-#include <libempathy/empathy-contact.h>
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyCallHandler EmpathyCallHandler;
-typedef struct _EmpathyCallHandlerClass EmpathyCallHandlerClass;
-
-struct _EmpathyCallHandlerClass {
-    GObjectClass parent_class;
-};
-
-struct _EmpathyCallHandler {
-    GObject parent;
-    gpointer priv;
-};
-
-GType empathy_call_handler_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_CALL_HANDLER \
-  (empathy_call_handler_get_type ())
-#define EMPATHY_CALL_HANDLER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_CALL_HANDLER, \
-    EmpathyCallHandler))
-#define EMPATHY_CALL_HANDLER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_CALL_HANDLER, \
-  EmpathyCallHandlerClass))
-#define EMPATHY_IS_CALL_HANDLER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_CALL_HANDLER))
-#define EMPATHY_IS_CALL_HANDLER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_CALL_HANDLER))
-#define EMPATHY_CALL_HANDLER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CALL_HANDLER, \
-  EmpathyCallHandlerClass))
-
-EmpathyCallHandler * empathy_call_handler_new_for_contact (
-  EmpathyContact *contact);
-
-EmpathyCallHandler * empathy_call_handler_new_for_channel (
-  EmpathyTpStreamedMedia *call);
-
-void empathy_call_handler_start_call (EmpathyCallHandler *handler,
-    gint64 timestamp);
-void empathy_call_handler_stop_call (EmpathyCallHandler *handler);
-
-gboolean empathy_call_handler_has_initial_video (EmpathyCallHandler *handler);
-
-void empathy_call_handler_bus_message (EmpathyCallHandler *handler,
-  GstBus *bus, GstMessage *message);
-
-FsCodec * empathy_call_handler_get_send_audio_codec (
-    EmpathyCallHandler *self);
-
-FsCodec * empathy_call_handler_get_send_video_codec (
-    EmpathyCallHandler *self);
-
-GList * empathy_call_handler_get_recv_audio_codecs (
-    EmpathyCallHandler *self);
-
-GList * empathy_call_handler_get_recv_video_codecs (
-    EmpathyCallHandler *self);
-
-FsCandidate * empathy_call_handler_get_audio_remote_candidate (
-    EmpathyCallHandler *self);
-
-FsCandidate * empathy_call_handler_get_audio_local_candidate (
-    EmpathyCallHandler *self);
-
-FsCandidate * empathy_call_handler_get_video_remote_candidate (
-    EmpathyCallHandler *self);
-
-FsCandidate * empathy_call_handler_get_video_local_candidate (
-    EmpathyCallHandler *self);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_CALL_HANDLER_H__*/
diff --git a/libempathy/empathy-streamed-media-handler.c b/libempathy/empathy-streamed-media-handler.c
new file mode 100644 (file)
index 0000000..7fa49cd
--- /dev/null
@@ -0,0 +1,924 @@
+/*
+ * empathy-call-handler.c - Source for EmpathyStreamedMediaHandler
+ * Copyright (C) 2008-2009 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
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <telepathy-glib/account-channel-request.h>
+#include <telepathy-glib/util.h>
+#include <telepathy-glib/interfaces.h>
+
+#include <telepathy-farsight/channel.h>
+#include <telepathy-farsight/stream.h>
+
+#include "empathy-streamed-media-handler.h"
+#include "empathy-call-factory.h"
+#include "empathy-marshal.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include <libempathy/empathy-debug.h>
+
+G_DEFINE_TYPE(EmpathyStreamedMediaHandler, empathy_streamed_media_handler, G_TYPE_OBJECT)
+
+/* signal enum */
+enum {
+  CONFERENCE_ADDED,
+  SRC_PAD_ADDED,
+  SINK_PAD_ADDED,
+  REQUEST_RESOURCE,
+  CLOSED,
+  STREAM_CLOSED,
+  CANDIDATES_CHANGED,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = {0};
+
+enum {
+  PROP_TP_STREAMED_MEDIA = 1,
+  PROP_GST_BUS,
+  PROP_CONTACT,
+  PROP_INITIAL_AUDIO,
+  PROP_INITIAL_VIDEO,
+  PROP_SEND_AUDIO_CODEC,
+  PROP_SEND_VIDEO_CODEC,
+  PROP_RECV_AUDIO_CODECS,
+  PROP_RECV_VIDEO_CODECS,
+  PROP_AUDIO_REMOTE_CANDIDATE,
+  PROP_VIDEO_REMOTE_CANDIDATE,
+  PROP_AUDIO_LOCAL_CANDIDATE,
+  PROP_VIDEO_LOCAL_CANDIDATE,
+};
+
+/* private structure */
+
+typedef struct {
+  gboolean dispose_has_run;
+  EmpathyTpStreamedMedia *call;
+  EmpathyContact *contact;
+  TfChannel *tfchannel;
+  gboolean initial_audio;
+  gboolean initial_video;
+
+  FsCodec *send_audio_codec;
+  FsCodec *send_video_codec;
+  GList *recv_audio_codecs;
+  GList *recv_video_codecs;
+  FsCandidate *audio_remote_candidate;
+  FsCandidate *video_remote_candidate;
+  FsCandidate *audio_local_candidate;
+  FsCandidate *video_local_candidate;
+} EmpathyStreamedMediaHandlerPriv;
+
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStreamedMediaHandler)
+
+static void
+empathy_streamed_media_handler_dispose (GObject *object)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (object);
+
+  if (priv->dispose_has_run)
+    return;
+
+  priv->dispose_has_run = TRUE;
+
+  if (priv->contact != NULL)
+    g_object_unref (priv->contact);
+
+  priv->contact = NULL;
+
+  if (priv->tfchannel != NULL)
+    g_object_unref (priv->tfchannel);
+
+  priv->tfchannel = NULL;
+
+  if (priv->call != NULL)
+    {
+      empathy_tp_streamed_media_close (priv->call);
+      g_object_unref (priv->call);
+    }
+
+  priv->call = NULL;
+
+  /* release any references held by the object here */
+  if (G_OBJECT_CLASS (empathy_streamed_media_handler_parent_class)->dispose)
+    G_OBJECT_CLASS (empathy_streamed_media_handler_parent_class)->dispose (object);
+}
+
+static void
+empathy_streamed_media_handler_finalize (GObject *object)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (object);
+
+  fs_codec_destroy (priv->send_audio_codec);
+  fs_codec_destroy (priv->send_video_codec);
+  fs_codec_list_destroy (priv->recv_audio_codecs);
+  fs_codec_list_destroy (priv->recv_video_codecs);
+  fs_candidate_destroy (priv->audio_remote_candidate);
+  fs_candidate_destroy (priv->video_remote_candidate);
+  fs_candidate_destroy (priv->audio_local_candidate);
+  fs_candidate_destroy (priv->video_local_candidate);
+
+  if (G_OBJECT_CLASS (empathy_streamed_media_handler_parent_class)->finalize)
+    G_OBJECT_CLASS (empathy_streamed_media_handler_parent_class)->finalize (object);
+}
+
+static void
+empathy_streamed_media_handler_init (EmpathyStreamedMediaHandler *obj)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj,
+    EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, EmpathyStreamedMediaHandlerPriv);
+
+  obj->priv = priv;
+}
+
+static void
+empathy_streamed_media_handler_constructed (GObject *object)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (object);
+
+  if (priv->contact == NULL)
+    {
+      g_object_get (priv->call, "contact", &(priv->contact), NULL);
+    }
+}
+
+static void
+empathy_streamed_media_handler_set_property (GObject *object,
+  guint property_id, const GValue *value, GParamSpec *pspec)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (object);
+
+  switch (property_id)
+    {
+      case PROP_CONTACT:
+        priv->contact = g_value_dup_object (value);
+        break;
+      case PROP_TP_STREAMED_MEDIA:
+        priv->call = g_value_dup_object (value);
+        break;
+      case PROP_INITIAL_AUDIO:
+        priv->initial_audio = g_value_get_boolean (value);
+        break;
+      case PROP_INITIAL_VIDEO:
+        priv->initial_video = g_value_get_boolean (value);
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+static void
+empathy_streamed_media_handler_get_property (GObject *object,
+  guint property_id, GValue *value, GParamSpec *pspec)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (object);
+
+  switch (property_id)
+    {
+      case PROP_CONTACT:
+        g_value_set_object (value, priv->contact);
+        break;
+      case PROP_TP_STREAMED_MEDIA:
+        g_value_set_object (value, priv->call);
+        break;
+      case PROP_INITIAL_AUDIO:
+        g_value_set_boolean (value, priv->initial_audio);
+        break;
+      case PROP_INITIAL_VIDEO:
+        g_value_set_boolean (value, priv->initial_video);
+        break;
+      case PROP_SEND_AUDIO_CODEC:
+        g_value_set_boxed (value, priv->send_audio_codec);
+        break;
+      case PROP_SEND_VIDEO_CODEC:
+        g_value_set_boxed (value, priv->send_video_codec);
+        break;
+      case PROP_RECV_AUDIO_CODECS:
+        g_value_set_boxed (value, priv->recv_audio_codecs);
+        break;
+      case PROP_RECV_VIDEO_CODECS:
+        g_value_set_boxed (value, priv->recv_video_codecs);
+        break;
+      case PROP_AUDIO_REMOTE_CANDIDATE:
+        g_value_set_boxed (value, priv->audio_remote_candidate);
+        break;
+      case PROP_VIDEO_REMOTE_CANDIDATE:
+        g_value_set_boxed (value, priv->video_remote_candidate);
+        break;
+      case PROP_AUDIO_LOCAL_CANDIDATE:
+        g_value_set_boxed (value, priv->audio_local_candidate);
+        break;
+      case PROP_VIDEO_LOCAL_CANDIDATE:
+        g_value_set_boxed (value, priv->video_local_candidate);
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+
+static void
+empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GParamSpec *param_spec;
+
+  g_type_class_add_private (klass, sizeof (EmpathyStreamedMediaHandlerPriv));
+
+  object_class->constructed = empathy_streamed_media_handler_constructed;
+  object_class->set_property = empathy_streamed_media_handler_set_property;
+  object_class->get_property = empathy_streamed_media_handler_get_property;
+  object_class->dispose = empathy_streamed_media_handler_dispose;
+  object_class->finalize = empathy_streamed_media_handler_finalize;
+
+  param_spec = g_param_spec_object ("contact",
+    "contact", "The remote contact",
+    EMPATHY_TYPE_CONTACT,
+    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_CONTACT, param_spec);
+
+  param_spec = g_param_spec_object ("tp-call",
+    "tp-call", "The calls channel wrapper",
+    EMPATHY_TYPE_TP_STREAMED_MEDIA,
+    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_TP_STREAMED_MEDIA, param_spec);
+
+  param_spec = g_param_spec_boolean ("initial-audio",
+    "initial-audio", "Whether the call should start with audio",
+    TRUE,
+    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_INITIAL_AUDIO,
+      param_spec);
+
+  param_spec = g_param_spec_boolean ("initial-video",
+    "initial-video", "Whether the call should start with video",
+    FALSE,
+    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_INITIAL_VIDEO,
+    param_spec);
+
+  param_spec = g_param_spec_boxed ("send-audio-codec",
+    "send audio codec", "Codec used to encode the outgoing video stream",
+    FS_TYPE_CODEC,
+    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_SEND_AUDIO_CODEC,
+    param_spec);
+
+  param_spec = g_param_spec_boxed ("send-video-codec",
+    "send video codec", "Codec used to encode the outgoing video stream",
+    FS_TYPE_CODEC,
+    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_SEND_VIDEO_CODEC,
+    param_spec);
+
+  param_spec = g_param_spec_boxed ("recv-audio-codecs",
+    "recvs audio codec", "Codecs used to decode the incoming audio stream",
+    FS_TYPE_CODEC_LIST,
+    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_RECV_AUDIO_CODECS,
+    param_spec);
+
+  param_spec = g_param_spec_boxed ("recv-video-codecs",
+    "recvs video codec", "Codecs used to decode the incoming video stream",
+    FS_TYPE_CODEC_LIST,
+    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_RECV_VIDEO_CODECS,
+    param_spec);
+
+  param_spec = g_param_spec_boxed ("audio-remote-candidate",
+    "audio remote candidate",
+    "Remote candidate used for the audio stream",
+    FS_TYPE_CANDIDATE,
+    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class,
+      PROP_AUDIO_REMOTE_CANDIDATE, param_spec);
+
+  param_spec = g_param_spec_boxed ("video-remote-candidate",
+    "video remote candidate",
+    "Remote candidate used for the video stream",
+    FS_TYPE_CANDIDATE,
+    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class,
+      PROP_VIDEO_REMOTE_CANDIDATE, param_spec);
+
+  param_spec = g_param_spec_boxed ("audio-local-candidate",
+    "audio local candidate",
+    "Local candidate used for the audio stream",
+    FS_TYPE_CANDIDATE,
+    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class,
+      PROP_AUDIO_REMOTE_CANDIDATE, param_spec);
+
+  param_spec = g_param_spec_boxed ("video-local-candidate",
+    "video local candidate",
+    "Local candidate used for the video stream",
+    FS_TYPE_CANDIDATE,
+    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class,
+      PROP_VIDEO_REMOTE_CANDIDATE, param_spec);
+
+  signals[CONFERENCE_ADDED] =
+    g_signal_new ("conference-added", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+      g_cclosure_marshal_VOID__OBJECT,
+      G_TYPE_NONE,
+      1, FS_TYPE_CONFERENCE);
+
+  signals[SRC_PAD_ADDED] =
+    g_signal_new ("src-pad-added", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+      _empathy_marshal_BOOLEAN__OBJECT_UINT,
+      G_TYPE_BOOLEAN,
+      2, GST_TYPE_PAD, G_TYPE_UINT);
+
+  signals[SINK_PAD_ADDED] =
+    g_signal_new ("sink-pad-added", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+      _empathy_marshal_BOOLEAN__OBJECT_UINT,
+      G_TYPE_BOOLEAN,
+      2, GST_TYPE_PAD, G_TYPE_UINT);
+
+  signals[REQUEST_RESOURCE] =
+    g_signal_new ("request-resource", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0,
+      g_signal_accumulator_true_handled, NULL,
+      _empathy_marshal_BOOLEAN__UINT_UINT,
+      G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT);
+
+  signals[CLOSED] =
+    g_signal_new ("closed", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+      g_cclosure_marshal_VOID__VOID,
+      G_TYPE_NONE,
+      0);
+
+  signals[STREAM_CLOSED] =
+    g_signal_new ("stream-closed", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+      g_cclosure_marshal_VOID__OBJECT,
+      G_TYPE_NONE, 1, TF_TYPE_STREAM);
+
+  signals[CANDIDATES_CHANGED] =
+    g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+      g_cclosure_marshal_VOID__UINT,
+      G_TYPE_NONE, 1, G_TYPE_UINT);
+}
+
+/**
+ * empathy_streamed_media_handler_new_for_contact:
+ * @contact: an #EmpathyContact
+ *
+ * Creates a new #EmpathyStreamedMediaHandler with contact @contact.
+ *
+ * Return value: a new #EmpathyStreamedMediaHandler
+ */
+EmpathyStreamedMediaHandler *
+empathy_streamed_media_handler_new_for_contact (EmpathyContact *contact)
+{
+  return EMPATHY_STREAMED_MEDIA_HANDLER (g_object_new (EMPATHY_TYPE_STREAMED_MEDIA_HANDLER,
+    "contact", contact, NULL));
+}
+
+EmpathyStreamedMediaHandler *
+empathy_streamed_media_handler_new_for_channel (EmpathyTpStreamedMedia *call)
+{
+  return EMPATHY_STREAMED_MEDIA_HANDLER (g_object_new (EMPATHY_TYPE_STREAMED_MEDIA_HANDLER,
+    "tp-call", call,
+    "initial-video", empathy_tp_streamed_media_is_receiving_video (call),
+    NULL));
+}
+
+static void
+update_sending_codec (EmpathyStreamedMediaHandler *self,
+    FsCodec *codec,
+    FsSession *session)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+  FsMediaType type;
+
+  if (codec == NULL || session == NULL)
+    return;
+
+  g_object_get (session, "media-type", &type, NULL);
+
+  if (type == FS_MEDIA_TYPE_AUDIO)
+    {
+      priv->send_audio_codec = fs_codec_copy (codec);
+      g_object_notify (G_OBJECT (self), "send-audio-codec");
+    }
+  else if (type == FS_MEDIA_TYPE_VIDEO)
+    {
+      priv->send_video_codec = fs_codec_copy (codec);
+      g_object_notify (G_OBJECT (self), "send-video-codec");
+    }
+}
+
+static void
+update_receiving_codec (EmpathyStreamedMediaHandler *self,
+    GList *codecs,
+    FsStream *stream)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+  FsSession *session;
+  FsMediaType type;
+
+  if (codecs == NULL || stream == NULL)
+    return;
+
+  g_object_get (stream, "session", &session, NULL);
+  if (session == NULL)
+    return;
+
+  g_object_get (session, "media-type", &type, NULL);
+
+  if (type == FS_MEDIA_TYPE_AUDIO)
+    {
+      priv->recv_audio_codecs = fs_codec_list_copy (codecs);
+      g_object_notify (G_OBJECT (self), "recv-audio-codecs");
+    }
+  else if (type == FS_MEDIA_TYPE_VIDEO)
+    {
+      priv->recv_video_codecs = fs_codec_list_copy (codecs);
+      g_object_notify (G_OBJECT (self), "recv-video-codecs");
+    }
+
+  g_object_unref (session);
+}
+
+static void
+update_candidates (EmpathyStreamedMediaHandler *self,
+    FsCandidate *remote_candidate,
+    FsCandidate *local_candidate,
+    FsStream *stream)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+  FsSession *session;
+  FsMediaType type;
+
+  if (stream == NULL)
+    return;
+
+  g_object_get (stream, "session", &session, NULL);
+  if (session == NULL)
+    return;
+
+  g_object_get (session, "media-type", &type, NULL);
+
+  if (type == FS_MEDIA_TYPE_AUDIO)
+    {
+      if (remote_candidate != NULL)
+        {
+          fs_candidate_destroy (priv->audio_remote_candidate);
+          priv->audio_remote_candidate = fs_candidate_copy (remote_candidate);
+          g_object_notify (G_OBJECT (self), "audio-remote-candidate");
+        }
+
+      if (local_candidate != NULL)
+        {
+          fs_candidate_destroy (priv->audio_local_candidate);
+          priv->audio_local_candidate = fs_candidate_copy (local_candidate);
+          g_object_notify (G_OBJECT (self), "audio-local-candidate");
+        }
+
+      g_signal_emit (G_OBJECT (self), signals[CANDIDATES_CHANGED], 0,
+          FS_MEDIA_TYPE_AUDIO);
+    }
+  else if (type == FS_MEDIA_TYPE_VIDEO)
+    {
+      if (remote_candidate != NULL)
+        {
+          fs_candidate_destroy (priv->video_remote_candidate);
+          priv->video_remote_candidate = fs_candidate_copy (remote_candidate);
+          g_object_notify (G_OBJECT (self), "video-remote-candidate");
+        }
+
+      if (local_candidate != NULL)
+        {
+          fs_candidate_destroy (priv->video_local_candidate);
+          priv->video_local_candidate = fs_candidate_copy (local_candidate);
+          g_object_notify (G_OBJECT (self), "video-local-candidate");
+        }
+
+      g_signal_emit (G_OBJECT (self), signals[CANDIDATES_CHANGED], 0,
+          FS_MEDIA_TYPE_VIDEO);
+    }
+
+  g_object_unref (session);
+}
+
+void
+empathy_streamed_media_handler_bus_message (EmpathyStreamedMediaHandler *handler,
+  GstBus *bus, GstMessage *message)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (handler);
+  const GstStructure *s = gst_message_get_structure (message);
+
+  if (priv->tfchannel == NULL)
+    return;
+
+  if (s != NULL &&
+      gst_structure_has_name (s, "farsight-send-codec-changed"))
+    {
+      const GValue *val;
+      FsCodec *codec;
+      FsSession *session;
+
+      val = gst_structure_get_value (s, "codec");
+      codec = g_value_get_boxed (val);
+
+      val = gst_structure_get_value (s, "session");
+      session = g_value_get_object (val);
+
+      update_sending_codec (handler, codec, session);
+    }
+  else if (s != NULL &&
+      gst_structure_has_name (s, "farsight-recv-codecs-changed"))
+    {
+      const GValue *val;
+      GList *codecs;
+      FsStream *stream;
+
+      val = gst_structure_get_value (s, "codecs");
+      codecs = g_value_get_boxed (val);
+
+      val = gst_structure_get_value (s, "stream");
+      stream = g_value_get_object (val);
+
+      update_receiving_codec (handler, codecs, stream);
+    }
+  else if (s != NULL &&
+      gst_structure_has_name (s, "farsight-new-active-candidate-pair"))
+    {
+      const GValue *val;
+      FsCandidate *remote_candidate, *local_candidate;
+      FsStream *stream;
+
+      val = gst_structure_get_value (s, "remote-candidate");
+      remote_candidate = g_value_get_boxed (val);
+
+      val = gst_structure_get_value (s, "local-candidate");
+      local_candidate = g_value_get_boxed (val);
+
+      val = gst_structure_get_value (s, "stream");
+      stream = g_value_get_object (val);
+
+      update_candidates (handler, remote_candidate, local_candidate, stream);
+    }
+
+  tf_channel_bus_message (priv->tfchannel, message);
+}
+
+static void
+empathy_streamed_media_handler_tf_channel_session_created_cb (TfChannel *tfchannel,
+  FsConference *conference, FsParticipant *participant,
+  EmpathyStreamedMediaHandler *self)
+{
+  g_signal_emit (G_OBJECT (self), signals[CONFERENCE_ADDED], 0,
+    GST_ELEMENT (conference));
+}
+
+static gboolean
+src_pad_added_error_idle (gpointer data)
+{
+  TfStream *stream = data;
+
+  tf_stream_error (stream, TP_MEDIA_STREAM_ERROR_MEDIA_ERROR,
+      "Could not link sink");
+  g_object_unref (stream);
+
+  return FALSE;
+}
+
+static void
+empathy_streamed_media_handler_tf_stream_src_pad_added_cb (TfStream *stream,
+  GstPad *pad, FsCodec *codec, EmpathyStreamedMediaHandler  *handler)
+{
+  guint media_type;
+  gboolean retval;
+
+  g_object_get (stream, "media-type", &media_type, NULL);
+
+  g_signal_emit (G_OBJECT (handler), signals[SRC_PAD_ADDED], 0,
+      pad, media_type, &retval);
+
+  if (!retval)
+    g_idle_add (src_pad_added_error_idle, g_object_ref (stream));
+}
+
+
+static gboolean
+empathy_streamed_media_handler_tf_stream_request_resource_cb (TfStream *stream,
+  guint direction, EmpathyTpStreamedMedia *call)
+{
+  gboolean ret;
+  guint media_type;
+
+  g_object_get (G_OBJECT (stream), "media-type", &media_type, NULL);
+
+  g_signal_emit (G_OBJECT (call),
+    signals[REQUEST_RESOURCE], 0, media_type, direction, &ret);
+
+  return ret;
+}
+
+static void
+empathy_streamed_media_handler_tf_stream_closed_cb (TfStream *stream,
+  EmpathyStreamedMediaHandler *handler)
+{
+  g_signal_emit (handler, signals[STREAM_CLOSED], 0, stream);
+}
+
+static void
+empathy_streamed_media_handler_tf_channel_stream_created_cb (TfChannel *tfchannel,
+  TfStream *stream, EmpathyStreamedMediaHandler *handler)
+{
+  guint media_type;
+  GstPad *spad;
+  gboolean retval;
+  FsStream *fs_stream;
+  GList *codecs;
+  FsSession *session;
+  FsCodec *codec;
+
+  g_signal_connect (stream, "src-pad-added",
+      G_CALLBACK (empathy_streamed_media_handler_tf_stream_src_pad_added_cb), handler);
+  g_signal_connect (stream, "request-resource",
+      G_CALLBACK (empathy_streamed_media_handler_tf_stream_request_resource_cb),
+        handler);
+  g_signal_connect (stream, "closed",
+      G_CALLBACK (empathy_streamed_media_handler_tf_stream_closed_cb), handler);
+
+  g_object_get (stream, "media-type", &media_type,
+    "sink-pad", &spad, NULL);
+
+  g_signal_emit (G_OBJECT (handler), signals[SINK_PAD_ADDED], 0,
+      spad, media_type, &retval);
+
+ if (!retval)
+      tf_stream_error (stream, TP_MEDIA_STREAM_ERROR_MEDIA_ERROR,
+          "Could not link source");
+
+ /* Get sending codec */
+ g_object_get (stream, "farsight-session", &session, NULL);
+ g_object_get (session, "current-send-codec", &codec, NULL);
+
+ update_sending_codec (handler, codec, session);
+
+ tp_clear_object (&session);
+ tp_clear_object (&codec);
+
+ /* Get receiving codec */
+ g_object_get (stream, "farsight-stream", &fs_stream, NULL);
+ g_object_get (fs_stream, "current-recv-codecs", &codecs, NULL);
+
+ update_receiving_codec (handler, codecs, fs_stream);
+
+ fs_codec_list_destroy (codecs);
+ tp_clear_object (&fs_stream);
+
+ gst_object_unref (spad);
+}
+
+static void
+empathy_streamed_media_handler_tf_channel_closed_cb (TfChannel *tfchannel,
+  EmpathyStreamedMediaHandler *handler)
+{
+  g_signal_emit (G_OBJECT (handler), signals[CLOSED], 0);
+}
+
+static GList *
+empathy_streamed_media_handler_tf_channel_codec_config_cb (TfChannel *channel,
+  guint stream_id, FsMediaType media_type, guint direction, gpointer user_data)
+{
+  gchar *filename = empathy_file_lookup ("codec-preferences", "data");
+  GList *codecs;
+  GError *error = NULL;
+
+  codecs = fs_codec_list_from_keyfile (filename, &error);
+  g_free (filename);
+
+  if (!codecs)
+    {
+      g_warning ("No codec-preferences file: %s",
+          error ? error->message : "No error message");
+    }
+  g_clear_error (&error);
+
+  return codecs;
+}
+
+static void
+empathy_streamed_media_handler_start_tpfs (EmpathyStreamedMediaHandler *self)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+  TpChannel *channel;
+
+  g_object_get (priv->call, "channel", &channel, NULL);
+
+  g_assert (channel != NULL);
+
+  priv->tfchannel = tf_channel_new (channel);
+
+  /* Set up the telepathy farsight channel */
+  g_signal_connect (priv->tfchannel, "session-created",
+      G_CALLBACK (empathy_streamed_media_handler_tf_channel_session_created_cb), self);
+  g_signal_connect (priv->tfchannel, "stream-created",
+      G_CALLBACK (empathy_streamed_media_handler_tf_channel_stream_created_cb), self);
+  g_signal_connect (priv->tfchannel, "closed",
+      G_CALLBACK (empathy_streamed_media_handler_tf_channel_closed_cb), self);
+  g_signal_connect (priv->tfchannel, "stream-get-codec-config",
+      G_CALLBACK (empathy_streamed_media_handler_tf_channel_codec_config_cb), self);
+
+  g_object_unref (channel);
+}
+
+static void
+empathy_streamed_media_handler_request_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  EmpathyStreamedMediaHandler *self = EMPATHY_STREAMED_MEDIA_HANDLER (user_data);
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+  TpChannel *channel;
+  GError *error = NULL;
+  TpAccountChannelRequest *req = TP_ACCOUNT_CHANNEL_REQUEST (source);
+  TpAccount *account;
+
+  channel = tp_account_channel_request_create_and_handle_channel_finish (req,
+      result, NULL, &error);
+  if (channel == NULL)
+    {
+      DEBUG ("Failed to create the channel: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  account = tp_account_channel_request_get_account (req);
+
+  priv->call = empathy_tp_streamed_media_new (account, channel);
+
+  g_object_notify (G_OBJECT (self), "tp-call");
+
+  empathy_streamed_media_handler_start_tpfs (self);
+
+  g_object_unref (channel);
+}
+
+void
+empathy_streamed_media_handler_start_call (EmpathyStreamedMediaHandler *handler,
+    gint64 timestamp)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (handler);
+  TpAccountChannelRequest *req;
+  TpAccount *account;
+  GHashTable *request;
+
+  if (priv->call != NULL)
+    {
+      empathy_streamed_media_handler_start_tpfs (handler);
+      empathy_tp_streamed_media_accept_incoming_call (priv->call);
+      return;
+    }
+
+  /* No TpStreamedMedia object (we are redialing). Request a new media channel that
+   * will be used to create a new EmpathyTpStreamedMedia. */
+  g_assert (priv->contact != NULL);
+
+  account = empathy_contact_get_account (priv->contact);
+  request = empathy_call_factory_create_request (priv->contact,
+      priv->initial_audio, priv->initial_video);
+
+  req = tp_account_channel_request_new (account, request, timestamp);
+
+  tp_account_channel_request_create_and_handle_channel_async (req, NULL,
+      empathy_streamed_media_handler_request_cb, handler);
+
+  g_object_unref (req);
+  g_hash_table_unref (request);
+}
+
+/**
+ * empathy_streamed_media_handler_stop_call:
+ * @handler: an #EmpathyStreamedMediaHandler
+ *
+ * Closes the #EmpathyStreamedMediaHandler's call and frees its resources.
+ */
+void
+empathy_streamed_media_handler_stop_call (EmpathyStreamedMediaHandler *handler)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (handler);
+
+  if (priv->call != NULL)
+    {
+      empathy_tp_streamed_media_leave (priv->call);
+      g_object_unref (priv->call);
+    }
+
+  priv->call = NULL;
+}
+
+/**
+ * empathy_streamed_media_handler_has_initial_video:
+ * @handler: an #EmpathyStreamedMediaHandler
+ *
+ * Return %TRUE if the call managed by this #EmpathyStreamedMediaHandler was
+ * created with video enabled
+ *
+ * Return value: %TRUE if the call was created as a video conversation.
+ */
+gboolean
+empathy_streamed_media_handler_has_initial_video (EmpathyStreamedMediaHandler *handler)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (handler);
+
+  return priv->initial_video;
+}
+
+FsCodec *
+empathy_streamed_media_handler_get_send_audio_codec (EmpathyStreamedMediaHandler *self)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+
+  return priv->send_audio_codec;
+}
+
+FsCodec *
+empathy_streamed_media_handler_get_send_video_codec (EmpathyStreamedMediaHandler *self)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+
+  return priv->send_video_codec;
+}
+
+GList *
+empathy_streamed_media_handler_get_recv_audio_codecs (EmpathyStreamedMediaHandler *self)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+
+  return priv->recv_audio_codecs;
+}
+
+GList *
+empathy_streamed_media_handler_get_recv_video_codecs (EmpathyStreamedMediaHandler *self)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+
+  return priv->recv_video_codecs;
+}
+
+FsCandidate *
+empathy_streamed_media_handler_get_audio_remote_candidate (
+    EmpathyStreamedMediaHandler *self)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+
+  return priv->audio_remote_candidate;
+}
+
+FsCandidate *
+empathy_streamed_media_handler_get_audio_local_candidate (
+    EmpathyStreamedMediaHandler *self)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+
+  return priv->audio_local_candidate;
+}
+
+FsCandidate *
+empathy_streamed_media_handler_get_video_remote_candidate (
+    EmpathyStreamedMediaHandler *self)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+
+  return priv->video_remote_candidate;
+}
+
+FsCandidate *
+empathy_streamed_media_handler_get_video_local_candidate (
+    EmpathyStreamedMediaHandler *self)
+{
+  EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
+
+  return priv->video_local_candidate;
+}
diff --git a/libempathy/empathy-streamed-media-handler.h b/libempathy/empathy-streamed-media-handler.h
new file mode 100644 (file)
index 0000000..b6d7049
--- /dev/null
@@ -0,0 +1,106 @@
+/*
+ * empathy-call-handler.h - Header for EmpathyStreamedMediaHandler
+ * Copyright (C) 2008-2009 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_HANDLER_H__
+#define __EMPATHY_STREAMED_MEDIA_HANDLER_H__
+
+#include <glib-object.h>
+
+#include <gst/gst.h>
+#include <gst/farsight/fs-conference-iface.h>
+
+#include <libempathy/empathy-tp-streamed-media.h>
+#include <libempathy/empathy-contact.h>
+
+G_BEGIN_DECLS
+
+typedef struct _EmpathyStreamedMediaHandler EmpathyStreamedMediaHandler;
+typedef struct _EmpathyStreamedMediaHandlerClass EmpathyStreamedMediaHandlerClass;
+
+struct _EmpathyStreamedMediaHandlerClass {
+    GObjectClass parent_class;
+};
+
+struct _EmpathyStreamedMediaHandler {
+    GObject parent;
+    gpointer priv;
+};
+
+GType empathy_streamed_media_handler_get_type (void);
+
+/* TYPE MACROS */
+#define EMPATHY_TYPE_STREAMED_MEDIA_HANDLER \
+  (empathy_streamed_media_handler_get_type ())
+#define EMPATHY_STREAMED_MEDIA_HANDLER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, \
+    EmpathyStreamedMediaHandler))
+#define EMPATHY_STREAMED_MEDIA_HANDLER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, \
+  EmpathyStreamedMediaHandlerClass))
+#define EMPATHY_IS_STREAMED_MEDIA_HANDLER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_STREAMED_MEDIA_HANDLER))
+#define EMPATHY_IS_STREAMED_MEDIA_HANDLER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_STREAMED_MEDIA_HANDLER))
+#define EMPATHY_STREAMED_MEDIA_HANDLER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, \
+  EmpathyStreamedMediaHandlerClass))
+
+EmpathyStreamedMediaHandler * empathy_streamed_media_handler_new_for_contact (
+  EmpathyContact *contact);
+
+EmpathyStreamedMediaHandler * empathy_streamed_media_handler_new_for_channel (
+  EmpathyTpStreamedMedia *call);
+
+void empathy_streamed_media_handler_start_call (EmpathyStreamedMediaHandler *handler,
+    gint64 timestamp);
+void empathy_streamed_media_handler_stop_call (EmpathyStreamedMediaHandler *handler);
+
+gboolean empathy_streamed_media_handler_has_initial_video (EmpathyStreamedMediaHandler *handler);
+
+void empathy_streamed_media_handler_bus_message (EmpathyStreamedMediaHandler *handler,
+  GstBus *bus, GstMessage *message);
+
+FsCodec * empathy_streamed_media_handler_get_send_audio_codec (
+    EmpathyStreamedMediaHandler *self);
+
+FsCodec * empathy_streamed_media_handler_get_send_video_codec (
+    EmpathyStreamedMediaHandler *self);
+
+GList * empathy_streamed_media_handler_get_recv_audio_codecs (
+    EmpathyStreamedMediaHandler *self);
+
+GList * empathy_streamed_media_handler_get_recv_video_codecs (
+    EmpathyStreamedMediaHandler *self);
+
+FsCandidate * empathy_streamed_media_handler_get_audio_remote_candidate (
+    EmpathyStreamedMediaHandler *self);
+
+FsCandidate * empathy_streamed_media_handler_get_audio_local_candidate (
+    EmpathyStreamedMediaHandler *self);
+
+FsCandidate * empathy_streamed_media_handler_get_video_remote_candidate (
+    EmpathyStreamedMediaHandler *self);
+
+FsCandidate * empathy_streamed_media_handler_get_video_local_candidate (
+    EmpathyStreamedMediaHandler *self);
+
+G_END_DECLS
+
+#endif /* #ifndef __EMPATHY_STREAMED_MEDIA_HANDLER_H__*/
index 2313b22fc32ef97c3f93017c8ddc709c94870518..e93382d34d7a29a844dd1d09268175a344430b1e 100644 (file)
@@ -51,7 +51,7 @@ static EmpathyCallFactory *call_factory = NULL;
 
 static void
 new_call_handler_cb (EmpathyCallFactory *factory,
-    EmpathyCallHandler *handler,
+    EmpathyStreamedMediaHandler *handler,
     gboolean outgoing,
     gpointer user_data)
 {
index 2b9c48ce09855d9e75343c11f71f69f0b68dac41..ddfebeafd217a132e83fb63b76a67fec9af28393 100644 (file)
@@ -89,7 +89,7 @@ static guint signals[LAST_SIGNAL] = {0};
 #endif
 
 enum {
-  PROP_CALL_HANDLER = 1,
+  PROP_STREAMED_MEDIA_HANDLER = 1,
 };
 
 typedef enum {
@@ -111,7 +111,7 @@ typedef struct _EmpathyCallWindowPriv EmpathyCallWindowPriv;
 struct _EmpathyCallWindowPriv
 {
   gboolean dispose_has_run;
-  EmpathyCallHandler *handler;
+  EmpathyStreamedMediaHandler *handler;
   EmpathyContact *contact;
 
   guint call_state;
@@ -1315,7 +1315,7 @@ empathy_call_window_got_self_contact_cb (TpConnection *connection,
 
 static void
 empathy_call_window_setup_avatars (EmpathyCallWindow *self,
-    EmpathyCallHandler *handler)
+    EmpathyStreamedMediaHandler *handler)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
 
@@ -1375,12 +1375,12 @@ update_send_codec (EmpathyCallWindow *self,
 
   if (audio)
     {
-      codec = empathy_call_handler_get_send_audio_codec (priv->handler);
+      codec = empathy_streamed_media_handler_get_send_audio_codec (priv->handler);
       widget = priv->acodec_encoding_label;
     }
   else
     {
-      codec = empathy_call_handler_get_send_video_codec (priv->handler);
+      codec = empathy_streamed_media_handler_get_send_video_codec (priv->handler);
       widget = priv->vcodec_encoding_label;
     }
 
@@ -1423,12 +1423,12 @@ update_recv_codec (EmpathyCallWindow *self,
 
   if (audio)
     {
-      codecs = empathy_call_handler_get_recv_audio_codecs (priv->handler);
+      codecs = empathy_streamed_media_handler_get_recv_audio_codecs (priv->handler);
       widget = priv->acodec_decoding_label;
     }
   else
     {
-      codecs = empathy_call_handler_get_recv_video_codecs (priv->handler);
+      codecs = empathy_streamed_media_handler_get_recv_video_codecs (priv->handler);
       widget = priv->vcodec_decoding_label;
     }
 
@@ -1541,14 +1541,14 @@ candidates_changed_cb (GObject *object,
   if (type == FS_MEDIA_TYPE_VIDEO)
     {
       /* Update remote candidate */
-      candidate = empathy_call_handler_get_video_remote_candidate (
+      candidate = empathy_streamed_media_handler_get_video_remote_candidate (
           priv->handler);
 
       update_candidat_widget (self, priv->video_remote_candidate_label,
           priv->video_remote_candidate_info_img, candidate);
 
       /* Update local candidate */
-      candidate = empathy_call_handler_get_video_local_candidate (
+      candidate = empathy_streamed_media_handler_get_video_local_candidate (
           priv->handler);
 
       update_candidat_widget (self, priv->video_local_candidate_label,
@@ -1557,14 +1557,14 @@ candidates_changed_cb (GObject *object,
   else
     {
       /* Update remote candidate */
-      candidate = empathy_call_handler_get_audio_remote_candidate (
+      candidate = empathy_streamed_media_handler_get_audio_remote_candidate (
           priv->handler);
 
       update_candidat_widget (self, priv->audio_remote_candidate_label,
           priv->audio_remote_candidate_info_img, candidate);
 
       /* Update local candidate */
-      candidate = empathy_call_handler_get_audio_local_candidate (
+      candidate = empathy_streamed_media_handler_get_audio_local_candidate (
           priv->handler);
 
       update_candidat_widget (self, priv->audio_local_candidate_label,
@@ -1589,7 +1589,7 @@ empathy_call_window_constructed (GObject *object)
   empathy_call_window_setup_avatars (self, priv->handler);
   empathy_call_window_set_state_connecting (self);
 
-  if (!empathy_call_handler_has_initial_video (priv->handler))
+  if (!empathy_streamed_media_handler_has_initial_video (priv->handler))
     {
       gtk_toggle_tool_button_set_active (
           GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_off), TRUE);
@@ -1626,7 +1626,7 @@ empathy_call_window_set_property (GObject *object,
 
   switch (property_id)
     {
-      case PROP_CALL_HANDLER:
+      case PROP_STREAMED_MEDIA_HANDLER:
         priv->handler = g_value_dup_object (value);
         break;
       default:
@@ -1642,7 +1642,7 @@ empathy_call_window_get_property (GObject *object,
 
   switch (property_id)
     {
-      case PROP_CALL_HANDLER:
+      case PROP_STREAMED_MEDIA_HANDLER:
         g_value_set_object (value, priv->handler);
         break;
       default:
@@ -1669,10 +1669,10 @@ empathy_call_window_class_init (
 
   param_spec = g_param_spec_object ("handler",
     "handler", "The call handler",
-    EMPATHY_TYPE_CALL_HANDLER,
+    EMPATHY_TYPE_STREAMED_MEDIA_HANDLER,
     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class,
-    PROP_CALL_HANDLER, param_spec);
+    PROP_STREAMED_MEDIA_HANDLER, param_spec);
 }
 
 static void
@@ -1704,7 +1704,7 @@ empathy_call_window_dispose (GObject *object)
 
   if (priv->handler != NULL)
     {
-      empathy_call_handler_stop_call (priv->handler);
+      empathy_streamed_media_handler_stop_call (priv->handler);
       g_object_unref (priv->handler);
     }
   priv->handler = NULL;
@@ -1801,14 +1801,14 @@ empathy_call_window_finalize (GObject *object)
 
 
 EmpathyCallWindow *
-empathy_call_window_new (EmpathyCallHandler *handler)
+empathy_call_window_new (EmpathyStreamedMediaHandler *handler)
 {
   return EMPATHY_CALL_WINDOW (
     g_object_new (EMPATHY_TYPE_CALL_WINDOW, "handler", handler, NULL));
 }
 
 static void
-empathy_call_window_conference_added_cb (EmpathyCallHandler *handler,
+empathy_call_window_conference_added_cb (EmpathyStreamedMediaHandler *handler,
   GstElement *conference, gpointer user_data)
 {
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
@@ -1820,7 +1820,7 @@ empathy_call_window_conference_added_cb (EmpathyCallHandler *handler,
 }
 
 static gboolean
-empathy_call_window_request_resource_cb (EmpathyCallHandler *handler,
+empathy_call_window_request_resource_cb (EmpathyStreamedMediaHandler *handler,
   FsMediaType type, FsStreamDirection direction, gpointer user_data)
 {
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
@@ -1992,7 +1992,7 @@ empathy_call_window_disconnected (EmpathyCallWindow *self,
 
 
 static void
-empathy_call_window_channel_closed_cb (EmpathyCallHandler *handler,
+empathy_call_window_channel_closed_cb (EmpathyStreamedMediaHandler *handler,
     gpointer user_data)
 {
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
@@ -2005,7 +2005,7 @@ empathy_call_window_channel_closed_cb (EmpathyCallHandler *handler,
 
 
 static void
-empathy_call_window_channel_stream_closed_cb (EmpathyCallHandler *handler,
+empathy_call_window_channel_stream_closed_cb (EmpathyStreamedMediaHandler *handler,
     TfStream *stream, gpointer user_data)
 {
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
@@ -2514,7 +2514,7 @@ empathy_call_window_connected (gpointer user_data)
 
 /* Called from the streaming thread */
 static gboolean
-empathy_call_window_src_added_cb (EmpathyCallHandler *handler,
+empathy_call_window_src_added_cb (EmpathyStreamedMediaHandler *handler,
   GstPad *src, guint media_type, gpointer user_data)
 {
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
@@ -2595,7 +2595,7 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler,
 }
 
 static gboolean
-empathy_call_window_sink_added_cb (EmpathyCallHandler *handler,
+empathy_call_window_sink_added_cb (EmpathyStreamedMediaHandler *handler,
   GstPad *sink, guint media_type, gpointer user_data)
 {
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
@@ -2698,10 +2698,10 @@ start_call (EmpathyCallWindow *self)
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
 
   priv->call_started = TRUE;
-  empathy_call_handler_start_call (priv->handler,
+  empathy_streamed_media_handler_start_call (priv->handler,
       gtk_get_current_event_time ());
 
-  if (empathy_call_handler_has_initial_video (priv->handler))
+  if (empathy_streamed_media_handler_has_initial_video (priv->handler))
     {
       /* Enable 'send video' buttons and display the preview */
       gtk_toggle_tool_button_set_active (
@@ -2717,7 +2717,7 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message,
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
   GstState newstate;
 
-  empathy_call_handler_bus_message (priv->handler, bus, message);
+  empathy_streamed_media_handler_bus_message (priv->handler, bus, message);
 
   switch (GST_MESSAGE_TYPE (message))
     {
@@ -2813,7 +2813,7 @@ empathy_call_window_update_avatars_visibility (EmpathyTpStreamedMedia *call,
 }
 
 static void
-call_handler_notify_tp_streamed_media_cb (EmpathyCallHandler *handler,
+call_handler_notify_tp_streamed_media_cb (EmpathyStreamedMediaHandler *handler,
     GParamSpec *spec,
     EmpathyCallWindow *self)
 {
@@ -3124,7 +3124,7 @@ empathy_call_window_hangup_cb (gpointer object,
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (window);
 
-  empathy_call_handler_stop_call (priv->handler);
+  empathy_streamed_media_handler_stop_call (priv->handler);
 
   if (empathy_call_window_disconnected (window, FALSE))
     gtk_widget_destroy (GTK_WIDGET (window));
@@ -3174,7 +3174,7 @@ empathy_call_window_redial_cb (gpointer object,
   if (priv->call_state == CONNECTED)
     priv->call_state = REDIALING;
 
-  empathy_call_handler_stop_call (priv->handler);
+  empathy_streamed_media_handler_stop_call (priv->handler);
 
   if (priv->call_state != CONNECTED)
     empathy_call_window_restart_call (window);
index 01ea5def785fdd50810a7464d7e97c60a19ad0da..e6a59c24c0f9a9432ee6dc10761626c4f4f833b3 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <libempathy/empathy-call-handler.h>
+#include <libempathy/empathy-streamed-media-handler.h>
 
 G_BEGIN_DECLS
 
@@ -57,7 +57,7 @@ GType empathy_call_window_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CALL_WINDOW, \
     EmpathyCallWindowClass))
 
-EmpathyCallWindow *empathy_call_window_new (EmpathyCallHandler *handler);
+EmpathyCallWindow *empathy_call_window_new (EmpathyStreamedMediaHandler *handler);
 
 G_END_DECLS