From: Tim-Philipp Müller Date: Fri, 30 Dec 2011 15:24:52 +0000 (+0000) Subject: base: disable unused index API and make functions static X-Git-Tag: RELEASE-0.11.2~255 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f11fc0514231783e6a28e01ada981ee81fc948b;p=platform%2Fupstream%2Fgstreamer.git base: disable unused index API and make functions static It's simply private helper API for now, until someone fixes up GstBaseParse not to need it any more. --- diff --git a/libs/gst/base/gstindex.c b/libs/gst/base/gstindex.c index 30087d5..69143e7 100644 --- a/libs/gst/base/gstindex.c +++ b/libs/gst/base/gstindex.c @@ -297,6 +297,8 @@ gst_index_group_free (GstIndexGroup * group) g_slice_free (GstIndexGroup, group); } +/* do not resurrect this, add a derived dummy index class instead */ +#if 0 /** * gst_index_new: * @@ -336,7 +338,6 @@ gst_index_commit (GstIndex * index, gint id) iclass->commit (index, id); } - /** * gst_index_get_group: * @index: the index to get the current group from @@ -405,7 +406,9 @@ gst_index_set_group (GstIndex * index, gint groupnum) GST_DEBUG ("couldn't find index group %d", groupnum); return FALSE; } +#endif +#if 0 /** * gst_index_set_certainty: * @index: the index to set the certainty on @@ -432,7 +435,9 @@ gst_index_get_certainty (GstIndex * index) { return index->curgroup->certainty; } +#endif +#if 0 /** * gst_index_set_filter: * @index: the index to register the filter on @@ -517,6 +522,7 @@ gst_index_set_resolver_full (GstIndex * index, GstIndexResolver resolver, index->resolver_user_data_destroy = user_data_destroy; index->method = GST_INDEX_RESOLVER_CUSTOM; } +#endif /** * gst_index_entry_copy: @@ -568,6 +574,7 @@ gst_index_entry_free (GstIndexEntry * entry) g_slice_free (GstIndexEntry, entry); } +#if 0 /** * gst_index_add_format: * @index: the index to add the entry to @@ -606,6 +613,7 @@ gst_index_add_format (GstIndex * index, gint id, GstFormat format) return entry; } +#endif /** * gst_index_add_id: @@ -810,6 +818,7 @@ gst_index_add_associationv (GstIndex * index, gint id, GstAssocFlags flags, return entry; } +#if 0 /** * gst_index_add_association: * @index: the index to add the entry to @@ -897,6 +906,7 @@ gst_index_add_object (GstIndex * index, gint id, gchar * key, return NULL; } +#endif static gint gst_index_compare_func (gconstpointer a, gconstpointer b, gpointer user_data) diff --git a/libs/gst/base/gstindex.h b/libs/gst/base/gstindex.h index d2b2a14..321d4e3 100644 --- a/libs/gst/base/gstindex.h +++ b/libs/gst/base/gstindex.h @@ -368,7 +368,10 @@ struct _GstIndexClass { gpointer _gst_reserved[GST_PADDING]; }; +static GType gst_index_get_type (void); + +#if 0 GstIndex* gst_index_new (void); void gst_index_commit (GstIndex *index, gint id); @@ -380,32 +383,47 @@ void gst_index_set_certainty (GstIndex *index, GstIndexCertainty certainty); GstIndexCertainty gst_index_get_certainty (GstIndex *index); +static void gst_index_set_filter (GstIndex *index, GstIndexFilter filter, gpointer user_data); +static void gst_index_set_filter_full (GstIndex *index, GstIndexFilter filter, gpointer user_data, GDestroyNotify user_data_destroy); + void gst_index_set_resolver (GstIndex *index, GstIndexResolver resolver, gpointer user_data); void gst_index_set_resolver_full (GstIndex *index, GstIndexResolver resolver, gpointer user_data, GDestroyNotify user_data_destroy); +#endif +static gboolean gst_index_get_writer_id (GstIndex *index, GstObject *writer, gint *id); +#if 0 GstIndexEntry* gst_index_add_format (GstIndex *index, gint id, GstFormat format); +#endif + +static GstIndexEntry* gst_index_add_associationv (GstIndex * index, gint id, GstAssocFlags flags, gint n, const GstIndexAssociation * list); +#if 0 GstIndexEntry* gst_index_add_association (GstIndex *index, gint id, GstAssocFlags flags, - GstFormat format, gint64 value, ...); + GstFormat format, gint64 value, ...) GstIndexEntry* gst_index_add_object (GstIndex *index, gint id, gchar *key, GType type, gpointer object); +#endif + +static GstIndexEntry* gst_index_add_id (GstIndex *index, gint id, gchar *description); +static GstIndexEntry* gst_index_get_assoc_entry (GstIndex *index, gint id, GstIndexLookupMethod method, GstAssocFlags flags, GstFormat format, gint64 value); +static GstIndexEntry* gst_index_get_assoc_entry_full (GstIndex *index, gint id, GstIndexLookupMethod method, GstAssocFlags flags, GstFormat format, gint64 value, @@ -413,9 +431,13 @@ GstIndexEntry* gst_index_get_assoc_entry_full (GstIndex *index, gint i gpointer user_data); /* working with index entries */ +static GType gst_index_entry_get_type (void); +static GstIndexEntry * gst_index_entry_copy (GstIndexEntry *entry); +static void gst_index_entry_free (GstIndexEntry *entry); +static gboolean gst_index_entry_assoc_map (GstIndexEntry *entry, GstFormat format, gint64 *value); diff --git a/libs/gst/base/gstmemindex.c b/libs/gst/base/gstmemindex.c index 8673ef6..be8e690 100644 --- a/libs/gst/base/gstmemindex.c +++ b/libs/gst/base/gstmemindex.c @@ -102,7 +102,7 @@ static GstIndexEntry *gst_mem_index_get_assoc_entry (GstIndex * index, gint id, #define CLASS(mem_index) GST_MEM_INDEX_CLASS (G_OBJECT_GET_CLASS (mem_index)) -GType gst_mem_index_get_type (void); +static GType gst_mem_index_get_type (void); G_DEFINE_TYPE (GstMemIndex, gst_mem_index, GST_TYPE_INDEX);