From bc6aae6ca700eb37c58f3cfdbf52c93b779b67ac Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 19 Aug 2016 11:09:27 -0700 Subject: [PATCH] Use the new API to post flow ERROR messages on the bus https://bugzilla.gnome.org/show_bug.cgi?id=770158 --- ext/ogg/gstoggdemux.c | 7 ++----- gst-libs/gst/tag/gsttagdemux.c | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 3a7fc2e1cf..d653df80b8 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -4802,8 +4802,7 @@ seek_failed: if (flushing) { ret = GST_FLOW_FLUSHING; } else { - GST_ELEMENT_ERROR (ogg, STREAM, DEMUX, (NULL), - ("failed to start demuxing ogg")); + GST_ELEMENT_FLOW_ERROR (ogg, ret); ret = GST_FLOW_ERROR; } goto pause; @@ -4845,9 +4844,7 @@ pause: event = gst_event_new_eos (); } } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) { - GST_ELEMENT_ERROR (ogg, STREAM, FAILED, - (_("Internal data stream error.")), - ("stream stopped, reason %s", reason)); + GST_ELEMENT_FLOW_ERROR (ogg, ret); event = gst_event_new_eos (); } diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c index cd94009be0..f0e685d2b9 100644 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c @@ -1520,8 +1520,7 @@ pause: } } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) { /* for fatal errors we post an error message */ - GST_ELEMENT_ERROR (demux, STREAM, FAILED, (NULL), - ("Stream stopped, reason %s", reason)); + GST_ELEMENT_FLOW_ERROR (demux, ret); push_eos = TRUE; } if (push_eos) {