mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 07:08:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

seriously, using cvs over slow lines just sucks.

Browse source 
Original commit message from CVS:
seriously, using cvs over slow lines just sucks.
*sigh*, finishing commit
This commit is contained in:
Thomas Vander Stichele 2004-01-30 07:58:54 +00:00
parent 140c4dd060
commit 0fc84c1471
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/gstelement.c
View file

@ -2423,7 +2423,7 @@ gst_element_error_full
error = g_error_new (domain, code, sent_message); error = g_error_new (domain, code, sent_message);
/* if the element was already in error, stop now */ /* 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_CAT_INFO (GST_CAT_ERROR_SYSTEM, "recursive ERROR detected in %s",
GST_ELEMENT_NAME (element)); GST_ELEMENT_NAME (element));
g_free (sent_message); g_free (sent_message);
@ -2431,7 +2431,7 @@ gst_element_error_full
return; 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 */ /* emit the signal, make sure the element stays available */
gst_object_ref (GST_OBJECT (element)); 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 */ /* cleanup */
gst_object_unref (GST_OBJECT (element)); gst_object_unref (GST_OBJECT (element));

2
gst/gstelement.h
View file

@ -122,7 +122,7 @@ typedef enum {
GST_ELEMENT_LOCKED_STATE, GST_ELEMENT_LOCKED_STATE,
/* element is in error */ /* element is in error */
GST_ELEMENT_ERROR, GST_ELEMENT_IN_ERROR,
/* use some padding for future expansion */ /* use some padding for future expansion */
GST_ELEMENT_FLAG_LAST = GST_OBJECT_FLAG_LAST + 16 GST_ELEMENT_FLAG_LAST = GST_OBJECT_FLAG_LAST + 16