From 44d73efc499ae9af78f664c707732936344e45c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 10 Jun 2020 11:23:42 +0300 Subject: [PATCH] aggregator: Fix StartTimeSelection enum type registration Make it thread-safe and use the actual C identifiers for the "name" field, as otherwise gobject-introspection will fall apart. Part-of: --- libs/gst/base/gstaggregator.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c index c41e463..640dc02 100644 --- a/libs/gst/base/gstaggregator.c +++ b/libs/gst/base/gstaggregator.c @@ -96,18 +96,20 @@ gst_aggregator_start_time_selection_get_type (void) { static GType gtype = 0; - if (gtype == 0) { + if (g_once_init_enter (>ype)) { static const GEnumValue values[] = { {GST_AGGREGATOR_START_TIME_SELECTION_ZERO, - "Start at 0 running time (default)", "zero"}, + "GST_AGGREGATOR_START_TIME_SELECTION_ZERO", "zero"}, {GST_AGGREGATOR_START_TIME_SELECTION_FIRST, - "Start at first observed input running time", "first"}, + "GST_AGGREGATOR_START_TIME_SELECTION_FIRST", "first"}, {GST_AGGREGATOR_START_TIME_SELECTION_SET, - "Set start time with start-time property", "set"}, + "GST_AGGREGATOR_START_TIME_SELECTION_SET", "set"}, {0, NULL, NULL} }; + GType new_type = + g_enum_register_static ("GstAggregatorStartTimeSelection", values); - gtype = g_enum_register_static ("GstAggregatorStartTimeSelection", values); + g_once_init_leave (>ype, new_type); } return gtype; } -- 2.7.4