From c88a143cb6c6ecd27e13590b64df76ada8c70fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 12 Mar 2011 15:34:33 +0000 Subject: [PATCH] baseparse: fix up GType name and make _get_type() function thread-safe Rename GType from GstBaseParseBad to GstBaseParse. --- libs/gst/base/gstbaseparse.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c index e465529dbd..c11eefcc24 100644 --- a/libs/gst/base/gstbaseparse.c +++ b/libs/gst/base/gstbaseparse.c @@ -313,9 +313,9 @@ static void gst_base_parse_init (GstBaseParse * parse, GType gst_base_parse_get_type (void) { - static GType base_parse_type = 0; + static volatile gsize base_parse_type = 0; - if (!base_parse_type) { + if (g_once_init_enter (&base_parse_type)) { static const GTypeInfo base_parse_info = { sizeof (GstBaseParseClass), (GBaseInitFunc) NULL, @@ -327,11 +327,13 @@ gst_base_parse_get_type (void) 0, (GInstanceInitFunc) gst_base_parse_init, }; + GType _type; - base_parse_type = g_type_register_static (GST_TYPE_ELEMENT, - "GstBaseParseBad", &base_parse_info, G_TYPE_FLAG_ABSTRACT); + _type = g_type_register_static (GST_TYPE_ELEMENT, + "GstBaseParse", &base_parse_info, G_TYPE_FLAG_ABSTRACT); + g_once_init_leave (&base_parse_type, _type); } - return base_parse_type; + return (GType) base_parse_type; } static void gst_base_parse_finalize (GObject * object);