summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-09-16 10:00:02 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-09-16 10:00:02 +0000
commit54b0fe0f9472e1e6554dba0b9697151a9ef319a3 (patch)
tree2f0cb83625c9c8332600418933f0b6690fd6869e /gst
parent8817348af768345a644ed05f621f1b5392f325a0 (diff)
reverting error patch before making a branch.
Original commit message from CVS: reverting error patch before making a branch.
Diffstat (limited to 'gst')
-rw-r--r--gst/auparse/gstauparse.c4
-rw-r--r--gst/avi/gstavidemux.c4
-rw-r--r--gst/avi/gstavimux.c4
-rw-r--r--gst/flx/gstflxdec.c4
-rw-r--r--gst/goom/gstgoom.c8
-rw-r--r--gst/monoscope/gstmonoscope.c4
-rw-r--r--gst/smpte/gstsmpte.c4
-rw-r--r--gst/videocrop/gstvideocrop.c4
-rw-r--r--gst/wavenc/gstwavenc.c4
-rw-r--r--gst/wavparse/gstwavparse.c8
10 files changed, 12 insertions, 36 deletions
diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c
index 075f5f4d..422ee1ba 100644
--- a/gst/auparse/gstauparse.c
+++ b/gst/auparse/gstauparse.c
@@ -287,9 +287,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf)
if (gst_pad_try_set_caps (auparse->srcpad, tempcaps) <= 0) {
gst_buffer_unref (buf);
- gst_element_gerror(GST_ELEMENT (auparse), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("could not set audio caps"));
+ gst_element_error (GST_ELEMENT (auparse), "could not set audio caps");
return;
}
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index e79d707e..ed605935 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -1691,9 +1691,7 @@ gst_avi_demux_loop (GstElement *element)
case GST_AVI_DEMUX_START:
if (chunk.id != GST_RIFF_TAG_RIFF &&
chunk.type != GST_RIFF_RIFF_AVI) {
- gst_element_gerror(element, GST_ERROR_UNKNOWN,
- 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));
+ gst_element_error (element, "This doesn't appear to be an AVI file %08x %08x", chunk.id, chunk.type);
return;
}
avi_demux->state = GST_AVI_DEMUX_HEADER;
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 68105d91..4a980a13 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -1062,9 +1062,7 @@ 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_gerror(GST_ELEMENT (avimux), GST_ERROR_UNKNOWN,
- 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"));
+ gst_element_error (GST_ELEMENT (avimux), "Audio stream available, but no audio data transferred (or data with invalid timestamps). Resulting AVI will be corrupt");
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 fe204439..c20327a7 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -499,9 +499,7 @@ gst_flxdec_loop (GstElement *element)
if (flxh->type != FLX_MAGICHDR_FLI &&
flxh->type != FLX_MAGICHDR_FLC &&
flxh->type != FLX_MAGICHDR_FLX) {
- gst_element_gerror(element, GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("not a flx file (type %d)\n", flxh->type));
+ gst_element_error (element, "not a flx file (type %d)\n", flxh->type);
return;
}
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index 8a4a5eb9..bbf49bbd 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -300,9 +300,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin)
}
if (goom->channels == 0) {
- gst_element_gerror(GST_ELEMENT (goom), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("sink format not negotiated"));
+ gst_element_error (GST_ELEMENT (goom), "sink format not negotiated");
goto done;
}
@@ -311,9 +309,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin)
if (!goom->srcnegotiated) {
if (!gst_goom_negotiate_default (goom)) {
- gst_element_gerror(GST_ELEMENT (goom), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("could not negotiate src format"));
+ gst_element_error (GST_ELEMENT (goom), "could not negotiate src format");
goto done;
}
}
diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c
index 0b94604d..9eb8bb43 100644
--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@@ -285,9 +285,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin)
GST_DEBUG ("making new pad");
if (!GST_PAD_CAPS (monoscope->srcpad)) {
if (gst_monoscope_negotiate (monoscope) <= 0) {
- gst_element_gerror(GST_ELEMENT (monoscope), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("could not set caps"));
+ gst_element_error (GST_ELEMENT (monoscope), "could not set caps");
return;
}
}
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index 9b203fe1..bf042e4c 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -364,9 +364,7 @@ gst_smpte_loop (GstElement *element)
"framerate", GST_PROPS_FLOAT (smpte->fps)
)))
{
- gst_element_gerror(element, GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("cannot set caps"));
+ gst_element_error (element, "cannot set caps");
return;
}
}
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 54702e5c..d96061a0 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -380,9 +380,7 @@ gst_video_crop_chain (GstPad *pad, GstBuffer *buffer)
"framerate", GST_PROPS_FLOAT (video_crop->fps)
)) <= 0)
{
- gst_element_gerror(GST_ELEMENT (video_crop), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("could not negotiate pads"));
+ gst_element_error (GST_ELEMENT (video_crop), "could not negotiate pads");
return;
}
}
diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c
index 08f2c99c..2dde7c6c 100644
--- a/gst/wavenc/gstwavenc.c
+++ b/gst/wavenc/gstwavenc.c
@@ -322,9 +322,7 @@ gst_wavenc_chain (GstPad *pad,
if (!wavenc->setup) {
gst_buffer_unref (buf);
- gst_element_gerror(GST_ELEMENT (wavenc), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("encoder not initialised (input is not audio?)"));
+ gst_element_error (GST_ELEMENT (wavenc), "encoder not initialised (input is not audio?)");
return;
}
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index af995123..c2e6063c 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -292,16 +292,12 @@ static void wav_new_chunk_callback(GstRiffChunk *chunk, gpointer data)
break;
default:
- gst_element_gerror(GST_ELEMENT (wavparse), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("wavparse: format %d not handled", wavparse->format));
+ gst_element_error (GST_ELEMENT (wavparse), "wavparse: format %d not handled", wavparse->format);
return;
}
if (gst_pad_try_set_caps (wavparse->srcpad, caps) <= 0) {
- gst_element_gerror(GST_ELEMENT (wavparse), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("Could not set caps"));
+ gst_element_error (GST_ELEMENT (wavparse), "Could not set caps");
return;
}