[0.11] gst-plugins-good: flvdemux: add prefix to local GstIndex related copies

[Mark Nauwelaerts]

Module: gst-plugins-good
Branch: 0.11
Commit: 559c800c4f7d2efe62c747c7b399d963be3d18d4
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=559c800c4f7d2efe62c747c7b399d963be3d18d4

Author: Mark Nauwelaerts <mark.nauwelaerts at collabora.co.uk>
Date:   Thu Jan 12 11:08:38 2012 +0100

flvdemux: add prefix to local GstIndex related copies

... to avoid duplicate type names with other such local copies in the wild.

---

 gst/flv/gstindex.c    |    9 ++++++---
 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 c8a0b1d..792d4b6 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 aaeab12..dfcd35c 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)