win32: Update win32 build files

3 files changed, 509 insertions, 679 deletions

diff --git a/win32/common/config.h b/win32/common/config.h
index fa392ec79e..743f4d5899 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -3,6 +3,9 @@
 /* PREFIX -- specifically added for Windows for easier moving */
 #define PREFIX "C:\\gstreamer"
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
@@ -274,13 +277,13 @@
 #define PACKAGE_NAME "GStreamer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer 0.10.22.1"
+#define PACKAGE_STRING "GStreamer 0.10.22.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gstreamer"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.22.1"
+#define PACKAGE_VERSION "0.10.22.2"
 
 /* directory where plugins are located */
 #ifdef _DEBUG
@@ -299,11 +302,19 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "0.10.22.1"
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+#define VERSION "0.10.22.2"
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c
index 09ecb94b2e..d4e9de799b 100644
--- a/win32/common/gstenumtypes.c
+++ b/win32/common/gstenumtypes.c
@@ -8,53 +8,48 @@
 
 
 /* enumerations from "gstobject.h" */
-static void
-register_gst_object_flags (GType * id)
+GType
+gst_object_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_OBJECT_DISPOSING), "GST_OBJECT_DISPOSING", "disposing"},
     {C_FLAGS (GST_OBJECT_FLOATING), "GST_OBJECT_FLOATING", "floating"},
     {C_FLAGS (GST_OBJECT_FLAG_LAST), "GST_OBJECT_FLAG_LAST", "flag-last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstObjectFlags", values);
-}
 
-GType
-gst_object_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstObjectFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_object_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstbin.h" */
-static void
-register_gst_bin_flags (GType * id)
+GType
+gst_bin_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_BIN_FLAG_LAST), "GST_BIN_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstBinFlags", values);
-}
 
-GType
-gst_bin_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstBinFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_bin_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstbuffer.h" */
-static void
-register_gst_buffer_flag (GType * id)
+GType
+gst_buffer_flag_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_BUFFER_FLAG_READONLY), "GST_BUFFER_FLAG_READONLY",
         "readonly"},
@@ -70,22 +65,19 @@ register_gst_buffer_flag (GType * id)
     {C_FLAGS (GST_BUFFER_FLAG_LAST), "GST_BUFFER_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstBufferFlag", values);
-}
 
-GType
-gst_buffer_flag_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstBufferFlag", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_buffer_flag, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_buffer_copy_flags (GType * id)
+GType
+gst_buffer_copy_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_BUFFER_COPY_FLAGS), "GST_BUFFER_COPY_FLAGS", "flags"},
     {C_FLAGS (GST_BUFFER_COPY_TIMESTAMPS), "GST_BUFFER_COPY_TIMESTAMPS",
@@ -93,88 +85,76 @@ register_gst_buffer_copy_flags (GType * id)
     {C_FLAGS (GST_BUFFER_COPY_CAPS), "GST_BUFFER_COPY_CAPS", "caps"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstBufferCopyFlags", values);
-}
 
-GType
-gst_buffer_copy_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstBufferCopyFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_buffer_copy_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstbus.h" */
-static void
-register_gst_bus_flags (GType * id)
+GType
+gst_bus_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_BUS_FLUSHING), "GST_BUS_FLUSHING", "flushing"},
     {C_FLAGS (GST_BUS_FLAG_LAST), "GST_BUS_FLAG_LAST", "flag-last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstBusFlags", values);
-}
 
-GType
-gst_bus_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstBusFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_bus_flags, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_bus_sync_reply (GType * id)
+GType
+gst_bus_sync_reply_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_BUS_DROP), "GST_BUS_DROP", "drop"},
     {C_ENUM (GST_BUS_PASS), "GST_BUS_PASS", "pass"},
     {C_ENUM (GST_BUS_ASYNC), "GST_BUS_ASYNC", "async"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstBusSyncReply", values);
-}
 
-GType
-gst_bus_sync_reply_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstBusSyncReply", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_bus_sync_reply, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstcaps.h" */
-static void
-register_gst_caps_flags (GType * id)
+GType
+gst_caps_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_CAPS_FLAGS_ANY), "GST_CAPS_FLAGS_ANY", "any"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstCapsFlags", values);
-}
 
-GType
-gst_caps_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstCapsFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_caps_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstclock.h" */
-static void
-register_gst_clock_return (GType * id)
+GType
+gst_clock_return_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_CLOCK_OK), "GST_CLOCK_OK", "ok"},
     {C_ENUM (GST_CLOCK_EARLY), "GST_CLOCK_EARLY", "early"},
