diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-09-16 10:00:02 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-09-16 10:00:02 +0000 |
commit | 54b0fe0f9472e1e6554dba0b9697151a9ef319a3 (patch) | |
tree | 2f0cb83625c9c8332600418933f0b6690fd6869e /ext | |
parent | 8817348af768345a644ed05f621f1b5392f325a0 (diff) |
reverting error patch before making a branch.
Original commit message from CVS:
reverting error patch before making a branch.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/aalib/gstaasink.c | 5 | ||||
-rw-r--r-- | ext/dv/gstdvdec.c | 4 | ||||
-rw-r--r-- | ext/esd/esdmon.c | 4 | ||||
-rw-r--r-- | ext/esd/esdsink.c | 4 | ||||
-rw-r--r-- | ext/flac/gstflacdec.c | 4 | ||||
-rw-r--r-- | ext/flac/gstflacenc.c | 15 | ||||
-rw-r--r-- | ext/ladspa/gstladspa.c | 8 | ||||
-rw-r--r-- | ext/mikmod/gstmikmod.c | 5 | ||||
-rw-r--r-- | ext/raw1394/gstdv1394src.c | 12 | ||||
-rw-r--r-- | ext/speex/gstspeexenc.c | 4 |
10 files changed, 20 insertions, 45 deletions
diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c index 0ba7e4df..537cfd54 100644 --- a/ext/aalib/gstaasink.c +++ b/ext/aalib/gstaasink.c @@ -489,9 +489,8 @@ gst_aasink_open (GstAASink *aasink) aasink->context = aa_autoinit (&aasink->ascii_surf); if (aasink->context == NULL) { - gst_element_gerror(GST_ELEMENT (aasink), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup ("opening aalib context")); + gst_element_error (GST_ELEMENT (aasink), + g_strdup("opening aalib context")); return FALSE; } aa_autoinitkbd(aasink->context, 0); diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index a33b7829..e28f8362 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -798,9 +798,7 @@ gst_dvdec_loop (GstElement *element) } /* oops list exhausted an nothing was found... */ if (!trylist) { - gst_element_gerror(element, GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("could not negotiate")); + gst_element_error (element, "could not negotiate"); return; } } diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c index ab85c151..ae8d4fd4 100644 --- a/ext/esd/esdmon.c +++ b/ext/esd/esdmon.c @@ -266,9 +266,7 @@ gst_esdmon_get (GstPad *pad) "channels", GST_PROPS_INT (esdmon->channels) )) <= 0) { - gst_element_gerror(GST_ELEMENT (esdmon), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("could not set caps")); + gst_element_error (GST_ELEMENT (esdmon), "could not set caps"); return NULL; } } diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c index f9be01c6..f4557383 100644 --- a/ext/esd/esdsink.c +++ b/ext/esd/esdsink.c @@ -266,9 +266,7 @@ gst_esdsink_chain (GstPad *pad, GstBuffer *buf) esdsink = GST_ESDSINK (gst_pad_get_parent (pad)); if (!esdsink->negotiated) { - gst_element_gerror(GST_ELEMENT (esdsink), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("not negotiated")); + gst_element_error (GST_ELEMENT (esdsink), "not negotiated"); goto done; } diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index 5431a84f..c11be9f6 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -291,9 +291,7 @@ gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder *decoder, GST_DEBUG (error); - gst_element_gerror(GST_ELEMENT (flacdec), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf(error)); + gst_element_error (GST_ELEMENT (flacdec), error); } static FLAC__SeekableStreamDecoderSeekStatus diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index e217d9c7..ef9e5386 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -512,9 +512,8 @@ gst_flacenc_chain (GstPad *pad, GstBuffer *buf) } if (!flacenc->negotiated) { - gst_element_gerror(GST_ELEMENT (flacenc), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("format not negotiated")); + gst_element_error (GST_ELEMENT (flacenc), + "format not negotiated"); return; } @@ -531,9 +530,8 @@ gst_flacenc_chain (GstPad *pad, GstBuffer *buf) gst_flacenc_set_metadata (flacenc, flacenc->metadata); state = FLAC__seekable_stream_encoder_init (flacenc->encoder); if (state != FLAC__STREAM_ENCODER_OK) { - gst_element_gerror(GST_ELEMENT (flacenc), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("could not initialize encoder (wrong parameters?)")); + gst_element_error (GST_ELEMENT (flacenc), + "could not initialize encoder (wrong parameters?)"); return; } } @@ -567,9 +565,8 @@ gst_flacenc_chain (GstPad *pad, GstBuffer *buf) flacenc->data = NULL; if (!res) { - gst_element_gerror(GST_ELEMENT (flacenc), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf ("encoding error")); + gst_element_error (GST_ELEMENT (flacenc), + "encoding error"); } } diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 2611603f..460bdf12 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -701,9 +701,7 @@ gst_ladspa_loop (GstElement *element) } if (!ladspa->bufpool) { - gst_element_gerror(element, "Caps were never set, GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf(bailing...")); + gst_element_error (element, "Caps were never set, bailing..."); return; } @@ -793,9 +791,7 @@ gst_ladspa_chain (GstPad *pad, GstBuffer *buffer_in) g_return_if_fail (GST_IS_BUFFER (buffer_in)); if (!ladspa->bufpool) { - gst_element_gerror((GstElement*)ladspa, "Caps were never set, GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf(bailing...")); + gst_element_error ((GstElement*)ladspa, "Caps were never set, bailing..."); return; } diff --git a/ext/mikmod/gstmikmod.c b/ext/mikmod/gstmikmod.c index 7767bcd9..6ef507c2 100644 --- a/ext/mikmod/gstmikmod.c +++ b/ext/mikmod/gstmikmod.c @@ -310,9 +310,8 @@ gst_mikmod_loop (GstElement *element) if (!GST_PAD_CAPS (mikmod->srcpad)) { if (gst_mikmod_negotiate (mikmod) <= 0) { - gst_element_gerror(GST_ELEMENT (mikmod), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("Failed to negotiate with next element in mikmod")); + gst_element_error (GST_ELEMENT (mikmod), + "Failed to negotiate with next element in mikmod"); return; } } diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c index 26ba4f1e..97b2989e 100644 --- a/ext/raw1394/gstdv1394src.c +++ b/ext/raw1394/gstdv1394src.c @@ -232,9 +232,7 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad "format", GST_PROPS_STRING("PAL"), NULL) ) <= 0) { - gst_element_gerror(GST_ELEMENT(dv1394src), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("Could not set source caps for PAL")); + gst_element_error (GST_ELEMENT(dv1394src), "Could not set source caps for PAL"); return 0; } } else { @@ -246,18 +244,14 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad "format", GST_PROPS_STRING ("NTSC"), NULL) ) <= 0) { - gst_element_gerror(GST_ELEMENT(dv1394src), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("Could not set source caps for NTSC")); + gst_element_error (GST_ELEMENT(dv1394src), "Could not set source caps for NTSC"); return 0; } } dv1394src->pool = gst_buffer_pool_get_default( dv1394src->frameSize, N_BUFFERS_IN_POOL ); if (dv1394src->pool == NULL) { - gst_element_gerror(GST_ELEMENT(dv1394src), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("gst_buffer_pool_get_default returned NULL")); + gst_element_error (GST_ELEMENT(dv1394src), "gst_buffer_pool_get_default returned NULL"); } } diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index 188a729a..dd4cb45f 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -176,9 +176,7 @@ gst_speexenc_chain (GstPad *pad, GstBuffer *buf) "channels", GST_PROPS_INT (1) ))) { - gst_element_gerror(GST_ELEMENT (speexenc), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("could not negotiate")); + gst_element_error (GST_ELEMENT (speexenc), "could not negotiate"); return; } } |