From: <wt...@fr...> - 2005-06-28 11:36:58
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: wtay Date: Tue Jun 28 2005 04:36:56 PDT Log message: * 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. Modified files: . : ChangeLog gst : gstghostpad.c gstpad.c gstpad.h gstqueue.c gst/base : gstbasesink.c gstbasesrc.c gst/elements : gsttee.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.1180&r2=1.1181 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstghostpad.c.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.400&r2=1.401 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.h.diff?r1=1.176&r2=1.177 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstqueue.c.diff?r1=1.132&r2=1.133 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstbasesink.c.diff?r1=1.25&r2=1.26 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstbasesrc.c.diff?r1=1.22&r2=1.23 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gsttee.c.diff?r1=1.61&r2=1.62 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.1180 retrieving revision 1.1181 diff -u -d -r1.1180 -r1.1181 --- ChangeLog 28 Jun 2005 11:33:21 -0000 1.1180 +++ ChangeLog 28 Jun 2005 11:36:43 -0000 1.1181 @@ -7,6 +7,20 @@ 2005-06-28 Wim Taymans <wi...@fl...> + * 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 <wi...@fl...> * 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. Index: gstbasesink.c RCS file: /cvs/gstreamer/gstreamer/gst/base/gstbasesink.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- gstbasesink.c 28 Jun 2005 11:02:18 -0000 1.25 +++ gstbasesink.c 28 Jun 2005 11:36:43 -0000 1.26 @@ -267,11 +267,6 @@ 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 Index: gstbasesrc.c RCS file: /cvs/gstreamer/gstreamer/gst/base/gstbasesrc.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- gstbasesrc.c 27 Jun 2005 18:35:05 -0000 1.22 +++ gstbasesrc.c 28 Jun 2005 11:36:43 -0000 1.23 @@ -207,11 +207,6 @@ { GST_DEBUG ("updating dataflow functions"); - gst_pad_set_loop_function (this->srcpad, gst_basesrc_loop); - gst_pad_set_loop_function (this->srcpad, NULL); if (this->has_getrange) gst_pad_set_getrange_function (this->srcpad, gst_basesrc_get_range); Index: gsttee.c RCS file: /cvs/gstreamer/gstreamer/gst/elements/gsttee.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- gsttee.c 27 Jun 2005 18:35:05 -0000 1.61 +++ gsttee.c 28 Jun 2005 11:36:43 -0000 1.62 @@ -164,11 +164,6 @@ GST_DEBUG_FUNCPTR (gst_tee_chain)); 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)); - gst_pad_set_loop_function (tee->sinkpad, NULL); static GstPad * Index: gstghostpad.c RCS file: /cvs/gstreamer/gstreamer/gst/gstghostpad.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gstghostpad.c 28 Jun 2005 10:37:24 -0000 1.8 +++ gstghostpad.c 28 Jun 2005 11:36:43 -0000 1.9 @@ -220,16 +220,6 @@ 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 @@ SETFUNC (activatefunc, activate); SETFUNC (activatepullfunc, activatepull); SETFUNC (activatepushfunc, activatepush); - SETFUNC (loopfunc, loop); SETFUNC (getcapsfunc, getcaps); SETFUNC (acceptcapsfunc, acceptcaps); SETFUNC (fixatecapsfunc, fixatecaps); Index: gstpad.c RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v retrieving revision 1.400 retrieving revision 1.401 diff -u -d -r1.400 -r1.401 --- gstpad.c 28 Jun 2005 10:28:31 -0000 1.400 +++ gstpad.c 28 Jun 2005 11:36:43 -0000 1.401 @@ -872,24 +872,6 @@ /** - * 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. Index: gstpad.h RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.h,v retrieving revision 1.176 retrieving revision 1.177 diff -u -d -r1.176 -r1.177 --- gstpad.h 28 Jun 2005 10:28:31 -0000 1.176 +++ gstpad.h 28 Jun 2005 11:36:43 -0000 1.177 @@ -100,9 +100,8 @@ 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 @@ gpointer sched_private; /* data transport functions */ - GstPadLoopFunction loopfunc; GstPadChainFunction chainfunc; GstPadCheckGetRangeFunction checkgetrangefunc; GstPadGetRangeFunction getrangefunc; @@ -234,7 +232,6 @@ #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 @@ 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); Index: gstqueue.c RCS file: /cvs/gstreamer/gstreamer/gst/gstqueue.c,v retrieving revision 1.132 retrieving revision 1.133 diff -u -d -r1.132 -r1.133 --- gstqueue.c 27 Jun 2005 18:35:04 -0000 1.132 +++ gstqueue.c 28 Jun 2005 11:36:43 -0000 1.133 @@ -315,7 +315,6 @@ 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, |