@@ -185,43 +165,37 @@ register_gst_clock_return (GType * id)
     {C_ENUM (GST_CLOCK_UNSUPPORTED), "GST_CLOCK_UNSUPPORTED", "unsupported"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstClockReturn", values);
-}
 
-GType
-gst_clock_return_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstClockReturn", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_clock_return, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_clock_entry_type (GType * id)
+GType
+gst_clock_entry_type_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_CLOCK_ENTRY_SINGLE), "GST_CLOCK_ENTRY_SINGLE", "single"},
     {C_ENUM (GST_CLOCK_ENTRY_PERIODIC), "GST_CLOCK_ENTRY_PERIODIC", "periodic"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstClockEntryType", values);
-}
 
-GType
-gst_clock_entry_type_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstClockEntryType", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_clock_entry_type, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_clock_flags (GType * id)
+GType
+gst_clock_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC),
         "GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC", "can-do-single-sync"},
@@ -238,23 +212,20 @@ register_gst_clock_flags (GType * id)
     {C_FLAGS (GST_CLOCK_FLAG_LAST), "GST_CLOCK_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstClockFlags", values);
-}
 
-GType
-gst_clock_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstClockFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_clock_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstdebugutils.h" */
-static void
-register_gst_debug_graph_details (GType * id)
+GType
+gst_debug_graph_details_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE),
         "GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE", "media-type"},
@@ -267,23 +238,20 @@ register_gst_debug_graph_details (GType * id)
     {C_FLAGS (GST_DEBUG_GRAPH_SHOW_ALL), "GST_DEBUG_GRAPH_SHOW_ALL", "all"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstDebugGraphDetails", values);
-}
 
-GType
-gst_debug_graph_details_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstDebugGraphDetails", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_debug_graph_details, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstelement.h" */
-static void
-register_gst_state (GType * id)
+GType
+gst_state_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_STATE_VOID_PENDING), "GST_STATE_VOID_PENDING", "void-pending"},
     {C_ENUM (GST_STATE_NULL), "GST_STATE_NULL", "null"},
@@ -292,22 +260,19 @@ register_gst_state (GType * id)
     {C_ENUM (GST_STATE_PLAYING), "GST_STATE_PLAYING", "playing"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstState", values);
-}
 
-GType
-gst_state_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstState", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_state, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_state_change_return (GType * id)
+GType
+gst_state_change_return_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_STATE_CHANGE_FAILURE), "GST_STATE_CHANGE_FAILURE", "failure"},
     {C_ENUM (GST_STATE_CHANGE_SUCCESS), "GST_STATE_CHANGE_SUCCESS", "success"},
@@ -316,22 +281,19 @@ register_gst_state_change_return (GType * id)
         "no-preroll"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstStateChangeReturn", values);
-}
 
-GType
-gst_state_change_return_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstStateChangeReturn", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_state_change_return, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_state_change (GType * id)
+GType
+gst_state_change_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_STATE_CHANGE_NULL_TO_READY), "GST_STATE_CHANGE_NULL_TO_READY",
         "null-to-ready"},
@@ -347,22 +309,19 @@ register_gst_state_change (GType * id)
         "ready-to-null"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstStateChange", values);
-}
 
-GType
-gst_state_change_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstStateChange", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_state_change, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_element_flags (GType * id)
+GType
+gst_element_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_ELEMENT_LOCKED_STATE), "GST_ELEMENT_LOCKED_STATE",
         "locked-state"},
@@ -372,23 +331,20 @@ register_gst_element_flags (GType * id)
     {C_FLAGS (GST_ELEMENT_FLAG_LAST), "GST_ELEMENT_FLAG_LAST", "flag-last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstElementFlags", values);
-}
 
-GType
-gst_element_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstElementFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_element_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gsterror.h" */
-static void
-register_gst_core_error (GType * id)
+GType
+gst_core_error_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_CORE_ERROR_FAILED), "GST_CORE_ERROR_FAILED", "failed"},
     {C_ENUM (GST_CORE_ERROR_TOO_LAZY), "GST_CORE_ERROR_TOO_LAZY", "too-lazy"},
@@ -412,22 +368,19 @@ register_gst_core_error (GType * id)
         "num-errors"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstCoreError", values);
-}
 
