summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@osg.samsung.com>2016-08-19 11:11:14 -0700
committerThibault Saunier <tsaunier@gnome.org>2016-08-26 19:23:28 -0300
commit3e27368ce3101d349c787cea519306c6f3d817b1 (patch)
treecc7c1bc57de2feb37960b797321eba239138102e
parent40dbcd1b3ec1c17c03febdd127f9051bdc51a516 (diff)
Use the new API to post flow ERROR messages on the bus
https://bugzilla.gnome.org/show_bug.cgi?id=770158
-rw-r--r--ext/sidplay/gstsiddec.cc3
-rw-r--r--gst/asfdemux/gstasfdemux.c8
-rw-r--r--gst/realmedia/rmdemux.c3
3 files changed, 4 insertions, 10 deletions
diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc
index 65d25c032b..3e928e783f 100644
--- a/ext/sidplay/gstsiddec.cc
+++ b/ext/sidplay/gstsiddec.cc
@@ -450,8 +450,7 @@ pause:
gst_pad_push_event (pad, gst_event_new_eos ());
} else if (ret < GST_FLOW_EOS || ret == GST_FLOW_NOT_LINKED) {
/* for fatal errors we post an error message */
- GST_ELEMENT_ERROR (siddec, STREAM, FAILED,
- (NULL), ("streaming task paused, reason %s", reason));
+ GST_ELEMENT_FLOW_ERROR (siddec, ret);
gst_pad_push_event (pad, gst_event_new_eos ());
}
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 283538c24c..28e1f09457 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -449,9 +449,7 @@ gst_asf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
}
flow = gst_asf_demux_push_complete_payloads (demux, TRUE);
if (flow < GST_FLOW_EOS || flow == GST_FLOW_NOT_LINKED) {
- GST_ELEMENT_ERROR (demux, STREAM, FAILED,
- (_("Internal data stream error.")),
- ("streaming stopped, reason %s", gst_flow_get_name (flow)));
+ GST_ELEMENT_FLOW_ERROR (demux, flow);
break;
}
@@ -2123,9 +2121,7 @@ pause:
/* For the error cases */
if (flow < GST_FLOW_EOS || flow == GST_FLOW_NOT_LINKED) {
/* Post an error. Hopefully something else already has, but if not... */
- GST_ELEMENT_ERROR (demux, STREAM, FAILED,
- (_("Internal data stream error.")),
- ("streaming stopped, reason %s", gst_flow_get_name (flow)));
+ GST_ELEMENT_FLOW_ERROR (demux, flow);
gst_asf_demux_send_event_unlocked (demux, gst_event_new_eos ());
}
diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c
index 4a4eda0d74..6634c22566 100644
--- a/gst/realmedia/rmdemux.c
+++ b/gst/realmedia/rmdemux.c
@@ -967,8 +967,7 @@ need_pause:
gst_rmdemux_send_event (rmdemux, gst_event_new_eos ());
}
} else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) {
- GST_ELEMENT_ERROR (rmdemux, STREAM, FAILED,
- (NULL), ("stream stopped, reason %s", reason));
+ GST_ELEMENT_FLOW_ERROR (rmdemux, ret);
gst_rmdemux_send_event (rmdemux, gst_event_new_eos ());
}
return;