[Telepathy-commits] [telepathy-stream-engine/master] Only attach the request-resource signal to the video stream

[Olivier Crête]

---
 src/tp-stream-engine.c |   28 +++++++++-------------------
 1 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/tp-stream-engine.c b/src/tp-stream-engine.c
index 8f53d0f..bdace5b 100644
--- a/src/tp-stream-engine.c
+++ b/src/tp-stream-engine.c
@@ -458,39 +458,29 @@ tp_stream_engine_stop_video_source (TpStreamEngine *self)
 }
 
 static void
-stream_free_resource (TfStream *stream,
+video_stream_free_resource (TfStream *stream,
     TpMediaStreamDirection dir,
     gpointer user_data)
 {
   TpStreamEngine *self = TP_STREAM_ENGINE (user_data);
-  TpMediaStreamType media_type;
 
   if (!(dir & TP_MEDIA_STREAM_DIRECTION_SEND))
     return;
 
-  g_object_get (stream, "media-type", &media_type, NULL);
-
-  if (media_type == TP_MEDIA_STREAM_TYPE_VIDEO)
-    tp_stream_engine_stop_video_source (self);
+  tp_stream_engine_stop_video_source (self);
 }
 
 static gboolean
-stream_request_resource (TfStream *stream,
+video_stream_request_resource (TfStream *stream,
     TpMediaStreamDirection dir,
     gpointer user_data)
 {
   TpStreamEngine *self = TP_STREAM_ENGINE (user_data);
-  TpMediaStreamType media_type;
 
   if (!(dir & TP_MEDIA_STREAM_DIRECTION_SEND))
     return TRUE;
 
-  g_object_get (stream, "media-type", &media_type, NULL);
-
-  if (media_type == TP_MEDIA_STREAM_TYPE_VIDEO)
-    return tp_stream_engine_start_video_source (self);
-
-  return TRUE;
+  return tp_stream_engine_start_video_source (self);
 }
 
 static void
@@ -657,14 +647,14 @@ channel_stream_created (TfChannel *chan G_GNUC_UNUSED,
 
       g_signal_connect (videostream, "receiving",
           G_CALLBACK (stream_receiving), self);
+
+      g_signal_connect (stream, "request-resource",
+          G_CALLBACK (video_stream_request_resource), self);
+      g_signal_connect (stream, "free-resource",
+          G_CALLBACK (video_stream_free_resource), self);
     }
 
   g_signal_connect (stream, "closed", G_CALLBACK (stream_closed), self);
-
-  g_signal_connect (stream, "request-resource",
-      G_CALLBACK (stream_request_resource), self);
-  g_signal_connect (stream, "free-resource",
-      G_CALLBACK (stream_free_resource), self);
 }
 
 static GList *
-- 
1.5.6.5