diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2005-11-22 11:25:01 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2005-11-22 11:25:01 +0000 |
| commit | e9606ada9330cc6943470c1417f8edaf46127781 (patch) | |
| tree | 96a56c5bdbacf51ea3931992ceb6806116234889 /libs | |
| parent | 819307ab28a7d5185037620fe3ce6478a5dbd3ec (diff) | |
gst/base/gstbasesink.c: Make sure the GstFlowReturn is returned.
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_base_sink_handle_object):
Make sure the GstFlowReturn is returned.
* gst/gstbus.c: (gst_bus_add_signal_watch_full),
(gst_bus_add_signal_watch):
* gst/gstbus.h:
add gst_bus_add_signal_watch_full.
* gst/gstplugin.c: (gst_plugin_load_file):
Small style cleanup.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gst/base/gstbasesink.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index 1d35d4d7cd..646b72f90b 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -558,6 +558,7 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad, { gint length; gboolean have_event; + GstFlowReturn ret; GST_PAD_PREROLL_LOCK (pad); /* push object on the queue */ @@ -658,7 +659,6 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad, /* if it's a buffer, we need to call the preroll method */ if (GST_IS_BUFFER (obj)) { GstBaseSinkClass *bclass; - GstFlowReturn pres; GstBuffer *buf = GST_BUFFER (obj); GST_DEBUG_OBJECT (basesink, "preroll buffer %" GST_TIME_FORMAT, @@ -666,7 +666,7 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad, bclass = GST_BASE_SINK_GET_CLASS (basesink); if (bclass->preroll) - if ((pres = bclass->preroll (basesink, buf)) != GST_FLOW_OK) + if ((ret = bclass->preroll (basesink, buf)) != GST_FLOW_OK) goto preroll_failed; } } @@ -721,8 +721,6 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad, no_preroll: { - GstFlowReturn ret; - GST_DEBUG_OBJECT (basesink, "no preroll needed"); /* maybe it was another sink that blocked in preroll, need to check for buffers to drain */ @@ -767,7 +765,7 @@ preroll_failed: GST_DEBUG_OBJECT (basesink, "abort state"); gst_element_abort_state (GST_ELEMENT (basesink)); - return GST_FLOW_ERROR; + return ret; } } |