-GType
-gst_core_error_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstCoreError", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_core_error, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_library_error (GType * id)
+GType
+gst_library_error_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_LIBRARY_ERROR_FAILED), "GST_LIBRARY_ERROR_FAILED", "failed"},
     {C_ENUM (GST_LIBRARY_ERROR_TOO_LAZY), "GST_LIBRARY_ERROR_TOO_LAZY",
@@ -442,22 +395,19 @@ register_gst_library_error (GType * id)
         "num-errors"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstLibraryError", values);
-}
 
-GType
-gst_library_error_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstLibraryError", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_library_error, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_resource_error (GType * id)
+GType
+gst_resource_error_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_RESOURCE_ERROR_FAILED), "GST_RESOURCE_ERROR_FAILED", "failed"},
     {C_ENUM (GST_RESOURCE_ERROR_TOO_LAZY), "GST_RESOURCE_ERROR_TOO_LAZY",
@@ -484,22 +434,19 @@ register_gst_resource_error (GType * id)
         "num-errors"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstResourceError", values);
-}
 
-GType
-gst_resource_error_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstResourceError", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_resource_error, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_stream_error (GType * id)
+GType
+gst_stream_error_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_STREAM_ERROR_FAILED), "GST_STREAM_ERROR_FAILED", "failed"},
     {C_ENUM (GST_STREAM_ERROR_TOO_LAZY), "GST_STREAM_ERROR_TOO_LAZY",
@@ -524,23 +471,20 @@ register_gst_stream_error (GType * id)
         "num-errors"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstStreamError", values);
-}
 
-GType
-gst_stream_error_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstStreamError", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_stream_error, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstevent.h" */
-static void
-register_gst_event_type_flags (GType * id)
+GType
+gst_event_type_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_EVENT_TYPE_UPSTREAM), "GST_EVENT_TYPE_UPSTREAM", "upstream"},
     {C_FLAGS (GST_EVENT_TYPE_DOWNSTREAM), "GST_EVENT_TYPE_DOWNSTREAM",
@@ -549,22 +493,19 @@ register_gst_event_type_flags (GType * id)
         "serialized"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstEventTypeFlags", values);
-}
 
-GType
-gst_event_type_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstEventTypeFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_event_type_flags, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_event_type (GType * id)
+GType
+gst_event_type_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_EVENT_UNKNOWN), "GST_EVENT_UNKNOWN", "unknown"},
     {C_ENUM (GST_EVENT_FLUSH_START), "GST_EVENT_FLUSH_START", "flush-start"},
@@ -588,22 +529,19 @@ register_gst_event_type (GType * id)
         "custom-both-oob"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstEventType", values);
-}
 
-GType
-gst_event_type_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstEventType", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_event_type, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_seek_type (GType * id)
+GType
+gst_seek_type_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_SEEK_TYPE_NONE), "GST_SEEK_TYPE_NONE", "none"},
     {C_ENUM (GST_SEEK_TYPE_CUR), "GST_SEEK_TYPE_CUR", "cur"},
@@ -611,22 +549,19 @@ register_gst_seek_type (GType * id)
     {C_ENUM (GST_SEEK_TYPE_END), "GST_SEEK_TYPE_END", "end"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstSeekType", values);
-}
 
-GType
-gst_seek_type_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstSeekType", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_seek_type, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_seek_flags (GType * id)
+GType
+gst_seek_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_SEEK_FLAG_NONE), "GST_SEEK_FLAG_NONE", "none"},
     {C_FLAGS (GST_SEEK_FLAG_FLUSH), "GST_SEEK_FLAG_FLUSH", "flush"},
@@ -636,23 +571,20 @@ register_gst_seek_flags (GType * id)
     {C_FLAGS (GST_SEEK_FLAG_SKIP), "GST_SEEK_FLAG_SKIP", "skip"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstSeekFlags", values);
-}
 
-GType
-gst_seek_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstSeekFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_seek_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstformat.h" */
-static void
-register_gst_format (GType * id)
+GType
+gst_format_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_FORMAT_UNDEFINED), "GST_FORMAT_UNDEFINED", "undefined"},
     {C_ENUM (GST_FORMAT_DEFAULT), "GST_FORMAT_DEFAULT", "default"},
@@ -662,45 +594,39 @@ register_gst_format (GType * id)
     {C_ENUM (GST_FORMAT_PERCENT), "GST_FORMAT_PERCENT", "percent"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstFormat", values);
-}
 
-GType
-gst_format_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstFormat", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_format, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstindex.h" */
-static void
-register_gst_index_certainty (GType * id)
+GType
+gst_index_certainty_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_INDEX_UNKNOWN), "GST_INDEX_UNKNOWN", "unknown"},
     {C_ENUM (GST_INDEX_CERTAIN), "GST_INDEX_CERTAIN", "certain"},
     {C_ENUM (GST_INDEX_FUZZY), "GST_INDEX_FUZZY", "fuzzy"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstIndexCertainty", values);
-}
 
-GType
-gst_index_certainty_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstIndexCertainty", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_index_certainty, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_index_entry_type (GType * id)
+GType
+gst_index_entry_type_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_INDEX_ENTRY_ID), "GST_INDEX_ENTRY_ID", "id"},
     {C_ENUM (GST_INDEX_ENTRY_ASSOCIATION), "GST_INDEX_ENTRY_ASSOCIATION",
@@ -709,44 +635,38 @@ register_gst_index_entry_type (GType * id)
     {C_ENUM (GST_INDEX_ENTRY_FORMAT), "GST_INDEX_ENTRY_FORMAT", "format"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstIndexEntryType", values);
-}
 
-GType
-gst_index_entry_type_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstIndexEntryType", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_index_entry_type, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_index_lookup_method (GType * id)
+GType
+gst_index_lookup_method_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_INDEX_LOOKUP_EXACT), "GST_INDEX_LOOKUP_EXACT", "exact"},
     {C_ENUM (GST_INDEX_LOOKUP_BEFORE), "GST_INDEX_LOOKUP_BEFORE", "before"},
     {C_ENUM (GST_INDEX_LOOKUP_AFTER), "GST_INDEX_LOOKUP_AFTER", "after"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstIndexLookupMethod", values);
-}
 
-GType
-gst_index_lookup_method_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstIndexLookupMethod", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_index_lookup_method, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_assoc_flags (GType * id)
+GType
+gst_assoc_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_ASSOCIATION_FLAG_NONE), "GST_ASSOCIATION_FLAG_NONE", "none"},
     {C_FLAGS (GST_ASSOCIATION_FLAG_KEY_UNIT), "GST_ASSOCIATION_FLAG_KEY_UNIT",
@@ -756,67 +676,58 @@ register_gst_assoc_flags (GType * id)
     {C_FLAGS (GST_ASSOCIATION_FLAG_LAST), "GST_ASSOCIATION_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstAssocFlags", values);
-}
 
-GType
-gst_assoc_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstAssocFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_assoc_flags, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_index_resolver_method (GType * id)
+GType
+gst_index_resolver_method_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_INDEX_RESOLVER_CUSTOM), "GST_INDEX_RESOLVER_CUSTOM", "custom"},
     {C_ENUM (GST_INDEX_RESOLVER_GTYPE), "GST_INDEX_RESOLVER_GTYPE", "gtype"},
     {C_ENUM (GST_INDEX_RESOLVER_PATH), "GST_INDEX_RESOLVER_PATH", "path"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstIndexResolverMethod", values);
-}
 
-GType
-gst_index_resolver_method_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstIndexResolverMethod", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_index_resolver_method, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_index_flags (GType * id)
+GType
+gst_index_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_INDEX_WRITABLE), "GST_INDEX_WRITABLE", "writable"},
     {C_FLAGS (GST_INDEX_READABLE), "GST_INDEX_READABLE", "readable"},
     {C_FLAGS (GST_INDEX_FLAG_LAST), "GST_INDEX_FLAG_LAST", "flag-last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstIndexFlags", values);
-}
 
-GType
-gst_index_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstIndexFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_index_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstinfo.h" */
-static void
-register_gst_debug_level (GType * id)
+GType
+gst_debug_level_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_LEVEL_NONE), "GST_LEVEL_NONE", "none"},
     {C_ENUM (GST_LEVEL_ERROR), "GST_LEVEL_ERROR", "error"},
@@ -824,25 +735,24 @@ register_gst_debug_level (GType * id)
     {C_ENUM (GST_LEVEL_INFO), "GST_LEVEL_INFO", "info"},
     {C_ENUM (GST_LEVEL_DEBUG), "GST_LEVEL_DEBUG", "debug"},
     {C_ENUM (GST_LEVEL_LOG), "GST_LEVEL_LOG", "log"},
+    {C_ENUM (GST_LEVEL_FIXME), "GST_LEVEL_FIXME", "fixme"},
+    {C_ENUM (GST_LEVEL_MEMDUMP), "GST_LEVEL_MEMDUMP", "memdump"},
     {C_ENUM (GST_LEVEL_COUNT), "GST_LEVEL_COUNT", "count"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstDebugLevel", values);
-}
 
