mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-14 18:25:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

reverting error patch before making a branch.

Browse source 
Original commit message from CVS:
reverting error patch before making a branch.
This commit is contained in:
Thomas Vander Stichele 2003-09-16 10:00:02 +00:00
parent 8817348af7
commit 54b0fe0f94
24 changed files with 57 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/aalib/gstaasink.c
View file

@ -489,9 +489,8 @@ gst_aasink_open (GstAASink *aasink)
aasink->context = aa_autoinit (&aasink->ascii_surf); aasink->context = aa_autoinit (&aasink->ascii_surf);
if (aasink->context == NULL) { if (aasink->context == NULL) {
gst_element_gerror(GST_ELEMENT (aasink), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (aasink),
g_strdup ("unconverted error, file a bug"), g_strdup("opening aalib context"));
g_strdup ("opening aalib context"));
return FALSE; return FALSE;
} }
aa_autoinitkbd(aasink->context, 0); aa_autoinitkbd(aasink->context, 0);

4
ext/dv/gstdvdec.c
View file

@ -798,9 +798,7 @@ gst_dvdec_loop (GstElement *element)
} }
/* oops list exhausted an nothing was found... */ /* oops list exhausted an nothing was found... */
if (!trylist) { if (!trylist) {
gst_element_gerror(element, GST_ERROR_UNKNOWN, gst_element_error (element, "could not negotiate");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("could not negotiate"));
return; return;
} }
} }

4
ext/esd/esdmon.c
View file

@ -266,9 +266,7 @@ gst_esdmon_get (GstPad *pad)
"channels", GST_PROPS_INT (esdmon->channels) "channels", GST_PROPS_INT (esdmon->channels)
)) <= 0) )) <= 0)
{ {
gst_element_gerror(GST_ELEMENT (esdmon), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (esdmon), "could not set caps");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("could not set caps"));
return NULL; return NULL;
} }
} }

4
ext/esd/esdsink.c
View file

@ -266,9 +266,7 @@ gst_esdsink_chain (GstPad *pad, GstBuffer *buf)
esdsink = GST_ESDSINK (gst_pad_get_parent (pad)); esdsink = GST_ESDSINK (gst_pad_get_parent (pad));
if (!esdsink->negotiated) { if (!esdsink->negotiated) {
gst_element_gerror(GST_ELEMENT (esdsink), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (esdsink), "not negotiated");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("not negotiated"));
goto done; goto done;
} }

4
ext/flac/gstflacdec.c
View file

@ -291,9 +291,7 @@ gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder *decoder,
GST_DEBUG (error); GST_DEBUG (error);
gst_element_gerror(GST_ELEMENT (flacdec), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (flacdec), error);
g_strdup ("unconverted error, file a bug"),
g_strdup_printf(error));
} }
static FLAC__SeekableStreamDecoderSeekStatus static FLAC__SeekableStreamDecoderSeekStatus

15
ext/flac/gstflacenc.c
View file

@ -512,9 +512,8 @@ gst_flacenc_chain (GstPad *pad, GstBuffer *buf)
} }
if (!flacenc->negotiated) { if (!flacenc->negotiated) {
gst_element_gerror(GST_ELEMENT (flacenc), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (flacenc),
g_strdup ("unconverted error, file a bug"), "format not negotiated");
g_strdup_printf("format not negotiated"));
return; return;
} }
@ -531,9 +530,8 @@ gst_flacenc_chain (GstPad *pad, GstBuffer *buf)
gst_flacenc_set_metadata (flacenc, flacenc->metadata); gst_flacenc_set_metadata (flacenc, flacenc->metadata);
state = FLAC__seekable_stream_encoder_init (flacenc->encoder); state = FLAC__seekable_stream_encoder_init (flacenc->encoder);
if (state != FLAC__STREAM_ENCODER_OK) { if (state != FLAC__STREAM_ENCODER_OK) {
gst_element_gerror(GST_ELEMENT (flacenc), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (flacenc),
g_strdup ("unconverted error, file a bug"), "could not initialize encoder (wrong parameters?)");
g_strdup_printf("could not initialize encoder (wrong parameters?)"));
return; return;
} }
} }
@ -567,9 +565,8 @@ gst_flacenc_chain (GstPad *pad, GstBuffer *buf)
flacenc->data = NULL; flacenc->data = NULL;
if (!res) { if (!res) {
gst_element_gerror(GST_ELEMENT (flacenc), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (flacenc),
g_strdup ("unconverted error, file a bug"), "encoding error");
g_strdup_printf ("encoding error"));
} }
} }

