mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 00:32:43 +00:00
aiffparse: Don't use GST_FLOW_IS_FATAL()
This commit is contained in:
parent
30ff1ea346
commit
f2affc667f
1 changed files with 16 additions and 18 deletions
|
@ -1247,29 +1247,27 @@ pause:
|
||||||
aiff->segment_running = FALSE;
|
aiff->segment_running = FALSE;
|
||||||
gst_pad_pause_task (pad);
|
gst_pad_pause_task (pad);
|
||||||
|
|
||||||
if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) {
|
if (ret == GST_FLOW_UNEXPECTED) {
|
||||||
if (ret == GST_FLOW_UNEXPECTED) {
|
/* perform EOS logic */
|
||||||
/* perform EOS logic */
|
if (aiff->segment.flags & GST_SEEK_FLAG_SEGMENT) {
|
||||||
if (aiff->segment.flags & GST_SEEK_FLAG_SEGMENT) {
|
GstClockTime stop;
|
||||||
GstClockTime stop;
|
|
||||||
|
|
||||||
if ((stop = aiff->segment.stop) == -1)
|
if ((stop = aiff->segment.stop) == -1)
|
||||||
stop = aiff->segment.duration;
|
stop = aiff->segment.duration;
|
||||||
|
|
||||||
gst_element_post_message (GST_ELEMENT_CAST (aiff),
|
gst_element_post_message (GST_ELEMENT_CAST (aiff),
|
||||||
gst_message_new_segment_done (GST_OBJECT_CAST (aiff),
|
gst_message_new_segment_done (GST_OBJECT_CAST (aiff),
|
||||||
aiff->segment.format, stop));
|
aiff->segment.format, stop));
|
||||||
} else {
|
|
||||||
gst_pad_push_event (aiff->srcpad, gst_event_new_eos ());
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
/* for fatal errors we post an error message, post the error
|
|
||||||
* first so the app knows about the error first. */
|
|
||||||
GST_ELEMENT_ERROR (aiff, STREAM, FAILED,
|
|
||||||
(_("Internal data flow error.")),
|
|
||||||
("streaming task paused, reason %s (%d)", reason, ret));
|
|
||||||
gst_pad_push_event (aiff->srcpad, gst_event_new_eos ());
|
gst_pad_push_event (aiff->srcpad, gst_event_new_eos ());
|
||||||
}
|
}
|
||||||
|
} else if (ret < GST_FLOW_UNEXPECTED || ret == GST_FLOW_NOT_LINKED) {
|
||||||
|
/* for fatal errors we post an error message, post the error
|
||||||
|
* first so the app knows about the error first. */
|
||||||
|
GST_ELEMENT_ERROR (aiff, STREAM, FAILED,
|
||||||
|
(_("Internal data flow error.")),
|
||||||
|
("streaming task paused, reason %s (%d)", reason, ret));
|
||||||
|
gst_pad_push_event (aiff->srcpad, gst_event_new_eos ());
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue