diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-01-12 11:08:38 +0100 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-01-12 11:09:07 +0100 |
| commit | 559c800c4f7d2efe62c747c7b399d963be3d18d4 (patch) | |
| tree | 475413136177492f44e7c28fc310fff4c8dab493 | |
| parent | 68e0d2b60c61dda3bf20499785793b6d83b5088d (diff) | |
flvdemux: add prefix to local GstIndex related copies
... to avoid duplicate type names with other such local copies in the wild.
| -rw-r--r-- | gst/flv/gstindex.c | 9 | ||||
| -rw-r--r-- | gst/flv/gstmemindex.c | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gst/flv/gstindex.c b/gst/flv/gstindex.c index c8a0b1da0..792d4b6f0 100644 --- a/gst/flv/gstindex.c +++ b/gst/flv/gstindex.c @@ -126,7 +126,7 @@ gst_index_resolver_get_type (void) if (!index_resolver_type) { index_resolver_type = - g_enum_register_static ("GstIndexResolver", index_resolver); + g_enum_register_static ("GstFlvDemuxIndexResolver", index_resolver); } return index_resolver_type; } @@ -137,7 +137,7 @@ gst_index_entry_get_type (void) static GType index_entry_type = 0; if (!index_entry_type) { - index_entry_type = g_boxed_type_register_static ("GstIndexEntry", + index_entry_type = g_boxed_type_register_static ("GstFlvDemuxIndexEntry", (GBoxedCopyFunc) gst_index_entry_copy, (GBoxedFreeFunc) gst_index_entry_free); } @@ -152,7 +152,10 @@ gst_index_entry_get_type (void) } #endif -G_DEFINE_TYPE (GstIndex, gst_index, GST_TYPE_OBJECT); +typedef GstIndex GstFlvDemuxIndex; +typedef GstIndexClass GstFlvDemuxIndexClass; +//typedef GstIndexEntry GstFlvDemuxIndexEntry; +G_DEFINE_TYPE (GstFlvDemuxIndex, gst_index, GST_TYPE_OBJECT); static void gst_index_class_init (GstIndexClass * klass) diff --git a/gst/flv/gstmemindex.c b/gst/flv/gstmemindex.c index aaeab12d9..dfcd35c10 100644 --- a/gst/flv/gstmemindex.c +++ b/gst/flv/gstmemindex.c @@ -104,7 +104,9 @@ static GstIndexEntry *gst_mem_index_get_assoc_entry (GstIndex * index, gint id, static GType gst_mem_index_get_type (void); -G_DEFINE_TYPE (GstMemIndex, gst_mem_index, GST_TYPE_INDEX); +typedef GstMemIndex GstFlvDemuxMemIndex; +typedef GstMemIndexClass GstFlvDemuxMemIndexClass; +G_DEFINE_TYPE (GstFlvDemuxMemIndex, gst_mem_index, GST_TYPE_INDEX); static void gst_mem_index_class_init (GstMemIndexClass * klass) |