diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-08-27 19:00:18 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-09-21 12:26:36 +0200 |
| commit | e0694abd0a9cc5d1a4f145c6ee305d950e39e0dd (patch) | |
| tree | 4246b48d0ca9579f6c0f5b61d6cdf26733b7a1f9 /ext/timidity | |
| parent | e618365a1989f298ee74bf38212bbe07cb92e684 (diff) | |
| download | gstreamer-plugins-bad-e0694abd0a9cc5d1a4f145c6ee305d950e39e0dd.tar.gz | |
wildmidi: Don't use GST_FLOW_IS_FATAL()
Diffstat (limited to 'ext/timidity')
| -rw-r--r-- | ext/timidity/gstwildmidi.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c index b6dcfe902..4d5c0e36d 100644 --- a/ext/timidity/gstwildmidi.c +++ b/ext/timidity/gstwildmidi.c @@ -848,20 +848,18 @@ pause: GST_DEBUG_OBJECT (wildmidi, "pausing task, reason %s", reason); gst_pad_pause_task (sinkpad); - if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) { - if (ret == GST_FLOW_UNEXPECTED) { - /* perform EOS logic */ - event = gst_event_new_eos (); - gst_pad_push_event (wildmidi->srcpad, event); - } else { - event = gst_event_new_eos (); - /* for fatal errors we post an error message, post the error - * first so the app knows about the error first. */ - GST_ELEMENT_ERROR (wildmidi, STREAM, FAILED, - ("Internal data flow error."), - ("streaming task paused, reason %s (%d)", reason, ret)); - gst_pad_push_event (wildmidi->srcpad, event); - } + if (ret == GST_FLOW_UNEXPECTED) { + /* perform EOS logic */ + event = gst_event_new_eos (); + gst_pad_push_event (wildmidi->srcpad, event); + } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) { + event = gst_event_new_eos (); + /* for fatal errors we post an error message, post the error + * first so the app knows about the error first. */ + GST_ELEMENT_ERROR (wildmidi, STREAM, FAILED, + ("Internal data flow error."), + ("streaming task paused, reason %s (%d)", reason, ret)); + gst_pad_push_event (wildmidi->srcpad, event); } } } |