summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-05-02 15:46:02 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-05-02 15:46:02 +0000
commit2b4ba77c27f24bd8e7ee94ca1a10acf3076bb437 (patch)
tree2af555a29fc0494813141d9d170a880a5561e836
parent5c1e2a1e4458654d01fd5f77ab0c977d2f356e86 (diff)
gst/id3demux/gstid3demux.c: Let core insert default error message for TYPE_NOT_FOUND errors, it's just as good as our...
Original commit message from CVS: * gst/id3demux/gstid3demux.c: (gst_id3demux_chain), (gst_id3demux_sink_activate): Let core insert default error message for TYPE_NOT_FOUND errors, it's just as good as our own and has the added bonus of being translated.
-rw-r--r--ChangeLog8
-rw-r--r--gst/id3demux/gstid3demux.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fac128d8..a706b7bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-05-02 Tim-Philipp Müller <tim at centricular dot net>
+ * gst/id3demux/gstid3demux.c: (gst_id3demux_chain),
+ (gst_id3demux_sink_activate):
+ Let core insert default error message for TYPE_NOT_FOUND
+ errors, it's just as good as our own and has the added
+ bonus of being translated.
+
+2006-05-02 Tim-Philipp Müller <tim at centricular dot net>
+
* gst/apetag/gsttagdemux.c: (gst_tag_demux_init),
(gst_tag_demux_sink_event):
* gst/id3demux/gstid3demux.c: (gst_id3demux_init),
diff --git a/gst/id3demux/gstid3demux.c b/gst/id3demux/gstid3demux.c
index 2fea654f..40fdf657 100644
--- a/gst/id3demux/gstid3demux.c
+++ b/gst/id3demux/gstid3demux.c
@@ -460,8 +460,7 @@ gst_id3demux_chain (GstPad * pad, GstBuffer * buf)
}
/* We failed typefind */
- GST_ELEMENT_ERROR (id3demux, STREAM, TYPE_NOT_FOUND,
- ("Could not determine the mime type of the file"),
+ GST_ELEMENT_ERROR (id3demux, STREAM, TYPE_NOT_FOUND, (NULL),
("Could not detect type for contents within an ID3 tag"));
gst_buffer_unref (typefind_buf);
gst_buffer_unref (id3demux->collect);
@@ -880,8 +879,7 @@ gst_id3demux_sink_activate (GstPad * sinkpad)
/* 5 - If we didn't find the caps, fail */
if (caps == NULL) {
- GST_ELEMENT_ERROR (id3demux, STREAM, TYPE_NOT_FOUND,
- ("Could not determine the mime type of the file"),
+ GST_ELEMENT_ERROR (id3demux, STREAM, TYPE_NOT_FOUND, (NULL),
("Could not detect type for contents within an ID3 tag"));
goto done_activate;
}