[gstreamermm] Plugin Gen: Remove conflict with GStreamer *_get_type() function names.

[Josà Alburquerque <jaalburqu src gnome org>]

commit aac375d67b7c1b2b7da43dc368ad4dc6df3b292a
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date:   Mon May 14 18:12:30 2012 -0400

    Plugin Gen: Remove conflict with GStreamer *_get_type() function names.
    
    	* tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
    	(generate_hg_file): Append a _GSTREAMERMM to the cast macro of the
    	_CLASS_GOBJECT() macro so that gmmproc uses the custom *_get_type()
    	function of the plug-in to get the base GType of the plug-in.
    	(generate_ccg_file): Use *_gstremaermm_get_type() for the name of the
    	custom *_get_type() functions of the plug-ins so that there is no
    	conflict with the actual GStreamer *_get_type() functions for any
    	reason.
    
    	* gstreamer/src/Makefile.am: Remove unnecessary line.
    	* gstreamer/src/mixer.hg: Remove unnecessary include.

 ChangeLog                                          |   16 ++++++++++++++++
 gstreamer/src/Makefile.am                          |    1 -
 gstreamer/src/mixer.hg                             |    1 -
 .../extra_defs_gen/generate_plugin_gmmproc_file.cc |    4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cc618b1..d98afaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-05-14  Josà Alburquerque  <jaalburquerque gmail com>
+
+	Plugin Gen: Remove conflict with GStreamer *_get_type() function names.
+
+	* tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
+	(generate_hg_file): Append a _GSTREAMERMM to the cast macro of the
+	_CLASS_GOBJECT() macro so that gmmproc uses the custom *_get_type()
+	function of the plug-in to get the base GType of the plug-in.
+	(generate_ccg_file): Use *_gstremaermm_get_type() for the name of the
+	custom *_get_type() functions of the plug-ins so that there is no
+	conflict with the actual GStreamer *_get_type() functions for any
+	reason.
+
+	* gstreamer/src/Makefile.am: Remove unnecessary line.
+	* gstreamer/src/mixer.hg: Remove unnecessary include.
+
 0.10.10.1:
 
 2012-02-19  Josà Alburquerque  <jaalburquerque gmail com>
diff --git a/gstreamer/src/Makefile.am b/gstreamer/src/Makefile.am
index 2496e0b..b77be86 100644
--- a/gstreamer/src/Makefile.am
+++ b/gstreamer/src/Makefile.am
@@ -51,7 +51,6 @@ $(addprefix $(srcdir)/,$(plugins_ccg)): $(generate_plugin_dependencies)
 # through m4 using the macros in tools/m4/ctocpp_base.m4 which then produces
 # the final .hg file.
 $(addprefix $(srcdir)/,$(plugins_hg)): %.hg: %.ccg $(generate_plugin_dependencies)
-	@echo Plugin def: $(target_plugin_and_classname)
 	$(AM_V_GEN)$(generate_plugin_gmmproc_file) \
 	  --hg $(target_plugin_and_classname) | $(M4) -I $(codegen_m4_srcdir) \
 	  >$@
diff --git a/gstreamer/src/mixer.hg b/gstreamer/src/mixer.hg
index c778b0e..5161b8c 100644
--- a/gstreamer/src/mixer.hg
+++ b/gstreamer/src/mixer.hg
@@ -21,7 +21,6 @@
 #include <gst/interfaces/mixeroptions.h>
 #include <gstreamermm/mixertrack.h>
 #include <gstreamermm/message.h>
-#include <glibmm/arrayhandle.h>
 #include <glibmm/interface.h>
 
 _DEFS(gstreamermm,gst)
diff --git a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
index 98b31a7..9eaf3f0 100644
--- a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
+++ b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
@@ -667,7 +667,7 @@ static void generate_hg_file(const std::string& includeMacroCalls,
 
   std::cout << '{' << std::endl;
   std::cout << "  _CLASS_GOBJECT(" << cppTypeName << ", " << cTypeName <<
-    ", " << castMacro << ", " << parentNameSpace << "::" <<
+    ", " << castMacro << "_GSTREAMERMM, " << parentNameSpace << "::" <<
     cppParentTypeName << ", " << cParentTypeName << ')' << std::endl;
 
   if(!interfaceMacros.empty())
@@ -711,7 +711,7 @@ static void generate_ccg_file(const std::string& enumGTypeFunctionDefinitions,
   std::cout << "_PINCLUDE(" << parentInclude << "/private/" <<
     to_lowercase(cppParentTypeName) << "_p.h)" << std::endl << std::endl;
 
-  std::string getTypeName = to_lowercase(castMacro) + "_get_type";
+  std::string getTypeName = to_lowercase(castMacro) + "_gstreamermm_get_type";
 
   std::cout << "extern \"C\"" << std::endl;
   std::cout << '{' << std::endl << std::endl;