8
ext/ladspa/gstladspa.c
View file

@ -701,9 +701,7 @@ gst_ladspa_loop (GstElement *element)
} }
if (!ladspa->bufpool) { if (!ladspa->bufpool) {
gst_element_gerror(element, "Caps were never set, GST_ERROR_UNKNOWN, gst_element_error (element, "Caps were never set, bailing...");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf(bailing..."));
return; return;
} }
@ -793,9 +791,7 @@ gst_ladspa_chain (GstPad *pad, GstBuffer *buffer_in)
g_return_if_fail (GST_IS_BUFFER (buffer_in)); g_return_if_fail (GST_IS_BUFFER (buffer_in));
if (!ladspa->bufpool) { if (!ladspa->bufpool) {
gst_element_gerror((GstElement*)ladspa, "Caps were never set, GST_ERROR_UNKNOWN, gst_element_error ((GstElement*)ladspa, "Caps were never set, bailing...");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf(bailing..."));
return; return;
} }

5
ext/mikmod/gstmikmod.c
View file

@ -310,9 +310,8 @@ gst_mikmod_loop (GstElement *element)
if (!GST_PAD_CAPS (mikmod->srcpad)) { if (!GST_PAD_CAPS (mikmod->srcpad)) {
if (gst_mikmod_negotiate (mikmod) <= 0) { if (gst_mikmod_negotiate (mikmod) <= 0) {
gst_element_gerror(GST_ELEMENT (mikmod), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (mikmod),
g_strdup ("unconverted error, file a bug"), "Failed to negotiate with next element in mikmod");
g_strdup_printf("Failed to negotiate with next element in mikmod"));
return; return;
} }
} }

12
ext/raw1394/gstdv1394src.c
View file

@ -232,9 +232,7 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad
"format", GST_PROPS_STRING("PAL"), "format", GST_PROPS_STRING("PAL"),
NULL) NULL)
) <= 0) { ) <= 0) {
gst_element_gerror(GST_ELEMENT(dv1394src), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT(dv1394src), "Could not set source caps for PAL");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("Could not set source caps for PAL"));
return 0; return 0;
} }
} else { } else {
@ -246,18 +244,14 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad
"format", GST_PROPS_STRING ("NTSC"), "format", GST_PROPS_STRING ("NTSC"),
NULL) NULL)
) <= 0) { ) <= 0) {
gst_element_gerror(GST_ELEMENT(dv1394src), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT(dv1394src), "Could not set source caps for NTSC");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("Could not set source caps for NTSC"));
return 0; return 0;
} }
} }
dv1394src->pool = gst_buffer_pool_get_default( dv1394src->frameSize, N_BUFFERS_IN_POOL ); dv1394src->pool = gst_buffer_pool_get_default( dv1394src->frameSize, N_BUFFERS_IN_POOL );
if (dv1394src->pool == NULL) { if (dv1394src->pool == NULL) {
gst_element_gerror(GST_ELEMENT(dv1394src), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT(dv1394src), "gst_buffer_pool_get_default returned NULL");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("gst_buffer_pool_get_default returned NULL"));
} }
} }

4
ext/speex/gstspeexenc.c
View file

