plugins/elements/gstmultiqueue.c: Remove previous hack of unsetting the flushing flag for the source pad instead of a...

Original commit message from CVS:
* plugins/elements/gstmultiqueue.c:
(gst_multi_queue_src_activate_push), (gst_single_queue_new):
Remove previous hack of unsetting the flushing flag for the source pad
instead of activating it. Instead, fix the source pad activate function
so that it no longer depends on having a parent set or not.
This commit is contained in:
Edward Hervey 2007-01-22 16:00:39 +00:00
parent 7c4dc118f6
commit bc3baaa7c4
2 changed files with 11 additions and 7 deletions

View file

@ -1,3 +1,11 @@
2007-01-22 Edward Hervey <edward@fluendo.com>
* plugins/elements/gstmultiqueue.c:
(gst_multi_queue_src_activate_push), (gst_single_queue_new):
Remove previous hack of unsetting the flushing flag for the source pad
instead of activating it. Instead, fix the source pad activate function
so that it no longer depends on having a parent set or not.
2007-01-22 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Carlos Sanmartin Dominguez <csanmartin@igalia.com>

View file

@ -767,7 +767,7 @@ gst_multi_queue_src_activate_push (GstPad * pad, gboolean active)
gboolean result = FALSE;
sq = (GstSingleQueue *) gst_pad_get_element_private (pad);
mq = (GstMultiQueue *) gst_pad_get_parent (pad);
mq = sq->mqueue;
GST_LOG ("SingleQueue %d", sq->id);
@ -793,7 +793,6 @@ gst_multi_queue_src_activate_push (GstPad * pad, gboolean active)
gst_data_queue_set_flushing (sq->queue, FALSE);
}
gst_object_unref (mq);
return result;
}
@ -1032,14 +1031,11 @@ gst_single_queue_new (GstMultiQueue * mqueue)
gst_pad_set_element_private (sq->sinkpad, (gpointer) sq);
gst_pad_set_element_private (sq->srcpad, (gpointer) sq);
gst_pad_set_active (sq->sinkpad, TRUE);
gst_element_add_pad (GST_ELEMENT (mqueue), sq->sinkpad);
GST_OBJECT_FLAG_UNSET (sq->srcpad, GST_PAD_FLUSHING);
gst_pad_set_active (sq->srcpad, TRUE);
gst_element_add_pad (GST_ELEMENT (mqueue), sq->srcpad);
gst_pad_set_active (sq->srcpad, TRUE);
gst_pad_set_active (sq->sinkpad, TRUE);
gst_element_add_pad (GST_ELEMENT (mqueue), sq->sinkpad);
GST_DEBUG_OBJECT (mqueue, "GstSingleQueue [%d] created and pads added",
sq->id);