-GType
-gst_debug_level_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstDebugLevel", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_debug_level, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_debug_color_flags (GType * id)
+GType
+gst_debug_color_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_DEBUG_FG_BLACK), "GST_DEBUG_FG_BLACK", "fg-black"},
     {C_ENUM (GST_DEBUG_FG_RED), "GST_DEBUG_FG_RED", "fg-red"},
@@ -864,23 +774,20 @@ register_gst_debug_color_flags (GType * id)
     {C_ENUM (GST_DEBUG_UNDERLINE), "GST_DEBUG_UNDERLINE", "underline"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstDebugColorFlags", values);
-}
 
-GType
-gst_debug_color_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstDebugColorFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_debug_color_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstiterator.h" */
-static void
-register_gst_iterator_result (GType * id)
+GType
+gst_iterator_result_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_ITERATOR_DONE), "GST_ITERATOR_DONE", "done"},
     {C_ENUM (GST_ITERATOR_OK), "GST_ITERATOR_OK", "ok"},
@@ -888,45 +795,39 @@ register_gst_iterator_result (GType * id)
     {C_ENUM (GST_ITERATOR_ERROR), "GST_ITERATOR_ERROR", "error"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstIteratorResult", values);
-}
 
-GType
-gst_iterator_result_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstIteratorResult", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_iterator_result, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_iterator_item (GType * id)
+GType
+gst_iterator_item_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_ITERATOR_ITEM_SKIP), "GST_ITERATOR_ITEM_SKIP", "skip"},
     {C_ENUM (GST_ITERATOR_ITEM_PASS), "GST_ITERATOR_ITEM_PASS", "pass"},
     {C_ENUM (GST_ITERATOR_ITEM_END), "GST_ITERATOR_ITEM_END", "end"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstIteratorItem", values);
-}
 
-GType
-gst_iterator_item_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstIteratorItem", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_iterator_item, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstmessage.h" */
-static void
-register_gst_message_type (GType * id)
+GType
+gst_message_type_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_MESSAGE_UNKNOWN), "GST_MESSAGE_UNKNOWN", "unknown"},
     {C_FLAGS (GST_MESSAGE_EOS), "GST_MESSAGE_EOS", "eos"},
@@ -965,22 +866,19 @@ register_gst_message_type (GType * id)
     {C_FLAGS (GST_MESSAGE_ANY), "GST_MESSAGE_ANY", "any"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstMessageType", values);
-}
 
-GType
-gst_message_type_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstMessageType", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_message_type, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_structure_change_type (GType * id)
+GType
+gst_structure_change_type_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_STRUCTURE_CHANGE_TYPE_PAD_LINK),
         "GST_STRUCTURE_CHANGE_TYPE_PAD_LINK", "link"},
@@ -988,46 +886,40 @@ register_gst_structure_change_type (GType * id)
         "GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK", "unlink"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstStructureChangeType", values);
-}
 
-GType
-gst_structure_change_type_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstStructureChangeType", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_structure_change_type, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstminiobject.h" */
-static void
-register_gst_mini_object_flags (GType * id)
+GType
+gst_mini_object_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_MINI_OBJECT_FLAG_READONLY), "GST_MINI_OBJECT_FLAG_READONLY",
         "readonly"},
     {C_FLAGS (GST_MINI_OBJECT_FLAG_LAST), "GST_MINI_OBJECT_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstMiniObjectFlags", values);
-}
 
-GType
-gst_mini_object_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstMiniObjectFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_mini_object_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstpad.h" */
-static void
-register_gst_pad_link_return (GType * id)
+GType
+gst_pad_link_return_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_PAD_LINK_OK), "GST_PAD_LINK_OK", "ok"},
     {C_ENUM (GST_PAD_LINK_WRONG_HIERARCHY), "GST_PAD_LINK_WRONG_HIERARCHY",
@@ -1040,22 +932,19 @@ register_gst_pad_link_return (GType * id)
     {C_ENUM (GST_PAD_LINK_REFUSED), "GST_PAD_LINK_REFUSED", "refused"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstPadLinkReturn", values);
-}
 
-GType
-gst_pad_link_return_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstPadLinkReturn", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_pad_link_return, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_flow_return (GType * id)
+GType
+gst_flow_return_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_FLOW_CUSTOM_SUCCESS), "GST_FLOW_CUSTOM_SUCCESS",
         "custom-success"},
