summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-02-02 17:23:33 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-02-02 17:23:33 +0000
commit79bc3ebfa12cd6913654b168ad8d1591fa46097c (patch)
treeda9a78ba712c51bc62830d695291f736e8551b02 /ext
parenta47dc77f1899c53c28ad4f1c0c72d4b47488cae3 (diff)
change NULL to (NULL) for GST_ELEMENT_ERROR
Original commit message from CVS: change NULL to (NULL) for GST_ELEMENT_ERROR Make sure errors end with "."
Diffstat (limited to 'ext')
-rw-r--r--ext/aalib/gstaasink.c2
-rw-r--r--ext/dv/gstdvdec.c2
-rw-r--r--ext/esd/esdmon.c2
-rw-r--r--ext/esd/esdsink.c8
-rw-r--r--ext/flac/gstflacdec.c4
-rw-r--r--ext/flac/gstflacenc.c2
-rw-r--r--ext/flac/gstflactag.c8
-rw-r--r--ext/gdk_pixbuf/gstgdkpixbuf.c2
-rw-r--r--ext/mikmod/gstmikmod.c2
-rw-r--r--ext/raw1394/gstdv1394src.c6
-rw-r--r--ext/speex/gstspeexenc.c2
11 files changed, 21 insertions, 19 deletions
diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c
index a7ae88e2..a736408c 100644
--- a/ext/aalib/gstaasink.c
+++ b/ext/aalib/gstaasink.c
@@ -490,7 +490,7 @@ gst_aasink_open (GstAASink *aasink)
aasink->context = aa_autoinit (&aasink->ascii_surf);
if (aasink->context == NULL) {
- GST_ELEMENT_ERROR (GST_ELEMENT (aasink), LIBRARY, TOO_LAZY, NULL,
+ GST_ELEMENT_ERROR (GST_ELEMENT (aasink), LIBRARY, TOO_LAZY, (NULL),
("error opening aalib context"));
return FALSE;
}
diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c
index 3ed92241..c18bf590 100644
--- a/ext/dv/gstdvdec.c
+++ b/ext/dv/gstdvdec.c
@@ -783,7 +783,7 @@ gst_dvdec_loop (GstElement *element)
dvdec->bpp = 2;
}
} else {
- GST_ELEMENT_ERROR (element, CORE, NEGOTIATION, NULL, NULL);
+ GST_ELEMENT_ERROR (element, CORE, NEGOTIATION, (NULL), (NULL));
return;
}
}
diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c
index 6fd9c194..25e9df81 100644
--- a/ext/esd/esdmon.c
+++ b/ext/esd/esdmon.c
@@ -267,7 +267,7 @@ gst_esdmon_get (GstPad *pad)
"channels", G_TYPE_INT, esdmon->channels
)) <= 0)
{
- GST_ELEMENT_ERROR (esdmon, CORE, NEGOTIATION, NULL, NULL);
+ GST_ELEMENT_ERROR (esdmon, CORE, NEGOTIATION, (NULL), (NULL));
return NULL;
}
}
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index e887a165..4672ab79 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -255,7 +255,7 @@ gst_esdsink_chain (GstPad *pad, GstData *_data)
esdsink = GST_ESDSINK (gst_pad_get_parent (pad));
if (!esdsink->negotiated) {
- GST_ELEMENT_ERROR (esdsink, CORE, NEGOTIATION, NULL,
+ GST_ELEMENT_ERROR (esdsink, CORE, NEGOTIATION, (NULL),
("element wasn't negotiated before chain function"));
goto done;
}
@@ -394,7 +394,7 @@ gst_esdsink_open_audio (GstEsdsink *sink)
if (sink->depth == 16) esdformat |= ESD_BITS16;
else if (sink->depth == 8) esdformat |= ESD_BITS8;
else {
- GST_ELEMENT_ERROR (sink, STREAM, FORMAT, NULL,
+ GST_ELEMENT_ERROR (sink, STREAM, FORMAT, (NULL),
("invalid bit depth (%d)", sink->depth));
return FALSE;
}
@@ -402,7 +402,7 @@ gst_esdsink_open_audio (GstEsdsink *sink)
if (sink->channels == 2) esdformat |= ESD_STEREO;
else if (sink->channels == 1) esdformat |= ESD_MONO;
else {
- GST_ELEMENT_ERROR (sink, STREAM, FORMAT, NULL,
+ GST_ELEMENT_ERROR (sink, STREAM, FORMAT, (NULL),
("invalid number of channels (%d)", sink->channels));
return FALSE;
}
@@ -414,7 +414,7 @@ gst_esdsink_open_audio (GstEsdsink *sink)
sink->fd = esd_play_stream(esdformat, sink->frequency, sink->host, connname);
}
if ( sink->fd < 0 ) {
- GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, NULL,
+ GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (NULL),
("can't open connection to esound server"));
return FALSE;
}
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index efffa002..094d349a 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -305,7 +305,7 @@ gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder *decoder,
break;
}
- GST_ELEMENT_ERROR (flacdec, STREAM, DECODE, NULL, (error));
+ GST_ELEMENT_ERROR (flacdec, STREAM, DECODE, (NULL), (error));
}
static FLAC__SeekableStreamDecoderSeekStatus
@@ -535,7 +535,7 @@ gst_flacdec_loop (GstElement *element)
GST_DEBUG ("flacdec: initializing decoder");
res = FLAC__seekable_stream_decoder_init (flacdec->decoder);
if (res != FLAC__SEEKABLE_STREAM_DECODER_OK) {
- GST_ELEMENT_ERROR (flacdec, LIBRARY, INIT, NULL,
+ GST_ELEMENT_ERROR (flacdec, LIBRARY, INIT, (NULL),
(FLAC__SeekableStreamDecoderStateString[res]));
return;
}
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index df90c448..49950ab7 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -549,7 +549,7 @@ gst_flacenc_chain (GstPad *pad, GstData *_data)
}
if (!flacenc->negotiated) {
- GST_ELEMENT_ERROR (flacenc, CORE, NEGOTIATION, NULL,
+ GST_ELEMENT_ERROR (flacenc, CORE, NEGOTIATION, (NULL),
("format wasn't negotiated before chain function"));
return;
}
diff --git a/ext/flac/gstflactag.c b/ext/flac/gstflactag.c
index b5a780b7..a72313bd 100644
--- a/ext/flac/gstflactag.c
+++ b/ext/flac/gstflactag.c
@@ -295,7 +295,7 @@ gst_flac_tag_chain (GstPad *pad, GstData *data)
gst_buffer_unref (sub);
} else {
/* FIXME: does that work well with FLAC files containing ID3v2 tags ? */
- GST_ELEMENT_ERROR (tag, STREAM, WRONG_TYPE, NULL, NULL);
+ GST_ELEMENT_ERROR (tag, STREAM, WRONG_TYPE, (NULL), (NULL));
}
}
@@ -464,7 +464,7 @@ gst_flac_tag_chain (GstPad *pad, GstData *data)
g_warning ("No tags found\n");
buffer = gst_buffer_new_and_alloc (12);
if (buffer == NULL) {
- GST_ELEMENT_ERROR (tag, CORE, TOO_LAZY, NULL,
+ GST_ELEMENT_ERROR (tag, CORE, TOO_LAZY, (NULL),
("Error creating 12-byte buffer for padding block"));
}
bzero (GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
@@ -481,7 +481,7 @@ gst_flac_tag_chain (GstPad *pad, GstData *data)
sizeof (header), NULL);
gst_tag_list_free (merged_tags);
if (buffer == NULL) {
- GST_ELEMENT_ERROR (tag, CORE, TAG, NULL, ("Error converting tag list to vorbiscomment buffer"));
+ GST_ELEMENT_ERROR (tag, CORE, TAG, (NULL), ("Error converting tag list to vorbiscomment buffer"));
return;
}
size = GST_BUFFER_SIZE (buffer) - 4;
@@ -490,7 +490,7 @@ gst_flac_tag_chain (GstPad *pad, GstData *data)
* while the vorbis specs allow more than that. Shouldn't
* be a real world problem though
*/
- GST_ELEMENT_ERROR (tag, CORE, TAG, NULL, ("Vorbis comment of size %d too long", size));
+ GST_ELEMENT_ERROR (tag, CORE, TAG, (NULL), ("Vorbis comment of size %d too long", size));
return;
}
}
diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c
index 26d64b56..a3b643db 100644
--- a/ext/gdk_pixbuf/gstgdkpixbuf.c
+++ b/ext/gdk_pixbuf/gstgdkpixbuf.c
@@ -288,7 +288,7 @@ gst_gdk_pixbuf_chain (GstPad *pad, GstData *_data)
GError *error;
if (gdk_pixbuf_loader_close (filter->pixbuf_loader, &error)) {
- GST_ELEMENT_ERROR (filter, LIBRARY, SHUTDOWN, NULL, (error->message));
+ GST_ELEMENT_ERROR (filter, LIBRARY, SHUTDOWN, (NULL), (error->message));
g_error_free (error);
return;
}
diff --git a/ext/mikmod/gstmikmod.c b/ext/mikmod/gstmikmod.c
index 5d6b0fc7..c3f3c968 100644
--- a/ext/mikmod/gstmikmod.c
+++ b/ext/mikmod/gstmikmod.c
@@ -294,7 +294,7 @@ gst_mikmod_loop (GstElement *element)
if (!GST_PAD_CAPS (mikmod->srcpad)) {
if (gst_mikmod_negotiate (mikmod) <= 0) {
- GST_ELEMENT_ERROR (mikmod, CORE, NEGOTIATION, NULL, NULL);
+ GST_ELEMENT_ERROR (mikmod, CORE, NEGOTIATION, (NULL), (NULL));
return;
}
}
diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c
index 432b7561..c3685800 100644
--- a/ext/raw1394/gstdv1394src.c
+++ b/ext/raw1394/gstdv1394src.c
@@ -250,7 +250,8 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad
if (gst_pad_try_set_caps (dv1394src->srcpad,
gst_caps_new_simple ("video/dv",
"format", G_TYPE_STRING, "PAL", NULL)) <= 0) {
- GST_ELEMENT_ERROR (dv1394src, CORE, NEGOTIATION, NULL, ("Could not set source caps for PAL"));
+ GST_ELEMENT_ERROR (dv1394src, CORE, NEGOTIATION, (NULL),
+ ("Could not set source caps for PAL"));
return 0;
}
} else {
@@ -260,7 +261,8 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad
if (gst_pad_try_set_caps (dv1394src->srcpad,
gst_caps_new_simple ("video/dv",
"format", G_TYPE_STRING, "NTSC", NULL)) <= 0) {
- GST_ELEMENT_ERROR (dv1394src, CORE, NEGOTIATION, NULL, ("Could not set source caps for NTSC"));
+ GST_ELEMENT_ERROR (dv1394src, CORE, NEGOTIATION, (NULL),
+ ("Could not set source caps for NTSC"));
return 0;
}
}
diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c
index a4eb4532..ac1d1903 100644
--- a/ext/speex/gstspeexenc.c
+++ b/ext/speex/gstspeexenc.c
@@ -210,7 +210,7 @@ gst_speexenc_chain (GstPad *pad, GstData *_data)
"channels", G_TYPE_INT, 1,
NULL)))
{
- GST_ELEMENT_ERROR (speexenc, CORE, NEGOTIATION, NULL, NULL);
+ GST_ELEMENT_ERROR (speexenc, CORE, NEGOTIATION, (NULL), (NULL));
return;
}
}