summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-09-16 10:00:00 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-09-16 10:00:00 +0000
commit671eef9b9d7116af3fc41e4b6838dffb56b45c77 (patch)
treeb23179bec589972c4cb162963911bef4e237a8e1 /gst
parent054bbacfab1adbf6934dce52bee844f2950d3f64 (diff)
downloadgstreamer-plugins-bad-671eef9b9d7116af3fc41e4b6838dffb56b45c77.tar.gz
reverting error patch before making a branch.BRANCH-ERROR-ROOTBRANCH-ERROR
Original commit message from CVS: reverting error patch before making a branch.
Diffstat (limited to 'gst')
-rw-r--r--gst/chart/gstchart.c5
-rw-r--r--gst/flx/gstflxdec.c4
-rw-r--r--gst/modplug/gstmodplug.cc4
-rw-r--r--gst/mpeg1videoparse/gstmp1videoparse.c5
-rw-r--r--gst/mpegaudioparse/gstmpegaudioparse.c5
-rw-r--r--gst/overlay/gstoverlay.c4
-rw-r--r--gst/smpte/gstsmpte.c4
-rw-r--r--gst/speed/gstspeed.c4
-rw-r--r--gst/videocrop/gstvideocrop.c4
9 files changed, 12 insertions, 27 deletions
diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c
index 16558b4ff..bc86b8932 100644
--- a/gst/chart/gstchart.c
+++ b/gst/chart/gstchart.c
@@ -372,9 +372,8 @@ gst_chart_chain (GstPad *pad, GstBuffer *bufin)
"height", GST_PROPS_INT (chart->height),
"framerate", GST_PROPS_FLOAT (chart->framerate));
if (gst_pad_try_set_caps (chart->srcpad, newcaps) <= 0) {
- gst_element_gerror(GST_ELEMENT (chart), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup ("chart: could not negotiate format"));
+ gst_element_error (GST_ELEMENT (chart),
+ "chart: could not negotiate format");
return;
}
}
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index fe2044393..c20327a70 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/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index b0a0bb76a..2fa602f71 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -625,9 +625,7 @@ gst_modplug_loop (GstElement *element)
if (!GST_PAD_CAPS (modplug->srcpad) &&
modplug_negotiate (modplug) <= 0) {
- gst_element_gerror (GST_ELEMENT (modplug), GST_ERROR_CAPS_NEGOTIATION,
- g_strdup ("could not negotiate format"),
- g_strdup ("could not negotiate format"));
+ gst_element_error (GST_ELEMENT (modplug), "could not negotiate format");
return;
}
diff --git a/gst/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c
index e82d7588e..4af360fd8 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.c
+++ b/gst/mpeg1videoparse/gstmp1videoparse.c
@@ -198,9 +198,8 @@ mp1videoparse_parse_seq (Mp1VideoParse *mp1videoparse, GstBuffer *buf)
gst_caps_debug (caps, "New mpeg1videoparse caps");
if (gst_pad_try_set_caps (mp1videoparse->srcpad, caps) <= 0) {
- gst_element_gerror(GST_ELEMENT (mp1videoparse), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf ("mp1videoparse: failed to negotiate a new format"));
+ gst_element_error (GST_ELEMENT (mp1videoparse),
+ "mp1videoparse: failed to negotiate a new format");
return;
}
}
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 58576a9ae..ba207c0eb 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -360,9 +360,8 @@ bpf_from_header (GstMPEGAudioParse *parse, unsigned long header)
"channels", GST_PROPS_INT (channels),
"rate", GST_PROPS_INT (rate));
if (gst_pad_try_set_caps(parse->srcpad, caps) <= 0) {
- gst_element_gerror(GST_ELEMENT (parse), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf ("mp3parse: failed to negotiate format with next element"));
+ gst_element_error (GST_ELEMENT (parse),
+ "mp3parse: failed to negotiate format with next element");
}
parse->channels = channels;
diff --git a/gst/overlay/gstoverlay.c b/gst/overlay/gstoverlay.c
index 27b168c32..79c061fa8 100644
--- a/gst/overlay/gstoverlay.c
+++ b/gst/overlay/gstoverlay.c
@@ -315,9 +315,7 @@ gst_overlay_loop (GstElement *element)
"framerate",GST_PROPS_FLOAT (overlay->framerate)
)))
{
- 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/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index 9b203fe17..bf042e4c1 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/speed/gstspeed.c b/gst/speed/gstspeed.c
index 64020f6de..07dad78c6 100644
--- a/gst/speed/gstspeed.c
+++ b/gst/speed/gstspeed.c
@@ -280,9 +280,7 @@ speed_loop (GstElement *element)
#include "filter.func"
#undef _FORMAT
} else {
- gst_element_gerror(element, GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("capsnego was never performed, bailing..."));
+ gst_element_error (element, "capsnego was never performed, bailing...");
gst_element_yield (element);
}
}
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 54702e5cf..d96061a05 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;
}
}