@ -176,9 +176,7 @@ gst_speexenc_chain (GstPad *pad, GstBuffer *buf)
"channels", GST_PROPS_INT (1) "channels", GST_PROPS_INT (1)
))) )))
{ {
gst_element_gerror(GST_ELEMENT (speexenc), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (speexenc), "could not negotiate");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("could not negotiate"));
return; return;
} }
} }

4
gst/auparse/gstauparse.c
View file

@ -287,9 +287,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf)
if (gst_pad_try_set_caps (auparse->srcpad, tempcaps) <= 0) { if (gst_pad_try_set_caps (auparse->srcpad, tempcaps) <= 0) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_element_gerror(GST_ELEMENT (auparse), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (auparse), "could not set audio caps");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("could not set audio caps"));
return; return;
} }

4
gst/avi/gstavidemux.c
View file

@ -1691,9 +1691,7 @@ gst_avi_demux_loop (GstElement *element)
case GST_AVI_DEMUX_START: case GST_AVI_DEMUX_START:
if (chunk.id != GST_RIFF_TAG_RIFF && if (chunk.id != GST_RIFF_TAG_RIFF &&
chunk.type != GST_RIFF_RIFF_AVI) { chunk.type != GST_RIFF_RIFF_AVI) {
gst_element_gerror(element, GST_ERROR_UNKNOWN, gst_element_error (element, "This doesn't appear to be an AVI file %08x %08x", chunk.id, chunk.type);
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("This doesn't appear to be an AVI file %08x %08x", chunk.id, chunk.type));
return; return;
} }
avi_demux->state = GST_AVI_DEMUX_HEADER; avi_demux->state = GST_AVI_DEMUX_HEADER;

4
gst/avi/gstavimux.c
View file

@ -1062,9 +1062,7 @@ gst_avimux_stop_file (GstAviMux *avimux)
if (avimux->audio_time) { if (avimux->audio_time) {
avimux->auds_hdr.rate = (GST_SECOND * avimux->audio_size) / avimux->audio_time; avimux->auds_hdr.rate = (GST_SECOND * avimux->audio_size) / avimux->audio_time;
} else { } else {
gst_element_gerror(GST_ELEMENT (avimux), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (avimux), "Audio stream available, but no audio data transferred (or data with invalid timestamps). Resulting AVI will be corrupt");
g_strdup ("unconverted error, file a bug"),
g_strdup ("Audio stream availablebut no audio data transferred (or data with invalid timestamps). Resulting AVI will be corrupt"));
avimux->auds_hdr.rate = 0; avimux->auds_hdr.rate = 0;
} }
avimux->auds.av_bps = avimux->auds_hdr.rate * avimux->auds_hdr.scale; avimux->auds.av_bps = avimux->auds_hdr.rate * avimux->auds_hdr.scale;

4
gst/flx/gstflxdec.c
View file

@ -499,9 +499,7 @@ gst_flxdec_loop (GstElement *element)
if (flxh->type != FLX_MAGICHDR_FLI && if (flxh->type != FLX_MAGICHDR_FLI &&
flxh->type != FLX_MAGICHDR_FLC && flxh->type != FLX_MAGICHDR_FLC &&
flxh->type != FLX_MAGICHDR_FLX) { flxh->type != FLX_MAGICHDR_FLX) {
gst_element_gerror(element, GST_ERROR_UNKNOWN, gst_element_error (element, "not a flx file (type %d)\n", flxh->type);
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("not a flx file (type %d)\n", flxh->type));
return; return;
} }

8
gst/goom/gstgoom.c
View file

@ -300,9 +300,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin)
} }
if (goom->channels == 0) { if (goom->channels == 0) {
gst_element_gerror(GST_ELEMENT (goom), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (goom), "sink format not negotiated");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("sink format not negotiated"));
goto done; goto done;
} }
@ -311,9 +309,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin)
if (!goom->srcnegotiated) { if (!goom->srcnegotiated) {
if (!gst_goom_negotiate_default (goom)) { if (!gst_goom_negotiate_default (goom)) {
gst_element_gerror(GST_ELEMENT (goom), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (goom), "could not negotiate src format");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("could not negotiate src format"));
goto done; goto done;
} }
} }

