[MOVED FROM GST-P-FARSIGHT] Move flush stop inside where it belongs
20080515000214-3e2dc-cda5cddd1ead5c48a554e9e9bc75ae68437bcdfb.gz
This commit is contained in:
parent
703b3326cc
commit
3c835d5536
@ -451,17 +451,6 @@ gst_live_adder_flush_start (GstLiveAdder * adder)
|
|||||||
GST_OBJECT_UNLOCK (adder);
|
GST_OBJECT_UNLOCK (adder);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
gst_live_adder_flush_stop (GstLiveAdder * adder)
|
|
||||||
{
|
|
||||||
GST_DEBUG_OBJECT (adder, "Enabling pop on queue");
|
|
||||||
|
|
||||||
/* Mark as non flushing */
|
|
||||||
GST_OBJECT_LOCK (adder);
|
|
||||||
adder->srcresult = GST_FLOW_OK;
|
|
||||||
GST_OBJECT_UNLOCK (adder);
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
gst_live_adder_src_activate_push (GstPad * pad, gboolean active)
|
gst_live_adder_src_activate_push (GstPad * pad, gboolean active)
|
||||||
{
|
{
|
||||||
@ -471,8 +460,10 @@ gst_live_adder_src_activate_push (GstPad * pad, gboolean active)
|
|||||||
adder = GST_LIVE_ADDER (gst_pad_get_parent (pad));
|
adder = GST_LIVE_ADDER (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
if (active) {
|
if (active) {
|
||||||
/* allow data processing */
|
/* Mark as non flushing */
|
||||||
gst_live_adder_flush_stop (adder);
|
GST_OBJECT_LOCK (adder);
|
||||||
|
adder->srcresult = GST_FLOW_OK;
|
||||||
|
GST_OBJECT_UNLOCK (adder);
|
||||||
|
|
||||||
/* start pushing out buffers */
|
/* start pushing out buffers */
|
||||||
GST_DEBUG_OBJECT (adder, "Starting task on srcpad");
|
GST_DEBUG_OBJECT (adder, "Starting task on srcpad");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user