empathy r2640 - trunk/src
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r2640 - trunk/src
- Date: Sun, 8 Mar 2009 20:18:37 +0000 (UTC)
Author: xclaesse
Date: Sun Mar 8 20:18:37 2009
New Revision: 2640
URL: http://svn.gnome.org/viewvc/empathy?rev=2640&view=rev
Log:
Handle resource-request
Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>
Modified:
trunk/src/empathy-call-window.c
Modified: trunk/src/empathy-call-window.c
==============================================================================
--- trunk/src/empathy-call-window.c (original)
+++ trunk/src/empathy-call-window.c Sun Mar 8 20:18:37 2009
@@ -703,6 +703,23 @@
gst_element_set_state (conference, GST_STATE_PLAYING);
}
+static gboolean
+empathy_call_window_request_resource_cb (EmpathyCallHandler *handler,
+ FsMediaType type, FsStreamDirection direction, gpointer user_data)
+{
+ EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
+ EmpathyCallWindowPriv *priv = GET_PRIV (self);
+
+ if (type != TP_MEDIA_STREAM_TYPE_VIDEO)
+ return TRUE;
+
+ if (direction == FS_DIRECTION_RECV)
+ return TRUE;
+
+ /* video and direction is send */
+ return priv->video_input != NULL;
+}
+
static void
empathy_call_window_disconnected (EmpathyCallWindow *self)
{
@@ -1033,6 +1050,8 @@
g_signal_connect (priv->handler, "conference-added",
G_CALLBACK (empathy_call_window_conference_added_cb), window);
+ g_signal_connect (priv->handler, "request-resource",
+ G_CALLBACK (empathy_call_window_request_resource_cb), window);
g_signal_connect (priv->handler, "closed",
G_CALLBACK (empathy_call_window_channel_closed_cb), window);
g_signal_connect (priv->handler, "src-pad-added",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]