@@ -1072,66 +961,57 @@ register_gst_flow_return (GType * id)
     {C_ENUM (GST_FLOW_CUSTOM_ERROR), "GST_FLOW_CUSTOM_ERROR", "custom-error"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstFlowReturn", values);
-}
 
-GType
-gst_flow_return_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstFlowReturn", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_flow_return, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_activate_mode (GType * id)
+GType
+gst_activate_mode_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_ACTIVATE_NONE), "GST_ACTIVATE_NONE", "none"},
     {C_ENUM (GST_ACTIVATE_PUSH), "GST_ACTIVATE_PUSH", "push"},
     {C_ENUM (GST_ACTIVATE_PULL), "GST_ACTIVATE_PULL", "pull"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstActivateMode", values);
-}
 
-GType
-gst_activate_mode_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstActivateMode", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_activate_mode, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_pad_direction (GType * id)
+GType
+gst_pad_direction_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_PAD_UNKNOWN), "GST_PAD_UNKNOWN", "unknown"},
     {C_ENUM (GST_PAD_SRC), "GST_PAD_SRC", "src"},
     {C_ENUM (GST_PAD_SINK), "GST_PAD_SINK", "sink"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstPadDirection", values);
-}
 
-GType
-gst_pad_direction_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstPadDirection", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_pad_direction, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_pad_flags (GType * id)
+GType
+gst_pad_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_PAD_BLOCKED), "GST_PAD_BLOCKED", "blocked"},
     {C_FLAGS (GST_PAD_FLUSHING), "GST_PAD_FLUSHING", "flushing"},
@@ -1141,91 +1021,79 @@ register_gst_pad_flags (GType * id)
     {C_FLAGS (GST_PAD_FLAG_LAST), "GST_PAD_FLAG_LAST", "flag-last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstPadFlags", values);
-}
 
-GType
-gst_pad_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstPadFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_pad_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstpadtemplate.h" */
-static void
-register_gst_pad_presence (GType * id)
+GType
+gst_pad_presence_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_PAD_ALWAYS), "GST_PAD_ALWAYS", "always"},
     {C_ENUM (GST_PAD_SOMETIMES), "GST_PAD_SOMETIMES", "sometimes"},
     {C_ENUM (GST_PAD_REQUEST), "GST_PAD_REQUEST", "request"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstPadPresence", values);
-}
 
-GType
-gst_pad_presence_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstPadPresence", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_pad_presence, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_pad_template_flags (GType * id)
+GType
+gst_pad_template_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_PAD_TEMPLATE_FIXED), "GST_PAD_TEMPLATE_FIXED", "fixed"},
     {C_FLAGS (GST_PAD_TEMPLATE_FLAG_LAST), "GST_PAD_TEMPLATE_FLAG_LAST",
         "flag-last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstPadTemplateFlags", values);
-}
 
-GType
-gst_pad_template_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstPadTemplateFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_pad_template_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstpipeline.h" */
-static void
-register_gst_pipeline_flags (GType * id)
+GType
+gst_pipeline_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_PIPELINE_FLAG_FIXED_CLOCK), "GST_PIPELINE_FLAG_FIXED_CLOCK",
         "fixed-clock"},
     {C_FLAGS (GST_PIPELINE_FLAG_LAST), "GST_PIPELINE_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstPipelineFlags", values);
-}
 
-GType
-gst_pipeline_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstPipelineFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_pipeline_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstplugin.h" */
-static void
-register_gst_plugin_error (GType * id)
+GType
+gst_plugin_error_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_PLUGIN_ERROR_MODULE), "GST_PLUGIN_ERROR_MODULE", "module"},
     {C_ENUM (GST_PLUGIN_ERROR_DEPENDENCIES), "GST_PLUGIN_ERROR_DEPENDENCIES",
@@ -1234,42 +1102,36 @@ register_gst_plugin_error (GType * id)
         "name-mismatch"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstPluginError", values);
-}
 
-GType
-gst_plugin_error_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstPluginError", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_plugin_error, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_plugin_flags (GType * id)
+GType
+gst_plugin_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_PLUGIN_FLAG_CACHED), "GST_PLUGIN_FLAG_CACHED", "cached"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstPluginFlags", values);
-}
 
-GType
-gst_plugin_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstPluginFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_plugin_flags, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_plugin_dependency_flags (GType * id)
+GType
+gst_plugin_dependency_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_PLUGIN_DEPENDENCY_FLAG_NONE),
         "GST_PLUGIN_DEPENDENCY_FLAG_NONE", "none"},
