From 92a284110b69f032cbe4e3719c8b174f22e1b01d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 9 May 2002 15:15:49 +0000 Subject: [PATCH] Unconnected pad errors are detected elsewhere Original commit message from CVS: Unconnected pad errors are detected elsewhere ERROR has higher priority than CHANGED. --- gst/schedulers/gstbasicscheduler.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gst/schedulers/gstbasicscheduler.c b/gst/schedulers/gstbasicscheduler.c index 0df5c83a3b..2082be62c4 100644 --- a/gst/schedulers/gstbasicscheduler.c +++ b/gst/schedulers/gstbasicscheduler.c @@ -285,10 +285,12 @@ gst_basic_scheduler_chain_wrapper (int argc, char *argv[]) GST_DEBUG (GST_CAT_DATAFLOW, "calling chain function of element %s done", name); } } + /* else { gst_element_error (element, "NULL buffer detected. Is \"%s:%s\" connected?", name, GST_PAD_NAME (pad), NULL); } + */ } } } while (!GST_ELEMENT_IS_COTHREAD_STOPPING (element)); @@ -1265,8 +1267,10 @@ gst_basic_scheduler_iterate (GstScheduler * sched) GST_ELEMENT_NAME (entry), entry); if (GST_ELEMENT_THREADSTATE (entry)) { do_cothread_switch (GST_ELEMENT_THREADSTATE (entry)); + state = GST_SCHEDULER_STATE (sched); /* if something changed, return - go on else */ - if (GST_FLAG_IS_SET(bsched, GST_BASIC_SCHEDULER_CHANGE)) + if (GST_FLAG_IS_SET(bsched, GST_BASIC_SCHEDULER_CHANGE) && + state != GST_SCHEDULER_STATE_ERROR) return GST_SCHEDULER_STATE_RUNNING; } else { @@ -1274,8 +1278,6 @@ gst_basic_scheduler_iterate (GstScheduler * sched) return GST_SCHEDULER_STATE_ERROR; } - state = GST_SCHEDULER_STATE (sched); - /* following is a check to see if the chain was interrupted due to a * top-half state_change(). (i.e., if there's a pending state.) *