From 0fc84c14713912b549f7a1da0896404e4cd310ab Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Fri, 30 Jan 2004 07:58:54 +0000 Subject: [PATCH] seriously, using cvs over slow lines just sucks. Original commit message from CVS: seriously, using cvs over slow lines just sucks. *sigh*, finishing commit --- gst/gstelement.c | 6 +++--- gst/gstelement.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/gstelement.c b/gst/gstelement.c index 11cb6b5df5..0788407a60 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -2423,7 +2423,7 @@ gst_element_error_full error = g_error_new (domain, code, sent_message); /* if the element was already in error, stop now */ - if (GST_FLAG_IS_SET (element, GST_ELEMENT_ERROR)) { + if (GST_FLAG_IS_SET (element, GST_ELEMENT_IN_ERROR)) { GST_CAT_INFO (GST_CAT_ERROR_SYSTEM, "recursive ERROR detected in %s", GST_ELEMENT_NAME (element)); g_free (sent_message); @@ -2431,7 +2431,7 @@ gst_element_error_full return; } - GST_FLAG_SET (element, GST_ELEMENT_ERROR); + GST_FLAG_SET (element, GST_ELEMENT_IN_ERROR); /* emit the signal, make sure the element stays available */ gst_object_ref (GST_OBJECT (element)); @@ -2463,7 +2463,7 @@ gst_element_error_full } } - GST_FLAG_UNSET (element, GST_ELEMENT_ERROR); + GST_FLAG_UNSET (element, GST_ELEMENT_IN_ERROR); /* cleanup */ gst_object_unref (GST_OBJECT (element)); diff --git a/gst/gstelement.h b/gst/gstelement.h index 1ef7223c33..a643730b44 100644 --- a/gst/gstelement.h +++ b/gst/gstelement.h @@ -122,7 +122,7 @@ typedef enum { GST_ELEMENT_LOCKED_STATE, /* element is in error */ - GST_ELEMENT_ERROR, + GST_ELEMENT_IN_ERROR, /* use some padding for future expansion */ GST_ELEMENT_FLAG_LAST = GST_OBJECT_FLAG_LAST + 16 -- 2.34.1