From c61b2ade7b6e7f05f495dd7b5734de9d987cf4a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 30 Dec 2011 15:31:17 +0000 Subject: [PATCH] index: rename GstAssocFlags to GstIndexAssociationFlags Just in case we resurrect this later. --- libs/gst/base/gstbaseparse.c | 7 ++++--- libs/gst/base/gstindex.c | 12 ++++++------ libs/gst/base/gstindex.h | 32 ++++++++++++++++---------------- libs/gst/base/gstmemindex.c | 4 ++-- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c index 1a1217e..b31be9d 100644 --- a/libs/gst/base/gstbaseparse.c +++ b/libs/gst/base/gstbaseparse.c @@ -1607,8 +1607,9 @@ gst_base_parse_add_index_entry (GstBaseParse * parse, guint64 offset, /* index might change on-the-fly, although that would be nutty app ... */ GST_BASE_PARSE_INDEX_LOCK (parse); gst_index_add_associationv (parse->priv->index, parse->priv->index_id, - (key) ? GST_ASSOCIATION_FLAG_KEY_UNIT : GST_ASSOCIATION_FLAG_DELTA_UNIT, - 2, (const GstIndexAssociation *) &associations); + (key) ? GST_INDEX_ASSOCIATION_FLAG_KEY_UNIT : + GST_INDEX_ASSOCIATION_FLAG_DELTA_UNIT, 2, + (const GstIndexAssociation *) &associations); GST_BASE_PARSE_INDEX_UNLOCK (parse); if (key) { @@ -3729,7 +3730,7 @@ gst_base_parse_find_offset (GstBaseParse * parse, GstClockTime time, entry = gst_index_get_assoc_entry (parse->priv->index, parse->priv->index_id, before ? GST_INDEX_LOOKUP_BEFORE : GST_INDEX_LOOKUP_AFTER, - GST_ASSOCIATION_FLAG_KEY_UNIT, GST_FORMAT_TIME, time); + GST_INDEX_ASSOCIATION_FLAG_KEY_UNIT, GST_FORMAT_TIME, time); } if (entry) { diff --git a/libs/gst/base/gstindex.c b/libs/gst/base/gstindex.c index 69143e7..8d69b06 100644 --- a/libs/gst/base/gstindex.c +++ b/libs/gst/base/gstindex.c @@ -793,8 +793,8 @@ gst_index_add_entry (GstIndex * index, GstIndexEntry * entry) * Returns: a pointer to the newly added entry in the index. */ GstIndexEntry * -gst_index_add_associationv (GstIndex * index, gint id, GstAssocFlags flags, - gint n, const GstIndexAssociation * list) +gst_index_add_associationv (GstIndex * index, gint id, + GstIndexAssociationFlags flags, gint n, const GstIndexAssociation * list) { GstIndexEntry *entry; @@ -835,8 +835,8 @@ gst_index_add_associationv (GstIndex * index, gint id, GstAssocFlags flags, * Returns: a pointer to the newly added entry in the index. */ GstIndexEntry * -gst_index_add_association (GstIndex * index, gint id, GstAssocFlags flags, - GstFormat format, gint64 value, ...) +gst_index_add_association (GstIndex * index, gint id, + GstIndexAssociationFlags flags, GstFormat format, gint64 value, ...) { va_list args; GstIndexEntry *entry; @@ -934,7 +934,7 @@ gst_index_compare_func (gconstpointer a, gconstpointer b, gpointer user_data) */ GstIndexEntry * gst_index_get_assoc_entry (GstIndex * index, gint id, - GstIndexLookupMethod method, GstAssocFlags flags, + GstIndexLookupMethod method, GstIndexAssociationFlags flags, GstFormat format, gint64 value) { g_return_val_if_fail (GST_IS_INDEX (index), NULL); @@ -965,7 +965,7 @@ gst_index_get_assoc_entry (GstIndex * index, gint id, */ GstIndexEntry * gst_index_get_assoc_entry_full (GstIndex * index, gint id, - GstIndexLookupMethod method, GstAssocFlags flags, + GstIndexLookupMethod method, GstIndexAssociationFlags flags, GstFormat format, gint64 value, GCompareDataFunc func, gpointer user_data) { GstIndexClass *iclass; diff --git a/libs/gst/base/gstindex.h b/libs/gst/base/gstindex.h index 321d4e3..7e22efc 100644 --- a/libs/gst/base/gstindex.h +++ b/libs/gst/base/gstindex.h @@ -137,24 +137,24 @@ struct _GstIndexAssociation { }; /** - * GstAssocFlags: - * @GST_ASSOCIATION_FLAG_NONE: no extra flags - * @GST_ASSOCIATION_FLAG_KEY_UNIT: the entry marks a key unit, a key unit is one + * GstIndexAssociationFlags: + * @GST_INDEX_ASSOCIATION_FLAG_NONE: no extra flags + * @GST_INDEX_ASSOCIATION_FLAG_KEY_UNIT: the entry marks a key unit, a key unit is one * that marks a place where one can randomly seek to. - * @GST_ASSOCIATION_FLAG_DELTA_UNIT: the entry marks a delta unit, a delta unit + * @GST_INDEX_ASSOCIATION_FLAG_DELTA_UNIT: the entry marks a delta unit, a delta unit * is one that marks a place where one can relatively seek to. - * @GST_ASSOCIATION_FLAG_LAST: extra user defined flags should start here. + * @GST_INDEX_ASSOCIATION_FLAG_LAST: extra user defined flags should start here. * * Flags for an association entry. */ typedef enum { - GST_ASSOCIATION_FLAG_NONE = 0, - GST_ASSOCIATION_FLAG_KEY_UNIT = (1 << 0), - GST_ASSOCIATION_FLAG_DELTA_UNIT = (1 << 1), + GST_INDEX_ASSOCIATION_FLAG_NONE = 0, + GST_INDEX_ASSOCIATION_FLAG_KEY_UNIT = (1 << 0), + GST_INDEX_ASSOCIATION_FLAG_DELTA_UNIT = (1 << 1), /* new flags should start here */ - GST_ASSOCIATION_FLAG_LAST = (1 << 8) -} GstAssocFlags; + GST_INDEX_ASSOCIATION_FLAG_LAST = (1 << 8) +} GstIndexAssociationFlags; /** * GST_INDEX_FORMAT_FORMAT: @@ -205,7 +205,7 @@ struct _GstIndexEntry { gint nassocs; GstIndexAssociation *assocs; - GstAssocFlags flags; + GstIndexAssociationFlags flags; } assoc; struct { gchar *key; @@ -357,7 +357,7 @@ struct _GstIndexClass { void (*add_entry) (GstIndex *index, GstIndexEntry *entry); GstIndexEntry* (*get_assoc_entry) (GstIndex *index, gint id, - GstIndexLookupMethod method, GstAssocFlags flags, + GstIndexLookupMethod method, GstIndexAssociationFlags flags, GstFormat format, gint64 value, GCompareDataFunc func, gpointer user_data); @@ -406,10 +406,10 @@ GstIndexEntry* gst_index_add_format (GstIndex *index, gint i #endif static -GstIndexEntry* gst_index_add_associationv (GstIndex * index, gint id, GstAssocFlags flags, +GstIndexEntry* gst_index_add_associationv (GstIndex * index, gint id, GstIndexAssociationFlags flags, gint n, const GstIndexAssociation * list); #if 0 -GstIndexEntry* gst_index_add_association (GstIndex *index, gint id, GstAssocFlags flags, +GstIndexEntry* gst_index_add_association (GstIndex *index, gint id, GstIndexAssociationFlags flags, GstFormat format, gint64 value, ...) GstIndexEntry* gst_index_add_object (GstIndex *index, gint id, gchar *key, GType type, gpointer object); @@ -421,11 +421,11 @@ GstIndexEntry* gst_index_add_id (GstIndex *index, gint i static GstIndexEntry* gst_index_get_assoc_entry (GstIndex *index, gint id, - GstIndexLookupMethod method, GstAssocFlags flags, + GstIndexLookupMethod method, GstIndexAssociationFlags flags, GstFormat format, gint64 value); static GstIndexEntry* gst_index_get_assoc_entry_full (GstIndex *index, gint id, - GstIndexLookupMethod method, GstAssocFlags flags, + GstIndexLookupMethod method, GstIndexAssociationFlags flags, GstFormat format, gint64 value, GCompareDataFunc func, gpointer user_data); diff --git a/libs/gst/base/gstmemindex.c b/libs/gst/base/gstmemindex.c index be8e690..aaeab12 100644 --- a/libs/gst/base/gstmemindex.c +++ b/libs/gst/base/gstmemindex.c @@ -97,7 +97,7 @@ static void gst_mem_index_finalize (GObject * object); static void gst_mem_index_add_entry (GstIndex * index, GstIndexEntry * entry); static GstIndexEntry *gst_mem_index_get_assoc_entry (GstIndex * index, gint id, - GstIndexLookupMethod method, GstAssocFlags flags, + GstIndexLookupMethod method, GstIndexAssociationFlags flags, GstFormat format, gint64 value, GCompareDataFunc func, gpointer user_data); #define CLASS(mem_index) GST_MEM_INDEX_CLASS (G_OBJECT_GET_CLASS (mem_index)) @@ -338,7 +338,7 @@ mem_index_search (gconstpointer a, gconstpointer b) static GstIndexEntry * gst_mem_index_get_assoc_entry (GstIndex * index, gint id, GstIndexLookupMethod method, - GstAssocFlags flags, + GstIndexAssociationFlags flags, GstFormat format, gint64 value, GCompareDataFunc func, gpointer user_data) { GstMemIndex *memindex = GST_MEM_INDEX (index); -- 2.7.4