diff options
author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2012-03-02 00:52:56 +0800 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2012-03-02 00:52:56 +0800 |
commit | e35c34e3935d055c6cd5db1c0808f9906488627b (patch) | |
tree | 9476419e5f1912e433a6bf08021e11efc09f9fbd /src/empathy-streamed-media-window.c | |
parent | 57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb (diff) | |
download | gsoc2013-empathy-e35c34e3935d055c6cd5db1c0808f9906488627b.tar gsoc2013-empathy-e35c34e3935d055c6cd5db1c0808f9906488627b.tar.gz gsoc2013-empathy-e35c34e3935d055c6cd5db1c0808f9906488627b.tar.bz2 gsoc2013-empathy-e35c34e3935d055c6cd5db1c0808f9906488627b.tar.lz gsoc2013-empathy-e35c34e3935d055c6cd5db1c0808f9906488627b.tar.xz gsoc2013-empathy-e35c34e3935d055c6cd5db1c0808f9906488627b.tar.zst gsoc2013-empathy-e35c34e3935d055c6cd5db1c0808f9906488627b.zip |
Port Empathy-av to Telepathy Farstream
Diffstat (limited to 'src/empathy-streamed-media-window.c')
-rw-r--r-- | src/empathy-streamed-media-window.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index beec4ebae..38cd980cc 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -32,7 +32,7 @@ #include <telepathy-glib/util.h> -#include <telepathy-farsight/stream.h> +#include <telepathy-farstream/telepathy-farstream.h> #include <farstream/fs-element-added-notifier.h> #include <farstream/fs-utils.h> @@ -1759,8 +1759,8 @@ empathy_streamed_media_window_conference_added_cb (EmpathyStreamedMediaHandler * } static gboolean -empathy_streamed_media_window_request_resource_cb (EmpathyStreamedMediaHandler *handler, - FsMediaType type, FsStreamDirection direction, gpointer user_data) +empathy_streamed_media_window_start_receiving_cb (EmpathyStreamedMediaHandler *handler, + FsMediaType type,gpointer user_data) { EmpathyStreamedMediaWindow *self = EMPATHY_STREAMED_MEDIA_WINDOW (user_data); EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self); @@ -1768,9 +1768,6 @@ empathy_streamed_media_window_request_resource_cb (EmpathyStreamedMediaHandler * if (type != FS_MEDIA_TYPE_VIDEO) return TRUE; - if (direction == FS_DIRECTION_RECV) - return TRUE; - /* video and direction is send */ return priv->video_input != NULL; } @@ -1952,13 +1949,13 @@ empathy_streamed_media_window_channel_closed_cb (EmpathyStreamedMediaHandler *ha static void empathy_streamed_media_window_channel_stream_closed_cb (EmpathyStreamedMediaHandler *handler, - TfStream *stream, gpointer user_data) + TfContent *content, gpointer user_data) { EmpathyStreamedMediaWindow *self = EMPATHY_STREAMED_MEDIA_WINDOW (user_data); EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self); guint media_type; - g_object_get (stream, "media-type", &media_type, NULL); + g_object_get (content, "media-type", &media_type, NULL); /* * This assumes that there is only one video stream per channel... @@ -2719,8 +2716,8 @@ empathy_streamed_media_window_realized_cb (GtkWidget *widget, EmpathyStreamedMed g_signal_connect (priv->handler, "conference-added", G_CALLBACK (empathy_streamed_media_window_conference_added_cb), window); - g_signal_connect (priv->handler, "request-resource", - G_CALLBACK (empathy_streamed_media_window_request_resource_cb), window); + g_signal_connect (priv->handler, "start-receiving", + G_CALLBACK (empathy_streamed_media_window_start_receiving_cb), window); g_signal_connect (priv->handler, "closed", G_CALLBACK (empathy_streamed_media_window_channel_closed_cb), window); g_signal_connect (priv->handler, "src-pad-added", |