@@ -1283,23 +1145,20 @@ register_gst_plugin_dependency_flags (GType * id)
         "file-name-is-suffix"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstPluginDependencyFlags", values);
-}
 
-GType
-gst_plugin_dependency_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstPluginDependencyFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_plugin_dependency_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstpluginfeature.h" */
-static void
-register_gst_rank (GType * id)
+GType
+gst_rank_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_RANK_NONE), "GST_RANK_NONE", "none"},
     {C_ENUM (GST_RANK_MARGINAL), "GST_RANK_MARGINAL", "marginal"},
@@ -1307,23 +1166,20 @@ register_gst_rank (GType * id)
     {C_ENUM (GST_RANK_PRIMARY), "GST_RANK_PRIMARY", "primary"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstRank", values);
-}
 
-GType
-gst_rank_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstRank", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_rank, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstquery.h" */
-static void
-register_gst_query_type (GType * id)
+GType
+gst_query_type_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_QUERY_NONE), "GST_QUERY_NONE", "none"},
     {C_ENUM (GST_QUERY_POSITION), "GST_QUERY_POSITION", "position"},
@@ -1340,22 +1196,19 @@ register_gst_query_type (GType * id)
     {C_ENUM (GST_QUERY_URI), "GST_QUERY_URI", "uri"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstQueryType", values);
-}
 
-GType
-gst_query_type_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstQueryType", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_query_type, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_buffering_mode (GType * id)
+GType
+gst_buffering_mode_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_BUFFERING_STREAM), "GST_BUFFERING_STREAM", "stream"},
     {C_ENUM (GST_BUFFERING_DOWNLOAD), "GST_BUFFERING_DOWNLOAD", "download"},
@@ -1363,46 +1216,40 @@ register_gst_buffering_mode (GType * id)
     {C_ENUM (GST_BUFFERING_LIVE), "GST_BUFFERING_LIVE", "live"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstBufferingMode", values);
-}
 
-GType
-gst_buffering_mode_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstBufferingMode", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_buffering_mode, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstsystemclock.h" */
-static void
-register_gst_clock_type (GType * id)
+GType
+gst_clock_type_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_CLOCK_TYPE_REALTIME), "GST_CLOCK_TYPE_REALTIME", "realtime"},
     {C_ENUM (GST_CLOCK_TYPE_MONOTONIC), "GST_CLOCK_TYPE_MONOTONIC",
         "monotonic"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstClockType", values);
-}
 
-GType
-gst_clock_type_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstClockType", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_clock_type, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gsttaglist.h" */
-static void
-register_gst_tag_merge_mode (GType * id)
+GType
+gst_tag_merge_mode_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_TAG_MERGE_UNDEFINED), "GST_TAG_MERGE_UNDEFINED", "undefined"},
     {C_ENUM (GST_TAG_MERGE_REPLACE_ALL), "GST_TAG_MERGE_REPLACE_ALL",
@@ -1415,22 +1262,19 @@ register_gst_tag_merge_mode (GType * id)
     {C_ENUM (GST_TAG_MERGE_COUNT), "GST_TAG_MERGE_COUNT", "count"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstTagMergeMode", values);
-}
 
-GType
-gst_tag_merge_mode_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstTagMergeMode", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_tag_merge_mode, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_tag_flag (GType * id)
+GType
+gst_tag_flag_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_TAG_FLAG_UNDEFINED), "GST_TAG_FLAG_UNDEFINED", "undefined"},
     {C_ENUM (GST_TAG_FLAG_META), "GST_TAG_FLAG_META", "meta"},
@@ -1439,69 +1283,60 @@ register_gst_tag_flag (GType * id)
     {C_ENUM (GST_TAG_FLAG_COUNT), "GST_TAG_FLAG_COUNT", "count"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstTagFlag", values);
-}
 
-GType
-gst_tag_flag_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstTagFlag", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_tag_flag, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gsttask.h" */
-static void
-register_gst_task_state (GType * id)
+GType
+gst_task_state_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_TASK_STARTED), "GST_TASK_STARTED", "started"},
     {C_ENUM (GST_TASK_STOPPED), "GST_TASK_STOPPED", "stopped"},
     {C_ENUM (GST_TASK_PAUSED), "GST_TASK_PAUSED", "paused"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstTaskState", values);
-}
 
