*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/**
* SECTION:gstformat
+ * @title: GstFormat
* @short_description: Dynamically register new data formats
* @see_also: #GstPad, #GstElement
*
#include "gstformat.h"
#include "gstenumtypes.h"
-static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+static GMutex mutex;
static GList *_gst_formats = NULL;
static GHashTable *_nick_to_format = NULL;
static GHashTable *_format_to_nick = NULL;
{GST_FORMAT_TIME, "time", "Time", 0},
{GST_FORMAT_BUFFERS, "buffers", "Buffers", 0},
{GST_FORMAT_PERCENT, "percent", "Percent", 0},
- {0, NULL, NULL, 0}
+ {GST_FORMAT_UNDEFINED, NULL, NULL, 0}
};
void
-_gst_format_initialize (void)
+_priv_gst_format_initialize (void)
{
GstFormatDefinition *standards = standard_definitions;
- g_static_mutex_lock (&mutex);
+ g_mutex_lock (&mutex);
if (_nick_to_format == NULL) {
_nick_to_format = g_hash_table_new (g_str_hash, g_str_equal);
_format_to_nick = g_hash_table_new (NULL, NULL);
while (standards->nick) {
standards->quark = g_quark_from_static_string (standards->nick);
- g_hash_table_insert (_nick_to_format, standards->nick, standards);
+ g_hash_table_insert (_nick_to_format, (gpointer) standards->nick,
+ standards);
g_hash_table_insert (_format_to_nick, GINT_TO_POINTER (standards->value),
standards);
_n_values++;
}
/* getting the type registers the enum */
- gst_format_get_type ();
- g_static_mutex_unlock (&mutex);
+ g_type_class_ref (gst_format_get_type ());
+ g_mutex_unlock (&mutex);
}
/**
*
* Get a printable name for the given format. Do not modify or free.
*
- * Returns: a reference to the static name of the format or NULL if
- * the format is unknown.
+ * Returns: (nullable): a reference to the static name of the format
+ * or %NULL if the format is unknown.
*/
const gchar *
gst_format_get_name (GstFormat format)
GstFormatDefinition *format;
GstFormat query;
- g_return_val_if_fail (nick != NULL, 0);
- g_return_val_if_fail (description != NULL, 0);
+ g_return_val_if_fail (nick != NULL, GST_FORMAT_UNDEFINED);
+ g_return_val_if_fail (description != NULL, GST_FORMAT_UNDEFINED);
query = gst_format_get_by_nick (nick);
if (query != GST_FORMAT_UNDEFINED)
return query;
- format = g_new0 (GstFormatDefinition, 1);
- format->value = _n_values;
+ g_mutex_lock (&mutex);
+ format = g_slice_new (GstFormatDefinition);
+ format->value = (GstFormat) _n_values;
format->nick = g_strdup (nick);
format->description = g_strdup (description);
format->quark = g_quark_from_static_string (format->nick);
- g_static_mutex_lock (&mutex);
- g_hash_table_insert (_nick_to_format, format->nick, format);
+ g_hash_table_insert (_nick_to_format, (gpointer) format->nick, format);
g_hash_table_insert (_format_to_nick, GINT_TO_POINTER (format->value),
format);
_gst_formats = g_list_append (_gst_formats, format);
_n_values++;
- g_static_mutex_unlock (&mutex);
+ g_mutex_unlock (&mutex);
return format->value;
}
{
GstFormatDefinition *format;
- g_return_val_if_fail (nick != NULL, 0);
+ g_return_val_if_fail (nick != NULL, GST_FORMAT_UNDEFINED);
- g_static_mutex_lock (&mutex);
+ g_mutex_lock (&mutex);
format = g_hash_table_lookup (_nick_to_format, nick);
- g_static_mutex_unlock (&mutex);
+ g_mutex_unlock (&mutex);
if (format != NULL)
return format->value;
/**
* gst_formats_contains:
- * @formats: The format array to search
+ * @formats: (array zero-terminated=1): The format array to search
* @format: the format to find
*
* See if the given format is inside the format array.
*
- * Returns: TRUE if the format is found inside the array
+ * Returns: %TRUE if the format is found inside the array
*/
gboolean
gst_formats_contains (const GstFormat * formats, GstFormat format)
*
* Get details about the given format.
*
- * Returns: The #GstFormatDefinition for @format or NULL on failure.
+ * Returns: (nullable): The #GstFormatDefinition for @format or %NULL
+ * on failure.
*
* MT safe.
*/
{
const GstFormatDefinition *result;
- g_static_mutex_lock (&mutex);
+ g_mutex_lock (&mutex);
result = g_hash_table_lookup (_format_to_nick, GINT_TO_POINTER (format));
- g_static_mutex_unlock (&mutex);
+ g_mutex_unlock (&mutex);
return result;
}
* Iterate all the registered formats. The format definition is read
* only.
*
- * Returns: A GstIterator of #GstFormatDefinition.
+ * Returns: (transfer full): a GstIterator of #GstFormatDefinition.
*/
GstIterator *
gst_format_iterate_definitions (void)
{
GstIterator *result;
- g_static_mutex_lock (&mutex);
+ g_mutex_lock (&mutex);
/* FIXME: register a boxed type for GstFormatDefinition */
result = gst_iterator_new_list (G_TYPE_POINTER,
- g_static_mutex_get_mutex (&mutex), &_n_values, &_gst_formats,
- NULL, NULL, NULL);
- g_static_mutex_unlock (&mutex);
+ &mutex, &_n_values, &_gst_formats, NULL, NULL);
+ g_mutex_unlock (&mutex);
return result;
}