From de3be844ecb951c378c30aa7ea8c03ccb3a36ea2 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 28 Jun 2005 11:36:43 +0000 Subject: [PATCH] gst/: The deprecated pad loop function is removed now. Original commit message from CVS: * gst/base/gstbasesink.c: (gst_basesink_set_pad_functions), (gst_basesink_preroll_queue_flush): * gst/base/gstbasesrc.c: (gst_basesrc_set_dataflow_funcs): * gst/elements/gsttee.c: (gst_tee_update_pad_functions): * gst/gstghostpad.c: (gst_proxy_pad_do_bufferalloc), (gst_proxy_pad_do_acceptcaps), (gst_proxy_pad_do_fixatecaps), (gst_proxy_pad_set_property): * gst/gstpad.c: * gst/gstpad.h: * gst/gstqueue.c: (gst_queue_init): The deprecated pad loop function is removed now. --- ChangeLog | 14 ++++++++++++++ gst/base/gstbasesink.c | 5 ----- gst/base/gstbasesrc.c | 5 ----- gst/elements/gsttee.c | 5 ----- gst/gstghostpad.c | 11 ----------- gst/gstpad.c | 18 ------------------ gst/gstpad.h | 6 +----- gst/gstqueue.c | 1 - libs/gst/base/gstbasesink.c | 5 ----- libs/gst/base/gstbasesrc.c | 5 ----- plugins/elements/gstqueue.c | 1 - plugins/elements/gsttee.c | 5 ----- 12 files changed, 15 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce3fae0..fa36ba7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,20 @@ 2005-06-28 Wim Taymans + * gst/base/gstbasesink.c: (gst_basesink_set_pad_functions), + (gst_basesink_preroll_queue_flush): + * gst/base/gstbasesrc.c: (gst_basesrc_set_dataflow_funcs): + * gst/elements/gsttee.c: (gst_tee_update_pad_functions): + * gst/gstghostpad.c: (gst_proxy_pad_do_bufferalloc), + (gst_proxy_pad_do_acceptcaps), (gst_proxy_pad_do_fixatecaps), + (gst_proxy_pad_set_property): + * gst/gstpad.c: + * gst/gstpad.h: + * gst/gstqueue.c: (gst_queue_init): + The deprecated pad loop function is removed now. + +2005-06-28 Wim Taymans + * gst/base/gstbasesink.c: (gst_basesink_preroll_queue_flush), (gst_basesink_event), (gst_basesink_deactivate): Flushing the preroll queue always needs to unlock the waiters. diff --git a/gst/base/gstbasesink.c b/gst/base/gstbasesink.c index 3c4b5f4..afcdc4a 100644 --- a/gst/base/gstbasesink.c +++ b/gst/base/gstbasesink.c @@ -267,11 +267,6 @@ gst_basesink_set_pad_functions (GstBaseSink * this, GstPad * pad) gst_pad_set_chain_function (pad, GST_DEBUG_FUNCPTR (gst_basesink_chain)); else gst_pad_set_chain_function (pad, NULL); - - if (this->has_loop) - gst_pad_set_loop_function (pad, GST_DEBUG_FUNCPTR (gst_basesink_loop)); - else - gst_pad_set_loop_function (pad, NULL); } static void diff --git a/gst/base/gstbasesrc.c b/gst/base/gstbasesrc.c index 4c3cb8d..36d3b13 100644 --- a/gst/base/gstbasesrc.c +++ b/gst/base/gstbasesrc.c @@ -207,11 +207,6 @@ gst_basesrc_set_dataflow_funcs (GstBaseSrc * this) { GST_DEBUG ("updating dataflow functions"); - if (this->has_loop) - gst_pad_set_loop_function (this->srcpad, gst_basesrc_loop); - else - gst_pad_set_loop_function (this->srcpad, NULL); - if (this->has_getrange) gst_pad_set_getrange_function (this->srcpad, gst_basesrc_get_range); else diff --git a/gst/elements/gsttee.c b/gst/elements/gsttee.c index 9b0bd65..dc24fdd 100644 --- a/gst/elements/gsttee.c +++ b/gst/elements/gsttee.c @@ -164,11 +164,6 @@ gst_tee_update_pad_functions (GstTee * tee) GST_DEBUG_FUNCPTR (gst_tee_chain)); else gst_pad_set_chain_function (tee->sinkpad, NULL); - - if (tee->has_sink_loop) - gst_pad_set_loop_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_tee_loop)); - else - gst_pad_set_loop_function (tee->sinkpad, NULL); } static GstPad * diff --git a/gst/gstghostpad.c b/gst/gstghostpad.c index f274172..f29f93c 100644 --- a/gst/gstghostpad.c +++ b/gst/gstghostpad.c @@ -220,16 +220,6 @@ gst_proxy_pad_do_activatepush (GstPad * pad, gboolean active) return gst_pad_activate_push (target, active); } -static void -gst_proxy_pad_do_loop (GstPad * pad) -{ - GstPad *target = GST_PROXY_PAD_TARGET (pad); - - g_return_if_fail (target != NULL); - - target->loopfunc (target); -} - static GstFlowReturn gst_proxy_pad_do_chain (GstPad * pad, GstBuffer * buffer) { @@ -328,7 +318,6 @@ gst_proxy_pad_set_property (GObject * object, guint prop_id, SETFUNC (activatefunc, activate); SETFUNC (activatepullfunc, activatepull); SETFUNC (activatepushfunc, activatepush); - SETFUNC (loopfunc, loop); SETFUNC (getcapsfunc, getcaps); SETFUNC (acceptcapsfunc, acceptcaps); SETFUNC (fixatecapsfunc, fixatecaps); diff --git a/gst/gstpad.c b/gst/gstpad.c index 630025c..7401c83 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -872,24 +872,6 @@ gst_pad_set_activatepush_function (GstPad * pad, } /** - * gst_pad_set_loop_function: - * @pad: a sink #GstPad. - * @chain: the #GstPadLoopFunction to set. - * - * Sets the given loop function for the pad. The loop function is called - * repeadedly to pull/push buffers from/to the peer pad. - */ -void -gst_pad_set_loop_function (GstPad * pad, GstPadLoopFunction loop) -{ - g_return_if_fail (GST_IS_PAD (pad)); - - GST_PAD_LOOPFUNC (pad) = loop; - GST_CAT_DEBUG (GST_CAT_PADS, "loopfunc for %s:%s set to %s", - GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (loop)); -} - -/** * gst_pad_set_chain_function: * @pad: a sink #GstPad. * @chain: the #GstPadChainFunction to set. diff --git a/gst/gstpad.h b/gst/gstpad.h index de1cbca..168a8f0 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -100,9 +100,8 @@ typedef GstFlowReturn (*GstPadGetRangeFunction) (GstPad *pad, guint64 offset, guint length, GstBuffer **buffer); typedef gboolean (*GstPadEventFunction) (GstPad *pad, GstEvent *event); -/* deprecate me, check range should use seeking query, loop function is internal */ +/* deprecate me, check range should use seeking query */ typedef gboolean (*GstPadCheckGetRangeFunction) (GstPad *pad); -typedef void (*GstPadLoopFunction) (GstPad *pad); /* internal links */ typedef GList* (*GstPadIntLinkFunction) (GstPad *pad); @@ -185,7 +184,6 @@ struct _GstPad { gpointer sched_private; /* data transport functions */ - GstPadLoopFunction loopfunc; GstPadChainFunction chainfunc; GstPadCheckGetRangeFunction checkgetrangefunc; GstPadGetRangeFunction getrangefunc; @@ -234,7 +232,6 @@ struct _GstPadClass { #define GST_PAD_ACTIVATEFUNC(pad) (GST_PAD_CAST(pad)->activatefunc) #define GST_PAD_ACTIVATEPUSHFUNC(pad) (GST_PAD_CAST(pad)->activatepushfunc) #define GST_PAD_ACTIVATEPULLFUNC(pad) (GST_PAD_CAST(pad)->activatepullfunc) -#define GST_PAD_LOOPFUNC(pad) (GST_PAD_CAST(pad)->loopfunc) #define GST_PAD_CHAINFUNC(pad) (GST_PAD_CAST(pad)->chainfunc) #define GST_PAD_CHECKGETRANGEFUNC(pad) (GST_PAD_CAST(pad)->checkgetrangefunc) #define GST_PAD_GETRANGEFUNC(pad) (GST_PAD_CAST(pad)->getrangefunc) @@ -386,7 +383,6 @@ GstFlowReturn gst_pad_alloc_buffer (GstPad *pad, guint64 offset, gint size, void gst_pad_set_activate_function (GstPad *pad, GstPadActivateFunction activate); void gst_pad_set_activatepull_function (GstPad *pad, GstPadActivateModeFunction activatepull); void gst_pad_set_activatepush_function (GstPad *pad, GstPadActivateModeFunction activatepush); -void gst_pad_set_loop_function (GstPad *pad, GstPadLoopFunction loop); void gst_pad_set_chain_function (GstPad *pad, GstPadChainFunction chain); void gst_pad_set_getrange_function (GstPad *pad, GstPadGetRangeFunction get); void gst_pad_set_checkgetrange_function (GstPad *pad, GstPadCheckGetRangeFunction check); diff --git a/gst/gstqueue.c b/gst/gstqueue.c index dd17a3d..3ed8915 100644 --- a/gst/gstqueue.c +++ b/gst/gstqueue.c @@ -315,7 +315,6 @@ gst_queue_init (GstQueue * queue) queue->srcpad = gst_pad_new_from_template (gst_static_pad_template_get (&srctemplate), "src"); - gst_pad_set_loop_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_loop)); gst_pad_set_activatepush_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_src_activate_push)); gst_pad_set_link_function (queue->srcpad, diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index 3c4b5f4..afcdc4a 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -267,11 +267,6 @@ gst_basesink_set_pad_functions (GstBaseSink * this, GstPad * pad) gst_pad_set_chain_function (pad, GST_DEBUG_FUNCPTR (gst_basesink_chain)); else gst_pad_set_chain_function (pad, NULL); - - if (this->has_loop) - gst_pad_set_loop_function (pad, GST_DEBUG_FUNCPTR (gst_basesink_loop)); - else - gst_pad_set_loop_function (pad, NULL); } static void diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c index 4c3cb8d..36d3b13 100644 --- a/libs/gst/base/gstbasesrc.c +++ b/libs/gst/base/gstbasesrc.c @@ -207,11 +207,6 @@ gst_basesrc_set_dataflow_funcs (GstBaseSrc * this) { GST_DEBUG ("updating dataflow functions"); - if (this->has_loop) - gst_pad_set_loop_function (this->srcpad, gst_basesrc_loop); - else - gst_pad_set_loop_function (this->srcpad, NULL); - if (this->has_getrange) gst_pad_set_getrange_function (this->srcpad, gst_basesrc_get_range); else diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index dd17a3d..3ed8915 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -315,7 +315,6 @@ gst_queue_init (GstQueue * queue) queue->srcpad = gst_pad_new_from_template (gst_static_pad_template_get (&srctemplate), "src"); - gst_pad_set_loop_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_loop)); gst_pad_set_activatepush_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_src_activate_push)); gst_pad_set_link_function (queue->srcpad, diff --git a/plugins/elements/gsttee.c b/plugins/elements/gsttee.c index 9b0bd65..dc24fdd 100644 --- a/plugins/elements/gsttee.c +++ b/plugins/elements/gsttee.c @@ -164,11 +164,6 @@ gst_tee_update_pad_functions (GstTee * tee) GST_DEBUG_FUNCPTR (gst_tee_chain)); else gst_pad_set_chain_function (tee->sinkpad, NULL); - - if (tee->has_sink_loop) - gst_pad_set_loop_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_tee_loop)); - else - gst_pad_set_loop_function (tee->sinkpad, NULL); } static GstPad * -- 2.7.4