4
gst/monoscope/gstmonoscope.c
View file

@ -285,9 +285,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin)
GST_DEBUG ("making new pad"); GST_DEBUG ("making new pad");
if (!GST_PAD_CAPS (monoscope->srcpad)) { if (!GST_PAD_CAPS (monoscope->srcpad)) {
if (gst_monoscope_negotiate (monoscope) <= 0) { if (gst_monoscope_negotiate (monoscope) <= 0) {
gst_element_gerror(GST_ELEMENT (monoscope), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (monoscope), "could not set caps");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("could not set caps"));
return; return;
} }
} }

4
gst/smpte/gstsmpte.c
View file

@ -364,9 +364,7 @@ gst_smpte_loop (GstElement *element)
"framerate", GST_PROPS_FLOAT (smpte->fps) "framerate", GST_PROPS_FLOAT (smpte->fps)
))) )))
{ {
gst_element_gerror(element, GST_ERROR_UNKNOWN, gst_element_error (element, "cannot set caps");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("cannot set caps"));
return; return;
} }
} }

4
gst/videocrop/gstvideocrop.c
View file

@ -380,9 +380,7 @@ gst_video_crop_chain (GstPad *pad, GstBuffer *buffer)
"framerate", GST_PROPS_FLOAT (video_crop->fps) "framerate", GST_PROPS_FLOAT (video_crop->fps)
)) <= 0) )) <= 0)
{ {
gst_element_gerror(GST_ELEMENT (video_crop), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (video_crop), "could not negotiate pads");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("could not negotiate pads"));
return; return;
} }
} }

4
gst/wavenc/gstwavenc.c
View file

@ -322,9 +322,7 @@ gst_wavenc_chain (GstPad *pad,
if (!wavenc->setup) { if (!wavenc->setup) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_element_gerror(GST_ELEMENT (wavenc), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (wavenc), "encoder not initialised (input is not audio?)");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("encoder not initialised (input is not audio?)"));
return; return;
} }

8
gst/wavparse/gstwavparse.c
View file

@ -292,16 +292,12 @@ static void wav_new_chunk_callback(GstRiffChunk *chunk, gpointer data)
break; break;
default: default:
gst_element_gerror(GST_ELEMENT (wavparse), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (wavparse), "wavparse: format %d not handled", wavparse->format);
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("wavparse: format %d not handled", wavparse->format));
return; return;
} }
if (gst_pad_try_set_caps (wavparse->srcpad, caps) <= 0) { if (gst_pad_try_set_caps (wavparse->srcpad, caps) <= 0) {
gst_element_gerror(GST_ELEMENT (wavparse), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (wavparse), "Could not set caps");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("Could not set caps"));
return; return;
} }

42
sys/oss/gstosselement.c
View file

