From ac5674b03b1be901a406a2a69c27e20f804bc73a Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 4 Apr 2004 02:36:12 +0000 Subject: gst/: implement gst_pad_collect as replacement for gst_pad_select. Original commit message from CVS: * gst/gstpad.c: (gst_pad_collect_array), (gst_pad_collectv), (gst_pad_collect), (gst_pad_collect_valist), (gst_pad_selectv), (gst_pad_select): * gst/gstpad.h: * gst/gstscheduler.c: (gst_scheduler_pad_select), (gst_scheduler_lock_element), (gst_scheduler_unlock_element): * gst/gstscheduler.h: implement gst_pad_collect as replacement for gst_pad_select. deprecate gst_pad_select and gst_scheduler_(un)lock_element add new flag GST_SCHEDULER_FLAG_NEW_API for API that implements the new pad_select, lock and unlock calls. * gst/cothreads.c: (cothread_destroy), (cothread_switch): * gst/cothreads.h: * gst/schedulers/cothreads_compat.h: * gst/schedulers/gthread-cothreads.h: remove unused cothread_lock and cothread_unlock calls * gst/schedulers/entryscheduler.c: (gst_entry_scheduler_class_init), (gst_entry_scheduler_init), (_can_schedule_loop), (gst_entry_scheduler_get_handler), (gst_entry_scheduler_pad_select): update to new API * gst/schedulers/gstbasicscheduler.c: (gst_basic_scheduler_class_init), (gst_basic_scheduler_init), (gst_basic_scheduler_pad_select): remove useless lock and unlock calls, update pad_select to new API (untested) * gst/schedulers/gstoptimalscheduler.c: (gst_opt_scheduler_class_init): remove useless select, lock and unlock function calls * gst/elements/gstaggregator.c: (gst_aggregator_loop): use gst_pad_collect instead of gst_pad_select --- gst/gstscheduler.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gst/gstscheduler.c') diff --git a/gst/gstscheduler.c b/gst/gstscheduler.c index 5f020344da..0e2aeb423b 100644 --- a/gst/gstscheduler.c +++ b/gst/gstscheduler.c @@ -198,16 +198,9 @@ gst_scheduler_pad_unlink (GstScheduler * sched, GstPad * srcpad, GstPad * gst_scheduler_pad_select (GstScheduler * sched, GList * padlist) { - GstSchedulerClass *sclass; - g_return_val_if_fail (GST_IS_SCHEDULER (sched), NULL); g_return_val_if_fail (padlist != NULL, NULL); - sclass = GST_SCHEDULER_GET_CLASS (sched); - - if (sclass->pad_select) - sclass->pad_select (sched, padlist); - return NULL; } @@ -418,15 +411,8 @@ gst_scheduler_remove_scheduler (GstScheduler * sched, GstScheduler * sched2) void gst_scheduler_lock_element (GstScheduler * sched, GstElement * element) { - GstSchedulerClass *sclass; - g_return_if_fail (GST_IS_SCHEDULER (sched)); g_return_if_fail (GST_IS_ELEMENT (element)); - - sclass = GST_SCHEDULER_GET_CLASS (sched); - - if (sclass->lock_element) - sclass->lock_element (sched, element); } /** @@ -445,9 +431,6 @@ gst_scheduler_unlock_element (GstScheduler * sched, GstElement * element) g_return_if_fail (GST_IS_ELEMENT (element)); sclass = GST_SCHEDULER_GET_CLASS (sched); - - if (sclass->unlock_element) - sclass->unlock_element (sched, element); } /** -- cgit v1.2.1