GST_ELEMENT_ERROR

Original commit message from CVS:
GST_ELEMENT_ERROR

2 files changed, 19 insertions, 19 deletions

diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index 8ecb4adb..4f813f65 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -167,7 +167,7 @@ gst_ebml_read_element_id (GstEbmlRead *ebml,
     } else {
       guint64 pos = gst_bytestream_tell (ebml->bs);
       gst_event_unref (event);
-      gst_element_error (ebml, RESOURCE, READ, NULL,
+      GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL,
 			 ("Read error at position %llu (0x%llx)",
 			 pos, pos));
     }
@@ -180,7 +180,7 @@ gst_ebml_read_element_id (GstEbmlRead *ebml,
   }
   if (read > 4) {
     guint64 pos = gst_bytestream_tell (ebml->bs);
-    gst_element_error (ebml, STREAM, DEMUX, NULL,
+    GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL,
 		       ("Invalid EBML ID size tag (0x%x) at position %llu (0x%llx)",
 		       data[0], pos, pos));
     return -1;
@@ -188,7 +188,7 @@ gst_ebml_read_element_id (GstEbmlRead *ebml,
 
   if (gst_bytestream_peek_bytes (ebml->bs, &data, read) != read) {
     guint64 pos = gst_bytestream_tell (ebml->bs);
-    gst_element_error (ebml, RESOURCE, READ, NULL,
+    GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL,
 		       ("Read error at position %llu (0x%llx)", pos, pos));
     return -1;
   }
@@ -219,7 +219,7 @@ gst_ebml_read_element_length (GstEbmlRead *ebml,
 
   if (gst_bytestream_peek_bytes (ebml->bs, &data, 1) != 1) {
     guint64 pos = gst_bytestream_tell (ebml->bs);
-    gst_element_error (ebml, RESOURCE, READ, NULL,
+    GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL,
 		       ("Read error at position %llu (0x%llx)", pos, pos));
     return -1;
   }
@@ -230,7 +230,7 @@ gst_ebml_read_element_length (GstEbmlRead *ebml,
   }
   if (read > 8) {
     guint64 pos = gst_bytestream_tell (ebml->bs);
-    gst_element_error (ebml, STREAM, DEMUX, NULL,
+    GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL,
 		       ("Invalid EBML length size tag (0x%x) at position %llu (0x%llx)",
 		       data[0], pos, pos));
     return -1;
@@ -240,7 +240,7 @@ gst_ebml_read_element_length (GstEbmlRead *ebml,
     num_ffs++;
   if (gst_bytestream_peek_bytes (ebml->bs, &data, read) != read) {
     guint64 pos = gst_bytestream_tell (ebml->bs);
-    gst_element_error (ebml, RESOURCE, READ, NULL,
+    GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL,
 		       ("Read error at position %llu (0x%llx)", pos, pos));
     return -1;
   }
@@ -272,7 +272,7 @@ gst_ebml_read_element_data (GstEbmlRead *ebml,
 
   if (gst_bytestream_peek (ebml->bs, &buf, length) != length) {
     guint64 pos = gst_bytestream_tell (ebml->bs);
-    gst_element_error (ebml, RESOURCE, READ, NULL,
+    GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL,
 		       ("Read error at position %llu (0x%llx)", pos, pos));
     if (buf)
       gst_buffer_unref (buf);
@@ -327,7 +327,7 @@ gst_ebml_read_seek (GstEbmlRead *ebml,
 
   /* now seek */
   if (!gst_bytestream_seek (ebml->bs, offset, GST_SEEK_METHOD_SET)) {
-    gst_element_error (ebml, RESOURCE, SEEK, NULL,
+    GST_ELEMENT_ERROR (ebml, RESOURCE, SEEK, NULL,
 		       ("Seek to position %llu (0x%llx) failed", offset, offset));
     return NULL;
   }
@@ -340,7 +340,7 @@ gst_ebml_read_seek (GstEbmlRead *ebml,
   /* get the discont event and return */
   gst_bytestream_get_status (ebml->bs, &remaining, &event);
   if (!event || GST_EVENT_TYPE (event) != GST_EVENT_DISCONTINUOUS) {
-    gst_element_error (ebml, CORE, SEEK, NULL,
+    GST_ELEMENT_ERROR (ebml, CORE, SEEK, NULL,
 		       ("No discontinuity event after seek"));
     if (event)
       gst_event_unref (event);
@@ -431,7 +431,7 @@ gst_ebml_read_uint (GstEbmlRead *ebml,
   data = GST_BUFFER_DATA (buf);
   size = GST_BUFFER_SIZE (buf);
   if (size < 1 || size > 8) {
-    gst_element_error (ebml, STREAM, DEMUX, NULL,
+    GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL,
 		       ("Invalid integer element size %d at position %llu (0x%llu)",
 		       size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf)));
     gst_buffer_unref (buf);
@@ -467,7 +467,7 @@ gst_ebml_read_sint (GstEbmlRead *ebml,
   data = GST_BUFFER_DATA (buf);
   size = GST_BUFFER_SIZE (buf);
   if (size < 1 || size > 8) {
-    gst_element_error (ebml, STREAM, DEMUX, NULL,
+    GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL,
 		       ("Invalid integer element size %d at position %llu (0x%llx)",
 		       size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf)));
     gst_buffer_unref (buf);
@@ -512,7 +512,7 @@ gst_ebml_read_float (GstEbmlRead *ebml,
   size = GST_BUFFER_SIZE (buf);
 
   if (size != 4 && size != 8 && size != 10) {
-    gst_element_error (ebml, STREAM, DEMUX, NULL,
+    GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL,
 		       ("Invalid float element size %d at position %llu (0x%llx)",
 		       size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf)));
     gst_buffer_unref (buf);
@@ -520,7 +520,7 @@ gst_ebml_read_float (GstEbmlRead *ebml,
   }
 
   if (size == 10) {
-    gst_element_error (ebml, CORE, NOT_IMPLEMENTED, NULL,
+    GST_ELEMENT_ERROR (ebml, CORE, NOT_IMPLEMENTED, NULL,
 		       ("FIXME! 10-byte floats unimplemented"));
     gst_buffer_unref (buf);
     return FALSE;
@@ -681,7 +681,7 @@ gst_ebml_read_header (GstEbmlRead *ebml,
   if (!(id = gst_ebml_peek_id (ebml, &level_up)))
     return FALSE;
   if (level_up != 0 || id != GST_EBML_ID_HEADER) {
-    gst_element_error (ebml, STREAM, WRONG_TYPE, NULL, NULL);
+    GST_ELEMENT_ERROR (ebml, STREAM, WRONG_TYPE, NULL, NULL);
     return FALSE;
   }
   if (!gst_ebml_read_master (ebml, &id))
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 2f819acc..c905d775 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -1130,7 +1130,7 @@ gst_matroska_demux_init_stream (GstMatroskaDemux *demux)
     return FALSE;
 
   if (!doctype || strcmp (doctype, "matroska") != 0) {
-    gst_element_error (demux, STREAM, WRONG_TYPE, NULL,
+    GST_ELEMENT_ERROR (demux, STREAM, WRONG_TYPE, NULL,
 		       ("Input is not a matroska stream (doctype=%s)",
 		       doctype ? doctype : "none"));
     g_free (doctype);
@@ -1138,7 +1138,7 @@ gst_matroska_demux_init_stream (GstMatroskaDemux *demux)
   }
   g_free (doctype);
   if (version > 1) {
-    gst_element_error (demux, STREAM, DEMUX, NULL,
+    GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL,
 		       ("Demuxer version (1) is too old to read stream version %d",
 		       version));
     return FALSE;
@@ -1634,7 +1634,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux *demux,
 
         /* first byte(s): blocknum */
         if ((n = gst_matroska_ebmlnum_uint (data, size, &num)) < 0) {
-          gst_element_error (demux, STREAM, DEMUX, NULL, ("Data error"));
+          GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL, ("Data error"));
           gst_buffer_unref (buf);
           res = FALSE;
           break;
@@ -1705,7 +1705,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux *demux,
               case 0x3: /* EBML lacing */ {
                 guint total;
                 if ((n = gst_matroska_ebmlnum_uint (data, size, &num)) < 0) {
-                  gst_element_error (demux, STREAM, DEMUX, NULL, ("Data error"));
+                  GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL, ("Data error"));
                   res = FALSE;
                   break;
                 }
@@ -1715,7 +1715,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux *demux,
                   gint64 snum;
                   gint r;
                   if ((r = gst_matroska_ebmlnum_sint (data, size, &snum)) < 0) {
-                    gst_element_error (demux, STREAM, DEMUX, NULL, ("Data error"));
+                    GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL, ("Data error"));
                     res = FALSE;
                     break;
                   }