[telepathy-stream-engine/master] Remove pre-farsight queue

[Olivier Crête]

---
 src/videostream.c |   64 +---------------------------------------------------
 1 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/src/videostream.c b/src/videostream.c
index a0af58a..010a2f3 100644
--- a/src/videostream.c
+++ b/src/videostream.c
@@ -56,8 +56,6 @@ struct _TpStreamEngineVideoStreamPrivate
 
   GstElement *sink;
 
-  GstElement *queue;
-
   GMutex *mutex;
 
   /* Everything below this line is protected by the mutex */
@@ -207,50 +205,12 @@ tp_stream_engine_video_stream_constructor (GType type,
 {
   GObject *obj;
   TpStreamEngineVideoStream *self = NULL;
-  GstPad *srcpad;
   GstPad *sinkpad;
 
   obj = G_OBJECT_CLASS (tp_stream_engine_video_stream_parent_class)->constructor (type, n_props, props);
 
   self = (TpStreamEngineVideoStream *) obj;
 
-  self->priv->queue = gst_element_factory_make ("queue", NULL);
-
-  if (!self->priv->queue)
-    {
-      g_warning ("Could not make queue element");
-      return obj;
-    }
-
-  g_object_set (self->priv->queue,
-      "leaky", 2,
-      "max-size-buffers", 1,
-      NULL);
-
-  if (!gst_bin_add (GST_BIN (self->priv->bin), self->priv->queue))
-    {
-      g_warning ("Could not add quue to bin");
-      return obj;
-    }
-
-  if (gst_element_set_state (self->priv->queue, GST_STATE_PLAYING) ==
-      GST_STATE_CHANGE_FAILURE)
-    {
-      g_warning ("Could not start queue");
-      return obj;
-    }
-
-  sinkpad = gst_element_get_static_pad (self->priv->queue, "sink");
-
-  if (GST_PAD_LINK_FAILED (gst_pad_link (self->priv->pad, sinkpad)))
-    {
-      g_warning ("Could not link sink to queue");
-      gst_object_unref (sinkpad);
-      return obj;
-    }
-
-  gst_object_unref (sinkpad);
-
   g_object_get (self->priv->stream, "sink-pad", &sinkpad, NULL);
 
   if (!sinkpad)
@@ -259,27 +219,15 @@ tp_stream_engine_video_stream_constructor (GType type,
       return obj;
     }
 
-  srcpad = gst_element_get_static_pad (self->priv->queue, "src");
-
-  if (!sinkpad)
-    {
-      g_warning ("Could not get queue's srcpad");
-      gst_object_unref (sinkpad);
-      return obj;
-    }
-
-  if (GST_PAD_LINK_FAILED (gst_pad_link (srcpad, sinkpad)))
+  if (GST_PAD_LINK_FAILED (gst_pad_link (self->priv->pad, sinkpad)))
     {
-      gst_object_unref (srcpad);
-      gst_object_unref (sinkpad);
       g_warning ("Could not link sink to queue");
+      gst_object_unref (sinkpad);
       return obj;
     }
 
-  gst_object_unref (srcpad);
   gst_object_unref (sinkpad);
 
-
   self->priv->src_pad_added_handler_id = g_signal_connect_object (
       self->priv->stream, "src-pad-added", G_CALLBACK (src_pad_added_cb), self,
       0);
@@ -319,14 +267,6 @@ tp_stream_engine_video_stream_dispose (GObject *object)
     }
   g_mutex_unlock (self->priv->mutex);
 
-  if (self->priv->queue)
-    {
-      gst_element_set_locked_state (self->priv->queue, TRUE);
-      gst_element_set_state (self->priv->queue, GST_STATE_NULL);
-      gst_bin_remove (GST_BIN (self->priv->bin), self->priv->queue);
-      self->priv->queue = NULL;
-    }
-
   if (self->priv->sink)
     {
       gst_element_set_locked_state (self->priv->sink, TRUE);
-- 
1.5.6.5