@ -429,43 +429,37 @@ gst_osselement_open_audio (GstOssElement *oss)
if (oss->fd < 0) { if (oss->fd < 0) {
switch (errno) { switch (errno) {
case EBUSY: case EBUSY:
gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (oss),
g_strdup ("unconverted error, file a bug"), "osselement: Unable to open %s (in use ?)",
g_strdup_printf("osselement: Unable to open %s (in use ?)", oss->device);
oss->device));
break; break;
case EISDIR: case EISDIR:
gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (oss),
g_strdup ("unconverted error, file a bug"), "osselement: Device %s is a directory",
g_strdup_printf("osselement: Device %s is a directory", oss->device);
oss->device));
break; break;
case EACCES: case EACCES:
case ETXTBSY: case ETXTBSY:
gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (oss),
g_strdup ("unconverted error, file a bug"), "osselement: Cannot access %s, check permissions",
g_strdup_printf("osselement: Cannot access %s, check permissions", oss->device);
oss->device));
break; break;
case ENXIO: case ENXIO:
case ENODEV: case ENODEV:
case ENOENT: case ENOENT:
gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (oss),
g_strdup ("unconverted error, file a bug"), "osselement: Cannot access %s, does it exist ?",
g_strdup_printf("osselement: Cannot access %s, does it exist ?", oss->device);
oss->device));
break; break;
case EROFS: case EROFS:
gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (oss),
g_strdup ("unconverted error, file a bug"), "osselement: Cannot access %s, read-only filesystem ?",
g_strdup_printf("osselement: Cannot access %s, read-only filesystem ?", oss->device);
oss->device));
default: default:
/* FIXME: strerror is not threadsafe */ /* FIXME: strerror is not threadsafe */
gst_element_gerror(GST_ELEMENT (oss), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (oss),
g_strdup ("unconverted error, file a bug"), "osselement: Cannot open %s, generic error: %s",
g_strdup_printf("osselement: Cannot open %s, generic error: %s", oss->device, strerror (errno));
oss->device, strerror (errno)));
break; break;
} }
return FALSE; return FALSE;

8
sys/oss/gstossgst.c
View file

@ -382,9 +382,7 @@ gst_ossgst_spawn_process (GstOssGst *ossgst)
if((ossgst->childpid = fork()) == -1) if((ossgst->childpid = fork()) == -1)
{ {
perror("fork"); perror("fork");
gst_element_gerror(GST_ELEMENT(ossgst), GST_ERROR_UNKNOWN, gst_element_error(GST_ELEMENT(ossgst),"forking");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("forking"));
return FALSE; return FALSE;
} }
GST_DEBUG ("forked %d", ossgst->childpid); GST_DEBUG ("forked %d", ossgst->childpid);
@ -417,9 +415,7 @@ gst_ossgst_spawn_process (GstOssGst *ossgst)
/* will only reach if error */ /* will only reach if error */
perror("exec"); perror("exec");
gst_element_gerror(GST_ELEMENT(ossgst), GST_ERROR_UNKNOWN, gst_element_error(GST_ELEMENT(ossgst),"starting child process");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("starting child process"));
return FALSE; return FALSE;
} }

4
sys/oss/gstosssink.c
View file

@ -356,9 +356,7 @@ gst_osssink_chain (GstPad *pad, GstBuffer *buf)
if (!GST_OSSELEMENT (osssink)->bps) { if (!GST_OSSELEMENT (osssink)->bps) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_element_gerror(GST_ELEMENT (osssink), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (osssink), "capsnego was never performed, unknown data type");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("capsnego was never performed, unknown data type"));
return; return;
} }

14
sys/oss/gstosssrc.c
View file

@ -315,17 +315,13 @@ gst_osssrc_get (GstPad *pad)
/* nothing was negotiated, we can decide on a format */ /* nothing was negotiated, we can decide on a format */
if (!gst_osssrc_negotiate (pad)) { if (!gst_osssrc_negotiate (pad)) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_element_gerror(GST_ELEMENT (src), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (src), "could not negotiate format");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("could not negotiate format"));
return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT)); return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
} }
} }
if (GST_OSSELEMENT (src)->bps == 0) { if (GST_OSSELEMENT (src)->bps == 0) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_element_gerror(GST_ELEMENT (src), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (src), "no format negotiated");
g_strdup ("unconverted error, file a bug"),
g_strdup_printf("no format negotiated"));
return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT)); return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
} }
@ -333,10 +329,8 @@ gst_osssrc_get (GstPad *pad)
src->buffersize); src->buffersize);
if (readbytes < 0) { if (readbytes < 0) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_element_gerror(GST_ELEMENT (src), GST_ERROR_UNKNOWN, gst_element_error (GST_ELEMENT (src), "error reading data (%s)",
g_strdup ("unconverted error, file a bug"), strerror (errno));
g_strdup_printf("error reading data (%s)",
strerror (errno)));
return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT)); return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
} }