GST_ELEMENT_ERROR

Original commit message from CVS:
GST_ELEMENT_ERROR

19 files changed, 48 insertions, 48 deletions

diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c
index 9cd134e5..afef5f69 100644
--- a/ext/audiofile/gstafsink.c
+++ b/ext/audiofile/gstafsink.c
@@ -346,7 +346,7 @@ gst_afsink_open_file (GstAFSink *sink)
   sink->file = afOpenFile (sink->filename, "w", outfilesetup);
   if (sink->file == AF_NULL_FILEHANDLE)
   {
-   gst_element_error (sink, RESOURCE, OPEN_WRITE,
+   GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE,
                          (_("Could not open file \"%s\" for writing"), sink->filename),
                          ("system error: %s", strerror (errno)));
     return FALSE;
@@ -369,7 +369,7 @@ gst_afsink_close_file (GstAFSink *sink)
 /*  if (fclose (sink->file) != 0) */
   if (afCloseFile (sink->file) != 0)
   {
-    gst_element_error (sink, RESOURCE, CLOSE,
+    GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
                        (_("Error closing file \"%s\""), sink->filename),
                        GST_ERROR_SYSTEM);
   }
diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c
index bffff45a..e2bdf3f6 100644
--- a/ext/audiofile/gstafsrc.c
+++ b/ext/audiofile/gstafsrc.c
@@ -316,7 +316,7 @@ gst_afsrc_open_file (GstAFSrc *src)
   src->file = afOpenFile (src->filename, "r", AF_NULL_FILESETUP);
   if (src->file == AF_NULL_FILEHANDLE)
   {
-     gst_element_error (src, RESOURCE, OPEN_READ,
+     GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
                         (_("Could not open file \"%s\" for reading"), src->filename),
                         ("system error: %s", strerror (errno)));
     return FALSE;
@@ -374,7 +374,7 @@ gst_afsrc_close_file (GstAFSrc *src)
 /*  if (fclose (src->file) != 0) 	*/
   if (afCloseFile (src->file) != 0)
   {
-    gst_element_error (src, RESOURCE, CLOSE,
+    GST_ELEMENT_ERROR (src, RESOURCE, CLOSE,
                        (_("Error closing file \"%s\""), src->filename),
                        GST_ERROR_SYSTEM);
   } else {
diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c
index 192c655e..15aecaa1 100644
--- a/ext/divx/gstdivxdec.c
+++ b/ext/divx/gstdivxdec.c
@@ -229,7 +229,7 @@ gst_divxdec_setup (GstDivxDec *divxdec)
       break;
   }
   if ((ret = decore(&handle, DEC_OPT_INIT, &xinit, NULL)) != 0) {
-    gst_element_error (divxdec, LIBRARY, INIT, NULL,
+    GST_ELEMENT_ERROR (divxdec, LIBRARY, INIT, NULL,
                        ("divx library error: %s (%d)", gst_divxdec_error (ret), ret));
     return FALSE;
   }
@@ -247,7 +247,7 @@ gst_divxdec_setup (GstDivxDec *divxdec)
 
   if ((ret = decore(divxdec->handle, DEC_OPT_SETOUT,
                     &output, NULL)) != 0) {
-    gst_element_error (divxdec, LIBRARY, SETTINGS, NULL,
+    GST_ELEMENT_ERROR (divxdec, LIBRARY, SETTINGS, NULL,
                        ("error setting output: %s (%d)",
                         gst_divxdec_error (ret), ret));
     gst_divxdec_unset(divxdec);
@@ -285,7 +285,7 @@ gst_divxdec_chain (GstPad    *pad,
 
   if (!divxdec->handle) {
     if (gst_divxdec_negotiate(divxdec) <= 0) {
-      gst_element_error (divxdec, CORE, TOO_LAZY, NULL,
+      GST_ELEMENT_ERROR (divxdec, CORE, TOO_LAZY, NULL,
                         ("No format set - aborting"));
       gst_buffer_unref(buf);
       return;
@@ -309,7 +309,7 @@ gst_divxdec_chain (GstPad    *pad,
 
   if ((ret = decore(divxdec->handle, DEC_OPT_FRAME,
                     &xframe, NULL))) {
-    gst_element_error (divxdec, STREAM, DECODE, NULL,
+    GST_ELEMENT_ERROR (divxdec, STREAM, DECODE, NULL,
                        ("Error decoding divx frame: %s (%d)",
                        gst_divxdec_error(ret), ret));
     gst_buffer_unref(buf);
diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c
index 1eaaebe1..a0b4e89a 100644
--- a/ext/divx/gstdivxenc.c
+++ b/ext/divx/gstdivxenc.c
@@ -295,7 +295,7 @@ gst_divxenc_setup (GstDivxEnc *divxenc)
   output.temporal_level = 1.0;
 
   if ((ret = encore(&handle, ENC_OPT_INIT, &input, &output))) {
-    gst_element_error (divxenc, LIBRARY, SETTINGS, NULL,
+    GST_ELEMENT_ERROR (divxenc, LIBRARY, SETTINGS, NULL,
                        ("Error setting up divx encoder: %s (%d)",
                         gst_divxenc_error(ret), ret));
     return FALSE;
@@ -357,7 +357,7 @@ gst_divxenc_chain (GstPad    *pad,
 
   if ((ret = encore(divxenc->handle, ENC_OPT_ENCODE,
                     &xframe, &xres))) {
-    gst_element_error (divxenc, LIBRARY, ENCODE, NULL,
+    GST_ELEMENT_ERROR (divxenc, LIBRARY, ENCODE, NULL,
                        ("Error encoding divx frame: %s (%d)",
                         gst_divxenc_error(ret), ret));
     gst_buffer_unref(buf);
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index f84acb6f..218d9bba 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -417,7 +417,7 @@ gst_faac_chain (GstPad  *pad,
 					 NULL, 0,
 					 GST_BUFFER_DATA (outbuf),
 					 faac->bytes)) < 0) {
-            gst_element_error (faac, LIBRARY, ENCODE, NULL, NULL);
+            GST_ELEMENT_ERROR (faac, LIBRARY, ENCODE, NULL, NULL);
             gst_event_unref (event);
             gst_buffer_unref (outbuf);
             return;
@@ -445,7 +445,7 @@ gst_faac_chain (GstPad  *pad,
   inbuf = GST_BUFFER (data);
 
   if (!faac->handle) {
-    gst_element_error (faac, CORE, NEGOTIATION, NULL,
+    GST_ELEMENT_ERROR (faac, CORE, NEGOTIATION, NULL,
                        ("format wasn't negotiated before chain function"));
     gst_buffer_unref (inbuf);
     return;
@@ -454,7 +454,7 @@ gst_faac_chain (GstPad  *pad,
   if (!GST_PAD_CAPS (faac->srcpad)) {
     if (gst_faac_srcconnect (faac->srcpad,
 			     gst_pad_get_allowed_caps (faac->srcpad)) <= 0) {
-      gst_element_error (faac, CORE, NEGOTIATION, NULL,
+      GST_ELEMENT_ERROR (faac, CORE, NEGOTIATION, NULL,
 			 ("failed to negotiate MPEG/AAC format with next element"));
       gst_buffer_unref (inbuf);
       return;
@@ -516,7 +516,7 @@ gst_faac_chain (GstPad  *pad,
 				   GST_BUFFER_SIZE (subbuf) / faac->bps,
 				   GST_BUFFER_DATA (outbuf),
 				   faac->bytes)) < 0) {
-      gst_element_error (faac, LIBRARY, ENCODE, NULL, NULL);
+      GST_ELEMENT_ERROR (faac, LIBRARY, ENCODE, NULL, NULL);
       gst_buffer_unref (inbuf);
       gst_buffer_unref (subbuf);
       return;
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index 67bcdddb..7f3a8c16 100644
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -359,7 +359,7 @@ gst_faad_chain (GstPad  *pad,
     faad->channels = channels;
     if (gst_faad_srcconnect (faad->srcpad,
 			     gst_pad_get_allowed_caps (faad->srcpad)) <= 0) {
-      gst_element_error (faad, CORE, NEGOTIATION, NULL, NULL);
+      GST_ELEMENT_ERROR (faad, CORE, NEGOTIATION, NULL, NULL);
       gst_buffer_unref (buf);
       return;
     }
@@ -368,7 +368,7 @@ gst_faad_chain (GstPad  *pad,
   out = faacDecDecode (faad->handle, &info,
 		       GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
   if (info.error) {
-    gst_element_error (faad, STREAM, DECODE, NULL,
+    GST_ELEMENT_ERROR (faad, STREAM, DECODE, NULL,
 		       ("Failed to decode buffer: %s",
 		        faacDecGetErrorMessage (info.error)));
     gst_buffer_unref (buf);
@@ -381,7 +381,7 @@ gst_faad_chain (GstPad  *pad,
     faad->channels = info.channels;
     if (gst_faad_srcconnect (faad->srcpad,
 			     gst_pad_get_allowed_caps (faad->srcpad)) <= 0) {
-      gst_element_error (faad, CORE, NEGOTIATION, NULL, NULL);
+      GST_ELEMENT_ERROR (faad, CORE, NEGOTIATION, NULL, NULL);
       gst_buffer_unref (buf);
       return;
     }
diff --git a/ext/ivorbis/vorbisfile.c b/ext/ivorbis/vorbisfile.c
index 4f708aa0..182cdbb0 100644
--- a/ext/ivorbis/vorbisfile.c
+++ b/ext/ivorbis/vorbisfile.c
@@ -569,7 +569,7 @@ gst_ivorbisfile_loop (GstElement *element)
     /* open our custom ivorbisfile data object with the callbacks we provide */
     if (ov_open_callbacks (ivorbisfile, &ivorbisfile->vf, NULL, 0,
 			   ivorbisfile_ov_callbacks) < 0) {
-      gst_element_error (element, STREAM, DECODE, NULL, NULL);
+      GST_ELEMENT_ERROR (element, STREAM, DECODE, NULL, NULL);
       return;
     }
     ivorbisfile->need_discont = TRUE;
@@ -633,7 +633,7 @@ gst_ivorbisfile_loop (GstElement *element)
   /* we update the caps for each logical stream */
   if (ivorbisfile->vf.current_link != ivorbisfile->current_link) {
     if (!gst_ivorbisfile_new_link (ivorbisfile, ivorbisfile->vf.current_link)) {
-      gst_element_error (ivorbisfile, CORE, NEGOTIATION, NULL, NULL);
+      GST_ELEMENT_ERROR (ivorbisfile, CORE, NEGOTIATION, NULL, NULL);
     }
     return;
   }
diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c
index 20edef6f..4658745c 100644
--- a/ext/lcs/gstcolorspace.c
+++ b/ext/lcs/gstcolorspace.c
@@ -316,7 +316,7 @@ gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps)
     peercaps = peercaps->next;
   }
   
-  gst_element_error (space, CORE, NEGOTIATION, NULL, NULL);
+  GST_ELEMENT_ERROR (space, CORE, NEGOTIATION, NULL, NULL);
   /* we disable ourself here */
   space->disabled = TRUE;
 
diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc
index 952affaa..5bf0ba15 100644
--- a/ext/mpeg2enc/gstmpeg2enc.cc
+++ b/ext/mpeg2enc/gstmpeg2enc.cc
@@ -239,7 +239,7 @@ gst_mpeg2enc_loop (GstElement *element)
     gst_pad_set_element_private (enc->sinkpad, data);
 
     if (!(caps = GST_PAD_CAPS (enc->sinkpad))) {
-      gst_element_error (element, CORE, NEGOTIATION, (""),
+      GST_ELEMENT_ERROR (element, CORE, NEGOTIATION, (""),
 			 ("format wasn't negotiated before loop function"));
       return;
     }
@@ -251,7 +251,7 @@ gst_mpeg2enc_loop (GstElement *element)
     /* and set caps on other side */
     othercaps = enc->encoder->getFormat ();
     if (gst_pad_set_explicit_caps (enc->srcpad, othercaps) <= 0) {
-      gst_element_error (element, CORE, NEGOTIATION, (""), (""));
+      GST_ELEMENT_ERROR (element, CORE, NEGOTIATION, (""), (""));
       delete enc->encoder;
       enc->encoder = NULL;
       return;
diff --git a/ext/mpeg2enc/gstmpeg2encpicturereader.cc b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
index 0d9ae80b..439f4f10 100644
--- a/ext/mpeg2enc/gstmpeg2encpicturereader.cc
+++ b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
@@ -98,7 +98,7 @@ GstMpeg2EncPictureReader::LoadFrame ()
     if ((data = (GstData *) gst_pad_get_element_private (pad))) {
       gst_pad_set_element_private (pad, NULL);
     } else if (!(data = gst_pad_pull (pad))) {
-      gst_element_error (gst_pad_get_parent (pad), RESOURCE, READ,
+      GST_ELEMENT_ERROR (gst_pad_get_parent (pad), RESOURCE, READ,
 			 (NULL), (NULL));
       return true;
     }
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc
index ded48922..060e5d04 100644
--- a/ext/mplex/gstmplex.cc
+++ b/ext/mplex/gstmplex.cc
@@ -279,7 +279,7 @@ gst_mplex_loop (GstElement *element)
     }
 
     if (!mplex->job->video_tracks && !mplex->job->audio_tracks) {
-      gst_element_error (element, CORE, NEGOTIATION, (""),
+      GST_ELEMENT_ERROR (element, CORE, NEGOTIATION, (""),
 			 ("no input video or audio tracks set up before loop function"));
       return;
     }
diff --git a/ext/mplex/gstmplexibitstream.cc b/ext/mplex/gstmplexibitstream.cc
index b47c074a..1867c657 100644
--- a/ext/mplex/gstmplexibitstream.cc
+++ b/ext/mplex/gstmplexibitstream.cc
@@ -53,7 +53,7 @@ GstMplexIBitStream::GstMplexIBitStream (GstPad *_pad,
   gst_bytestream_peek_bytes (bs, &data, 1);
 
   if (!ReadIntoBuffer () && buffered == 0) {
-    gst_element_error (gst_pad_get_parent (_pad), RESOURCE, READ, (""),
+    GST_ELEMENT_ERROR (gst_pad_get_parent (_pad), RESOURCE, READ, (""),
 		       ("Failed to read from input pad %s",
 		       gst_pad_get_name (pad)));
   }
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c
index 040d9ed1..36d7c63f 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -366,7 +366,7 @@ gst_sdlvideosink_lock (GstSDLVideoSink *sdlvideosink)
 {
   /* assure that we've got a screen */
   if (!sdlvideosink->screen || !sdlvideosink->overlay) {
-    gst_element_error (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
+    GST_ELEMENT_ERROR (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
 		       ("Tried to lock screen without being set-up"));
     return FALSE;
   }
@@ -376,14 +376,14 @@ gst_sdlvideosink_lock (GstSDLVideoSink *sdlvideosink)
   {
     if (SDL_LockSurface(sdlvideosink->screen) < 0)
     {
-      gst_element_error (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
+      GST_ELEMENT_ERROR (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
         ("SDL: couldn't lock the SDL video window: %s", SDL_GetError()));
       return FALSE;
     }
   }
   if (SDL_LockYUVOverlay(sdlvideosink->overlay) < 0)
   {
-    gst_element_error (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
+    GST_ELEMENT_ERROR (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
       ("SDL: couldn\'t lock the SDL YUV overlay: %s", SDL_GetError()));
     return FALSE;
   }
@@ -427,7 +427,7 @@ gst_sdlvideosink_initsdl (GstSDLVideoSink *sdlvideosink)
 
   /* Initialize the SDL library */
   if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0 ) {
-    gst_element_error (sdlvideosink, LIBRARY, INIT, NULL,
+    GST_ELEMENT_ERROR (sdlvideosink, LIBRARY, INIT, NULL,
 		      ("Couldn't initialize SDL: %s", SDL_GetError()));
     return FALSE;
   }
@@ -464,7 +464,7 @@ gst_sdlvideosink_create (GstSDLVideoSink *sdlvideosink)
     GST_VIDEOSINK_HEIGHT (sdlvideosink), 0, SDL_HWSURFACE | SDL_RESIZABLE);
   if (sdlvideosink->screen == NULL)
   {
-    gst_element_error (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
+    GST_ELEMENT_ERROR (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
       ("SDL: Couldn't set %dx%d: %s", GST_VIDEOSINK_WIDTH (sdlvideosink),
       GST_VIDEOSINK_HEIGHT (sdlvideosink), SDL_GetError()));
     return FALSE;
@@ -475,7 +475,7 @@ gst_sdlvideosink_create (GstSDLVideoSink *sdlvideosink)
     sdlvideosink->height, sdlvideosink->format, sdlvideosink->screen);
   if ( sdlvideosink->overlay == NULL )
   {
-    gst_element_error (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
+    GST_ELEMENT_ERROR (sdlvideosink, LIBRARY, TOO_LAZY, NULL,
       ("SDL: Couldn't create SDL YUV overlay (%dx%d \'" GST_FOURCC_FORMAT "\'): %s",
       sdlvideosink->width, sdlvideosink->height,
       GST_FOURCC_ARGS(sdlvideosink->format), SDL_GetError()));
diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c
index 18100d8c..c7bc2c12 100644
--- a/ext/sndfile/gstsf.c
+++ b/ext/sndfile/gstsf.c
@@ -559,7 +559,7 @@ gst_sf_open_file (GstSF *this)
   this->time = 0;
 
   if (!this->filename) {
-    gst_element_error (this, RESOURCE, NOT_FOUND,
+    GST_ELEMENT_ERROR (this, RESOURCE, NOT_FOUND,
                          (_("No filename specified")),
                          NULL);
     return FALSE;
@@ -587,7 +587,7 @@ gst_sf_open_file (GstSF *this)
               this->filename, info.samplerate, info.channels, info.format);
 
     if (!sf_format_check (&info)) {
-      gst_element_error (this, STREAM, ENCODE, NULL,
+      GST_ELEMENT_ERROR (this, STREAM, ENCODE, NULL,
                            ("Input parameters (rate:%d, channels:%d, format:0x%x) invalid",
                                           info.samplerate, info.channels, info.format));
       return FALSE;
@@ -597,7 +597,7 @@ gst_sf_open_file (GstSF *this)
   this->file = sf_open (this->filename, mode, &info);
 
   if (!this->file) {
-    gst_element_error (this, RESOURCE, OPEN_WRITE,
+    GST_ELEMENT_ERROR (this, RESOURCE, OPEN_WRITE,
                        (_("Could not open file \"%s\" for writing"), this->filename),
                          ("soundfile error: %s", sf_strerror (NULL)));
     return FALSE;
@@ -636,7 +636,7 @@ gst_sf_close_file (GstSF *this)
   INFO_OBJ (this, "Closing file %s", this->filename);
 
   if ((err = sf_close (this->file)))
-    gst_element_error (this, RESOURCE, CLOSE,
+    GST_ELEMENT_ERROR (this, RESOURCE, CLOSE,
                        ("Could not close file file \"%s\"", this->filename),
                        ("soundfile error: %s", strerror (err)));
   else
@@ -657,7 +657,7 @@ gst_sf_loop (GstElement *element)
   this = (GstSF*)element;
   
   if (this->channels == NULL) {
-    gst_element_error (element, CORE, PAD, NULL, ("You must connect at least one pad to sndfile elements."));
+    GST_ELEMENT_ERROR (element, CORE, PAD, NULL, ("You must connect at least one pad to sndfile elements."));
     return;
   }
 
@@ -707,7 +707,7 @@ gst_sf_loop (GstElement *element)
               "buffer-frames", G_TYPE_INT, this->buffer_frames,
               NULL);
           if (!gst_pad_try_set_caps (GST_SF_CHANNEL (l)->pad, caps)) {
-            gst_element_error (this, CORE, NEGOTIATION, NULL,
+            GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL,
                                ("Opened file with sample rate %d, but could not set caps", this->rate));
             gst_sf_close_file (this);
             return;
@@ -763,7 +763,7 @@ gst_sf_loop (GstElement *element)
            which then would set this->buffer_frames to a new value */
         buffer_frames = this->buffer_frames;
         if (buffer_frames == 0) {
-          gst_element_error (element, CORE, NEGOTIATION, NULL,
+          GST_ELEMENT_ERROR (element, CORE, NEGOTIATION, NULL,
                              ("format wasn't negotiated before chain function"));
           return;
         }
@@ -789,7 +789,7 @@ gst_sf_loop (GstElement *element)
     if (num_to_write) {
       written = sf_writef_float (this->file, buf, num_to_write);
       if (written != num_to_write)
-        gst_element_error (element, RESOURCE, WRITE,
+        GST_ELEMENT_ERROR (element, RESOURCE, WRITE,
                              (_("Could not write to file \"%s\""), this->filename),
                              ("soundfile error: %s", sf_strerror (this->file)));
     }
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index c4714ad3..515374f4 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -288,7 +288,7 @@ gst_swfdec_loop(GstElement *element)
                 if (GST_PAD_LINK_SUCCESSFUL (link_ret)){
                   /* good */
                 } else {
-                  gst_element_error (swfdec, CORE, NEGOTIATION, NULL, NULL);
+                  GST_ELEMENT_ERROR (swfdec, CORE, NEGOTIATION, NULL, NULL);
                   return;
                 }
                 swfdec->have_format = TRUE;
diff --git a/ext/tarkin/gsttarkindec.c b/ext/tarkin/gsttarkindec.c
index a2c27e9f..0121b840 100644
--- a/ext/tarkin/gsttarkindec.c
+++ b/ext/tarkin/gsttarkindec.c
@@ -209,7 +209,7 @@ gst_tarkindec_chain (GstPad *pad, GstData *_data)
   tarkindec = GST_TARKINDEC (gst_pad_get_parent (pad));
 
   if (!tarkindec->setup) {
-    gst_element_error (tarkindec, CORE, NEGOTATION, NULL, ("decoder not initialized (input is not tarkin?)"));
+    GST_ELEMENT_ERROR (tarkindec, CORE, NEGOTATION, NULL, ("decoder not initialized (input is not tarkin?)"));
     if (GST_IS_BUFFER (buf))
       gst_buffer_unref (buf);
     else
@@ -278,7 +278,7 @@ gst_tarkindec_chain (GstPad *pad, GstData *_data)
 					"framerate",  GST_PROPS_FLOAT (0.) /* FIXME!!! */
 				       )) <= 0)
 	      {
-		gst_element_error (tarkindec, CORE, NEGOTATION, NULL,  ("could not output format"));
+		GST_ELEMENT_ERROR (tarkindec, CORE, NEGOTATION, NULL,  ("could not output format"));
 		gst_buffer_unref (buf);
 		return;
 	      }
diff --git a/ext/tarkin/gsttarkinenc.c b/ext/tarkin/gsttarkinenc.c
index b58e1ab6..c12abb3c 100644
--- a/ext/tarkin/gsttarkinenc.c
+++ b/ext/tarkin/gsttarkinenc.c
@@ -319,7 +319,7 @@ gst_tarkinenc_chain (GstPad *pad, GstData *_data)
   tarkinenc = GST_TARKINENC (gst_pad_get_parent (pad));
 
   if (!tarkinenc->setup) {
-    gst_element_error (tarkinenc, CORE, NEGOTIATION, NULL, ("encoder not initialized (input is not tarkin?)"));
+    GST_ELEMENT_ERROR (tarkinenc, CORE, NEGOTIATION, NULL, ("encoder not initialized (input is not tarkin?)"));
     if (GST_IS_BUFFER (buf))
       gst_buffer_unref (buf);
     else
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index 68b21d7d..06afc14b 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -201,7 +201,7 @@ gst_xviddec_setup (GstXvidDec *xviddec)
 
   if ((ret = xvid_decore(NULL, XVID_DEC_CREATE,
                          &xdec, NULL)) < 0) {
-    gst_element_error (xviddec, LIBRARY, SETTINGS, NULL,
+    GST_ELEMENT_ERROR (xviddec, LIBRARY, SETTINGS, NULL,
 		      ("Setting parameters %dx%d@%d failed: %s (%d)",
 	              xviddec->width, xviddec->height, xviddec->csp,
 		      gst_xvid_error(ret), ret));
@@ -228,7 +228,7 @@ gst_xviddec_chain (GstPad    *pad,
   g_return_if_fail(GST_IS_PAD(pad));
 
   if (!xviddec->handle) {
-    gst_element_error (xviddec, CORE, NEGOTIATION, NULL,
+    GST_ELEMENT_ERROR (xviddec, CORE, NEGOTIATION, NULL,
          ("format wasn't negotiated before chain function"));
     gst_buffer_unref(buf);
     return;
@@ -263,7 +263,7 @@ gst_xviddec_chain (GstPad    *pad,
 
   if ((ret = xvid_decore(xviddec->handle, XVID_DEC_DECODE,
                          &xframe, NULL)) < 0) {
-    gst_element_error (xviddec, STREAM, DECODE, NULL,
+    GST_ELEMENT_ERROR (xviddec, STREAM, DECODE, NULL,
                       ("Error decoding xvid frame: %s (%d)\n",
 		      gst_xvid_error(ret), ret));
     gst_buffer_unref(buf);
diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c
index 1b9de2f5..02785b9d 100644
--- a/ext/xvid/gstxvidenc.c
+++ b/ext/xvid/gstxvidenc.c
@@ -299,7 +299,7 @@ gst_xvidenc_setup (GstXvidEnc *xvidenc)
 
   if ((ret = xvid_encore(NULL, XVID_ENC_CREATE,
                          &xenc, NULL)) < 0) {
-    gst_element_error (xvidenc, LIBRARY, INIT, NULL,
+    GST_ELEMENT_ERROR (xvidenc, LIBRARY, INIT, NULL,
                       ("Error setting up xvid encoder: %s (%d)",
 		      gst_xvid_error(ret), ret));
     return FALSE;
@@ -355,7 +355,7 @@ gst_xvidenc_chain (GstPad    *pad,
 
   if ((ret = xvid_encore(xvidenc->handle, XVID_ENC_ENCODE,
                          &xframe, &xstats)) < 0) {
-    gst_element_error (xvidenc, LIBRARY, ENCODE, NULL,
+    GST_ELEMENT_ERROR (xvidenc, LIBRARY, ENCODE, NULL,
                       ("Error encoding xvid frame: %s (%d)",
 		      gst_xvid_error(ret), ret));
     gst_buffer_unref(buf);