diff options
| author | Olivier Crete <olivier.crete@collabora.co.uk> | 2008-05-15 00:02:14 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2009-02-17 19:29:06 +0100 |
| commit | 3c835d5536e6a93583f3710e146988e54dcb521d (patch) | |
| tree | a76f18e0279516e9b3625b8b265ba7e41a866619 /gst | |
| parent | 703b3326cc252dcbb7656d01cad06751a29d496b (diff) | |
| download | gst-plugins-bad-3c835d5536e6a93583f3710e146988e54dcb521d.tar.gz gst-plugins-bad-3c835d5536e6a93583f3710e146988e54dcb521d.tar.bz2 gst-plugins-bad-3c835d5536e6a93583f3710e146988e54dcb521d.zip | |
[MOVED FROM GST-P-FARSIGHT] Move flush stop inside where it belongs
20080515000214-3e2dc-cda5cddd1ead5c48a554e9e9bc75ae68437bcdfb.gz
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/liveadder/liveadder.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c index f59415c7..ac039744 100644 --- a/gst/liveadder/liveadder.c +++ b/gst/liveadder/liveadder.c @@ -451,17 +451,6 @@ gst_live_adder_flush_start (GstLiveAdder * 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 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)); if (active) { - /* allow data processing */ - gst_live_adder_flush_stop (adder); + /* Mark as non flushing */ + GST_OBJECT_LOCK (adder); + adder->srcresult = GST_FLOW_OK; + GST_OBJECT_UNLOCK (adder); /* start pushing out buffers */ GST_DEBUG_OBJECT (adder, "Starting task on srcpad"); |