-GType
-gst_task_state_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstTaskState", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_task_state, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gsttrace.h" */
-static void
-register_gst_alloc_trace_flags (GType * id)
+GType
+gst_alloc_trace_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_ALLOC_TRACE_LIVE), "GST_ALLOC_TRACE_LIVE", "live"},
     {C_FLAGS (GST_ALLOC_TRACE_MEM_LIVE), "GST_ALLOC_TRACE_MEM_LIVE",
         "mem-live"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstAllocTraceFlags", values);
-}
 
-GType
-gst_alloc_trace_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstAllocTraceFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_alloc_trace_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gsttypefind.h" */
-static void
-register_gst_type_find_probability (GType * id)
+GType
+gst_type_find_probability_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_TYPE_FIND_MINIMUM), "GST_TYPE_FIND_MINIMUM", "minimum"},
     {C_ENUM (GST_TYPE_FIND_POSSIBLE), "GST_TYPE_FIND_POSSIBLE", "possible"},
@@ -1511,69 +1346,60 @@ register_gst_type_find_probability (GType * id)
     {C_ENUM (GST_TYPE_FIND_MAXIMUM), "GST_TYPE_FIND_MAXIMUM", "maximum"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstTypeFindProbability", values);
-}
 
-GType
-gst_type_find_probability_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstTypeFindProbability", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_type_find_probability, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gsturi.h" */
-static void
-register_gst_uri_type (GType * id)
+GType
+gst_uri_type_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_URI_UNKNOWN), "GST_URI_UNKNOWN", "unknown"},
     {C_ENUM (GST_URI_SINK), "GST_URI_SINK", "sink"},
     {C_ENUM (GST_URI_SRC), "GST_URI_SRC", "src"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstURIType", values);
-}
 
-GType
-gst_uri_type_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstURIType", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_uri_type, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstutils.h" */
-static void
-register_gst_search_mode (GType * id)
+GType
+gst_search_mode_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_SEARCH_MODE_EXACT), "GST_SEARCH_MODE_EXACT", "exact"},
     {C_ENUM (GST_SEARCH_MODE_BEFORE), "GST_SEARCH_MODE_BEFORE", "before"},
     {C_ENUM (GST_SEARCH_MODE_AFTER), "GST_SEARCH_MODE_AFTER", "after"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstSearchMode", values);
-}
 
-GType
-gst_search_mode_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstSearchMode", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_search_mode, &id);
-  return id;
+  return (GType) id;
 }
 
 /* enumerations from "gstparse.h" */
-static void
-register_gst_parse_error (GType * id)
+GType
+gst_parse_error_get_type (void)
 {
+  static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_PARSE_ERROR_SYNTAX), "GST_PARSE_ERROR_SYNTAX", "syntax"},
     {C_ENUM (GST_PARSE_ERROR_NO_SUCH_ELEMENT),
@@ -1588,39 +1414,32 @@ register_gst_parse_error (GType * id)
     {C_ENUM (GST_PARSE_ERROR_EMPTY), "GST_PARSE_ERROR_EMPTY", "empty"},
     {0, NULL, NULL}
   };
-  *id = g_enum_register_static ("GstParseError", values);
-}
 
-GType
-gst_parse_error_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstParseError", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_parse_error, &id);
-  return id;
+  return (GType) id;
 }
 
-static void
-register_gst_parse_flags (GType * id)
+GType
+gst_parse_flags_get_type (void)
 {
+  static gsize id = 0;
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_PARSE_FLAG_NONE), "GST_PARSE_FLAG_NONE", "none"},
     {C_FLAGS (GST_PARSE_FLAG_FATAL_ERRORS), "GST_PARSE_FLAG_FATAL_ERRORS",
         "fatal-errors"},
     {0, NULL, NULL}
   };
-  *id = g_flags_register_static ("GstParseFlags", values);
-}
 
-GType
-gst_parse_flags_get_type (void)
-{
-  static GType id;
-  static GOnce once = G_ONCE_INIT;
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstParseFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
 
-  g_once (&once, (GThreadFunc) register_gst_parse_flags, &id);
-  return id;
+  return (GType) id;
 }
 
 /* Generated data ends here */
diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h
index f557794d99..bda42c69b5 100644
--- a/win32/common/gstversion.h
+++ b/win32/common/gstversion.h
@@ -64,7 +64,7 @@ G_BEGIN_DECLS
  * The nano version of GStreamer at compile time:
  * Actual releases have 0, GIT versions have 1, prerelease versions have 2-...
  */
-#define GST_VERSION_NANO (1)
+#define GST_VERSION_NANO (2)
 
 /**
  * GST_CHECK_VERSION: