summaryrefslogtreecommitdiffstats
path: root/ext/audiofile
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 /ext/audiofile
parent054bbacfab1adbf6934dce52bee844f2950d3f64 (diff)
downloadgst-plugins-bad-671eef9b9d7116af3fc41e4b6838dffb56b45c77.tar.gz
gst-plugins-bad-671eef9b9d7116af3fc41e4b6838dffb56b45c77.tar.bz2
gst-plugins-bad-671eef9b9d7116af3fc41e4b6838dffb56b45c77.zip
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 'ext/audiofile')
-rw-r--r--ext/audiofile/gstafsink.c12
-rw-r--r--ext/audiofile/gstafsrc.c15
2 files changed, 10 insertions, 17 deletions
diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c
index 3e27adbf..3392717c 100644
--- a/ext/audiofile/gstafsink.c
+++ b/ext/audiofile/gstafsink.c
@@ -294,9 +294,7 @@ gst_afsink_open_file (GstAFSink *sink)
sink->file = fopen (sink->filename, "w");
if (sink->file == NULL) {
perror ("open");
- gst_element_gerror(GST_ELEMENT (sink), g_strconcat("opening file \"", sink->filename, "\"", GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf(NULL)));
+ gst_element_error (GST_ELEMENT (sink), g_strconcat("opening file \"", sink->filename, "\"", NULL));
return FALSE;
}
*/
@@ -353,9 +351,7 @@ gst_afsink_open_file (GstAFSink *sink)
if (sink->file == AF_NULL_FILEHANDLE)
{
perror ("open");
- gst_element_gerror(GST_ELEMENT (sink), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("error openning file %s", sink->filename));
+ gst_element_error (GST_ELEMENT (sink), g_strconcat("opening file \"", sink->filename, "\"", NULL));
return FALSE;
}
@@ -378,9 +374,7 @@ gst_afsink_close_file (GstAFSink *sink)
{
g_print ("WARNING: afsink: oops, error closing !\n");
perror ("close");
- gst_element_gerror(GST_ELEMENT (sink), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("error closing file %s", sink->filename));
+ gst_element_error (GST_ELEMENT (sink), g_strconcat("closing file \"", sink->filename, "\"", NULL));
}
else {
GST_FLAG_UNSET (sink, GST_AFSINK_OPEN);
diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c
index 71b85294..2b817310 100644
--- a/ext/audiofile/gstafsrc.c
+++ b/ext/audiofile/gstafsrc.c
@@ -306,9 +306,8 @@ gst_afsrc_open_file (GstAFSrc *src)
{
g_print ("ERROR: gstafsrc: Could not open file %s for reading\n",
src->filename);
- gst_element_gerror(GST_ELEMENT (src), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf ("error opening file %s", src->filename));
+ gst_element_error (GST_ELEMENT (src), g_strconcat ("opening file \"",
+ src->filename, "\"", NULL));
return FALSE;
}
@@ -328,11 +327,13 @@ gst_afsrc_open_file (GstAFSrc *src)
break;
case AF_SAMPFMT_FLOAT:
case AF_SAMPFMT_DOUBLE:
- GST_DEBUG ("ERROR: float data not supported yet !\n");
+ GST_DEBUG (
+ "ERROR: float data not supported yet !\n");
}
src->rate = (guint) afGetRate (src->file, AF_DEFAULT_TRACK);
src->width = sampleWidth;
- GST_DEBUG ("input file: %d channels, %d width, %d rate, signed %s\n",
+ GST_DEBUG (
+ "input file: %d channels, %d width, %d rate, signed %s\n",
src->channels, src->width, src->rate,
src->is_signed ? "yes" : "no");
}
@@ -368,9 +369,7 @@ gst_afsrc_close_file (GstAFSrc *src)
{
g_print ("WARNING: afsrc: oops, error closing !\n");
perror ("close");
- gst_element_gerror(GST_ELEMENT (src), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("error closing file %s", src->filename));
+ gst_element_error (GST_ELEMENT (src), g_strconcat("closing file \"", src->filename, "\"", NULL));
}
else {
GST_FLAG_UNSET (src, GST_AFSRC_OPEN);