diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-01-18 21:46:58 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-01-18 21:46:58 +0000 |
commit | 3b0cf935f687c359319104d7b0dd7d73c90da6a9 (patch) | |
tree | fc4cb9722017426795998bce5cb783e6eaae0365 /gst | |
parent | 272db0c22e45b45e88f11a52b793bab588a02534 (diff) |
use new error signal and classification
Original commit message from CVS:
use new error signal and classification
Diffstat (limited to 'gst')
-rw-r--r-- | gst/avi/gstavidemux.c | 24 | ||||
-rw-r--r-- | gst/avi/gstavimux.c | 4 | ||||
-rw-r--r-- | gst/flx/gstflxdec.c | 2 | ||||
-rw-r--r-- | gst/goom/gstgoom.c | 4 | ||||
-rw-r--r-- | gst/matroska/ebml-read.c | 73 | ||||
-rw-r--r-- | gst/matroska/matroska-demux.c | 18 | ||||
-rw-r--r-- | gst/monoscope/gstmonoscope.c | 2 | ||||
-rw-r--r-- | gst/smpte/gstsmpte.c | 2 | ||||
-rw-r--r-- | gst/wavenc/gstwavenc.c | 2 | ||||
-rw-r--r-- | gst/wavparse/gstwavparse.c | 7 |
10 files changed, 69 insertions, 69 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 2f4aebf7..882e0d70 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -686,7 +686,7 @@ gst_avi_demux_stream_init (GstAviDemux *avi) if (!gst_riff_read_header (riff, &doctype)) return FALSE; if (doctype != GST_RIFF_RIFF_AVI) { - gst_element_error (GST_ELEMENT (avi), "Not an AVI file"); + gst_element_error (avi, STREAM, WRONG_TYPE, NULL, NULL); return FALSE; } @@ -804,8 +804,8 @@ gst_avi_demux_add_stream (GstAviDemux *avi) if (!(tag = gst_riff_peek_tag (riff, NULL))) return FALSE; if (tag != GST_RIFF_TAG_strf) { - gst_element_error (GST_ELEMENT (avi), - "Invalid AVI header (no strf as second tag)"); + gst_element_error (avi, STREAM, DEMUX, NULL, + ("Invalid AVI header (no strf as second tag)")); goto skip_stream; } switch (strh->type) { @@ -1162,17 +1162,17 @@ gst_avi_demux_stream_header (GstAviDemux *avi) if (!(tag = gst_riff_peek_tag (riff, NULL))) return FALSE; if (tag != GST_RIFF_TAG_LIST) { - gst_element_error (GST_ELEMENT (avi), - "Invalid AVI header (no LIST at start): " - GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag)); + gst_element_error (avi, STREAM, DEMUX, NULL, + ("Invalid AVI header (no LIST at start): " + GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); return FALSE; } if (!gst_riff_read_list (riff, &tag)) return FALSE; if (tag != GST_RIFF_LIST_hdrl) { - gst_element_error (GST_ELEMENT (avi), - "Invalid AVI header (no hdrl at start): " - GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag)); + gst_element_error (avi, STREAM, DEMUX, NULL, + ("Invalid AVI header (no hdrl at start): " + GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); return FALSE; } @@ -1180,9 +1180,9 @@ gst_avi_demux_stream_header (GstAviDemux *avi) if (!(tag = gst_riff_peek_tag (riff, NULL))) return FALSE; if (tag != GST_RIFF_TAG_avih) { - gst_element_error (GST_ELEMENT (avi), - "Invalid AVI header (no avih at start): " - GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag)); + gst_element_error (avi, STREAM, DEMUX, NULL, + ("Invalid AVI header (no avih at start): " + GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); return FALSE; } if (!gst_avi_demux_stream_avih (avi, &flags, &streams)) diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 0a2cba6c..d4acc2b5 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -29,6 +29,7 @@ #include "config.h" #endif +#include "gst-libs/gst/gst-i18n-plugin.h" #include <stdlib.h> #include <string.h> @@ -984,7 +985,8 @@ gst_avimux_stop_file (GstAviMux *avimux) if (avimux->audio_time) { avimux->auds_hdr.rate = (GST_SECOND * avimux->audio_size) / avimux->audio_time; } else { - gst_element_error (GST_ELEMENT (avimux), "Audio stream available, but no audio data transferred (or data with invalid timestamps). Resulting AVI will be corrupt"); + gst_element_error (avimux, STREAM, MUX, + (_("No or invalid input audio, AVI stream will be corrupt")), NULL); avimux->auds_hdr.rate = 0; } avimux->auds.av_bps = avimux->auds_hdr.rate * avimux->auds_hdr.scale; diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c index a8269ef6..c861a1f4 100644 --- a/gst/flx/gstflxdec.c +++ b/gst/flx/gstflxdec.c @@ -463,7 +463,7 @@ gst_flxdec_loop (GstElement *element) if (flxh->type != FLX_MAGICHDR_FLI && flxh->type != FLX_MAGICHDR_FLC && flxh->type != FLX_MAGICHDR_FLX) { - gst_element_error (element, "not a flx file (type %d)\n", flxh->type); + gst_element_error (element, STREAM, WRONG_TYPE, NULL, ("not a flx file (type %d)\n", flxh->type)); return; } diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index 95059053..5aa043fe 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -270,7 +270,9 @@ gst_goom_chain (GstPad *pad, GstData *_data) } if (goom->channels == 0) { - gst_element_error (GST_ELEMENT (goom), "sink format not negotiated"); + gst_element_error (goom, CORE, NEGOTIATION, NULL, + ("format wasn't negotiated before chain function")); + goto done; } diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c index c5b9c0da..8ecb4adb 100644 --- a/gst/matroska/ebml-read.c +++ b/gst/matroska/ebml-read.c @@ -167,9 +167,9 @@ gst_ebml_read_element_id (GstEbmlRead *ebml, } else { guint64 pos = gst_bytestream_tell (ebml->bs); gst_event_unref (event); - gst_element_error (GST_ELEMENT (ebml), - "Read error at position %llu (0x%llx)", - pos, pos); + gst_element_error (ebml, RESOURCE, READ, NULL, + ("Read error at position %llu (0x%llx)", + pos, pos)); } return -1; } @@ -180,17 +180,16 @@ gst_ebml_read_element_id (GstEbmlRead *ebml, } if (read > 4) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (GST_ELEMENT (ebml), - "Invalid EBML ID size tag (0x%x) at position %llu (0x%llx)", - data[0], pos, pos); + gst_element_error (ebml, STREAM, DEMUX, NULL, + ("Invalid EBML ID size tag (0x%x) at position %llu (0x%llx)", + data[0], pos, pos)); return -1; } if (gst_bytestream_peek_bytes (ebml->bs, &data, read) != read) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (GST_ELEMENT (ebml), - "Read error at position %llu (0x%llx)", - pos, pos); + gst_element_error (ebml, RESOURCE, READ, NULL, + ("Read error at position %llu (0x%llx)", pos, pos)); return -1; } while (n < read) @@ -217,12 +216,11 @@ gst_ebml_read_element_length (GstEbmlRead *ebml, guint8 *data; gint len_mask = 0x80, read = 1, n = 1, num_ffs = 0; guint64 total; - + if (gst_bytestream_peek_bytes (ebml->bs, &data, 1) != 1) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (GST_ELEMENT (ebml), - "Read error at position %llu (0x%llx)", - pos, pos); + gst_element_error (ebml, RESOURCE, READ, NULL, + ("Read error at position %llu (0x%llx)", pos, pos)); return -1; } total = data[0]; @@ -232,9 +230,9 @@ gst_ebml_read_element_length (GstEbmlRead *ebml, } if (read > 8) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (GST_ELEMENT (ebml), - "Invalid EBML length size tag (0x%x) at position %llu (0x%llx)", - data[0], pos, pos); + gst_element_error (ebml, STREAM, DEMUX, NULL, + ("Invalid EBML length size tag (0x%x) at position %llu (0x%llx)", + data[0], pos, pos)); return -1; } @@ -242,9 +240,8 @@ gst_ebml_read_element_length (GstEbmlRead *ebml, num_ffs++; if (gst_bytestream_peek_bytes (ebml->bs, &data, read) != read) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (GST_ELEMENT (ebml), - "Read error at position %llu (0x%llx)", - pos, pos); + gst_element_error (ebml, RESOURCE, READ, NULL, + ("Read error at position %llu (0x%llx)", pos, pos)); return -1; } while (n < read) { @@ -275,9 +272,8 @@ gst_ebml_read_element_data (GstEbmlRead *ebml, if (gst_bytestream_peek (ebml->bs, &buf, length) != length) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (GST_ELEMENT (ebml), - "Read error at position %llu (0x%llx)", - pos, pos); + gst_element_error (ebml, RESOURCE, READ, NULL, + ("Read error at position %llu (0x%llx)", pos, pos)); if (buf) gst_buffer_unref (buf); return NULL; @@ -331,9 +327,8 @@ gst_ebml_read_seek (GstEbmlRead *ebml, /* now seek */ if (!gst_bytestream_seek (ebml->bs, offset, GST_SEEK_METHOD_SET)) { - gst_element_error (GST_ELEMENT (ebml), - "Seek to position %llu (0x%llx) failed", - offset, offset); + gst_element_error (ebml, RESOURCE, SEEK, NULL, + ("Seek to position %llu (0x%llx) failed", offset, offset)); return NULL; } @@ -345,8 +340,8 @@ gst_ebml_read_seek (GstEbmlRead *ebml, /* get the discont event and return */ gst_bytestream_get_status (ebml->bs, &remaining, &event); if (!event || GST_EVENT_TYPE (event) != GST_EVENT_DISCONTINUOUS) { - gst_element_error (GST_ELEMENT (ebml), - "No discontinuity event after seek"); + gst_element_error (ebml, CORE, SEEK, NULL, + ("No discontinuity event after seek")); if (event) gst_event_unref (event); return NULL; @@ -436,9 +431,9 @@ gst_ebml_read_uint (GstEbmlRead *ebml, data = GST_BUFFER_DATA (buf); size = GST_BUFFER_SIZE (buf); if (size < 1 || size > 8) { - gst_element_error (GST_ELEMENT (ebml), - "Invalid integer element size %d at position %llu (0x%llu)", - size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf)); + gst_element_error (ebml, STREAM, DEMUX, NULL, + ("Invalid integer element size %d at position %llu (0x%llu)", + size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf))); gst_buffer_unref (buf); return FALSE; } @@ -472,9 +467,9 @@ gst_ebml_read_sint (GstEbmlRead *ebml, data = GST_BUFFER_DATA (buf); size = GST_BUFFER_SIZE (buf); if (size < 1 || size > 8) { - gst_element_error (GST_ELEMENT (ebml), - "Invalid integer element size %d at position %llu (0x%llx)", - size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf)); + gst_element_error (ebml, STREAM, DEMUX, NULL, + ("Invalid integer element size %d at position %llu (0x%llx)", + size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf))); gst_buffer_unref (buf); return FALSE; } @@ -517,16 +512,16 @@ gst_ebml_read_float (GstEbmlRead *ebml, size = GST_BUFFER_SIZE (buf); if (size != 4 && size != 8 && size != 10) { - gst_element_error (GST_ELEMENT (ebml), - "Invalid float element size %d at position %llu (0x%llx)", - size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf)); + gst_element_error (ebml, STREAM, DEMUX, NULL, + ("Invalid float element size %d at position %llu (0x%llx)", + size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf))); gst_buffer_unref (buf); return FALSE; } if (size == 10) { - gst_element_error (GST_ELEMENT (ebml), - "FIXME! 10-byte floats unimplemented"); + gst_element_error (ebml, CORE, NOT_IMPLEMENTED, NULL, + ("FIXME! 10-byte floats unimplemented")); gst_buffer_unref (buf); return FALSE; } @@ -686,7 +681,7 @@ gst_ebml_read_header (GstEbmlRead *ebml, if (!(id = gst_ebml_peek_id (ebml, &level_up))) return FALSE; if (level_up != 0 || id != GST_EBML_ID_HEADER) { - gst_element_error (GST_ELEMENT (ebml), "Not a EBML file"); + gst_element_error (ebml, STREAM, WRONG_TYPE, NULL, NULL); return FALSE; } if (!gst_ebml_read_master (ebml, &id)) diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index da324ba0..2f819acc 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -1130,17 +1130,17 @@ gst_matroska_demux_init_stream (GstMatroskaDemux *demux) return FALSE; if (!doctype || strcmp (doctype, "matroska") != 0) { - gst_element_error (GST_ELEMENT (demux), - "Input is not a matroska stream (doctype=%s)", - doctype ? doctype : "none"); + gst_element_error (demux, STREAM, WRONG_TYPE, NULL, + ("Input is not a matroska stream (doctype=%s)", + doctype ? doctype : "none")); g_free (doctype); return FALSE; } g_free (doctype); if (version > 1) { - gst_element_error (GST_ELEMENT (demux), - "Demuxer version (1) is too old to read stream version %d", - version); + gst_element_error (demux, STREAM, DEMUX, NULL, + ("Demuxer version (1) is too old to read stream version %d", + version)); return FALSE; } @@ -1634,7 +1634,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux *demux, /* first byte(s): blocknum */ if ((n = gst_matroska_ebmlnum_uint (data, size, &num)) < 0) { - gst_element_error (GST_ELEMENT (demux), "Data error"); + gst_element_error (demux, STREAM, DEMUX, NULL, ("Data error")); gst_buffer_unref (buf); res = FALSE; break; @@ -1705,7 +1705,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux *demux, case 0x3: /* EBML lacing */ { guint total; if ((n = gst_matroska_ebmlnum_uint (data, size, &num)) < 0) { - gst_element_error (GST_ELEMENT (demux), "Data error"); + gst_element_error (demux, STREAM, DEMUX, NULL, ("Data error")); res = FALSE; break; } @@ -1715,7 +1715,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux *demux, gint64 snum; gint r; if ((r = gst_matroska_ebmlnum_sint (data, size, &snum)) < 0) { - gst_element_error (GST_ELEMENT (demux), "Data error"); + gst_element_error (demux, STREAM, DEMUX, NULL, ("Data error")); res = FALSE; break; } diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index 3a066af6..fa85814c 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -230,7 +230,7 @@ gst_monoscope_chain (GstPad *pad, GstData *_data) GST_DEBUG ("making new pad"); if (!gst_pad_is_negotiated (monoscope->srcpad)) { if (gst_pad_renegotiate (monoscope->srcpad) <= 0) { - gst_element_error (GST_ELEMENT (monoscope), "could not set caps"); + gst_element_error (monoscope, CORE, NEGOTIATION, NULL, NULL); return; } } diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c index ea17dc8c..5cfbcc0b 100644 --- a/gst/smpte/gstsmpte.c +++ b/gst/smpte/gstsmpte.c @@ -371,7 +371,7 @@ gst_smpte_loop (GstElement *element) "framerate", G_TYPE_DOUBLE, smpte->fps, NULL); if (!gst_pad_try_set_caps (smpte->srcpad, caps)) { - gst_element_error (element, "cannot set caps"); + gst_element_error (smpte, CORE, NEGOTIATION, NULL, NULL); return; } } diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c index 98a5b6cc..c5381c62 100644 --- a/gst/wavenc/gstwavenc.c +++ b/gst/wavenc/gstwavenc.c @@ -588,7 +588,7 @@ gst_wavenc_chain (GstPad *pad, if (!wavenc->setup) { gst_buffer_unref (buf); - gst_element_error (GST_ELEMENT (wavenc), "encoder not initialised (input is not audio?)"); + gst_element_error (wavenc, CORE, NEGOTIATION, NULL, ("encoder not initialised (input is not audio?)")); return; } diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index 382192a4..e37cbf3c 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -636,7 +636,7 @@ gst_wavparse_parse_fmt (GstWavParse *wavparse, guint size) break; default: - gst_element_error (GST_ELEMENT (wavparse), "wavparse: format %d not handled", wavparse->format); + gst_element_error (wavparse, STREAM, NOT_IMPLEMENTED, NULL, ("format %d not handled", wavparse->format)); return; } @@ -731,7 +731,7 @@ gst_wavparse_loop (GstElement *element) if (event && GST_EVENT_TYPE (event) == GST_EVENT_EOS) { gst_pad_event_default (wavparse->sinkpad, event); } else { - gst_element_error (element, "Read failure"); + gst_element_error (element, RESOURCE, READ, NULL, NULL); } return; } @@ -808,7 +808,8 @@ gst_wavparse_loop (GstElement *element) case GST_WAVPARSE_START: if (chunk.id != GST_RIFF_TAG_RIFF && chunk.type != GST_RIFF_RIFF_WAVE) { - gst_element_error (element, "This doesn't appear to be a WAV file %08x %08x", chunk.id, chunk.type); + gst_element_error (element, STREAM, WRONG_TYPE, NULL, + ("chunk.id %08x chunk.type %08x", chunk.id, chunk.type)); return; } |