gnomemm r2137 - in gstreamermm/trunk: . tools/extra_defs_gen

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Mon Mar 30 04:24:02 2009
New Revision: 2137
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2137&view=rev

Log:
2009-03-30  Josà Alburquerque  <jaalburqu svn gnome org>

	* tools/extra_defs_gen/generate_defs_gst.cc: use <> instead of "" in
	#include directive.
	* tools/extra_defs_gen/generate_plugin_gmmproc_file.cc: Include code
	in plug-in generator which ensures that when a gstreamermm base class
	type is encountered, it always uses the Gst namespace and the
	gstreamermm directory for the base class in case other gstreamermm
	modules that use the generator use another namespace other than Gst.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc
   gstreamermm/trunk/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc

Modified: gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc
==============================================================================
--- gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc	(original)
+++ gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc	Mon Mar 30 04:24:02 2009
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "glibmm_generate_extra_defs/generate_extra_defs.h"
+#include <glibmm_generate_extra_defs/generate_extra_defs.h>
 #include "get_plugin_defs.h"
 
 // Core includes

Modified: gstreamermm/trunk/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
==============================================================================
--- gstreamermm/trunk/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc	(original)
+++ gstreamermm/trunk/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc	Mon Mar 30 04:24:02 2009
@@ -675,8 +675,34 @@
     cppParentTypeName = cParentTypeName.substr(3);
     castMacro = get_cast_macro(cTypeName);
 
-    parentInclude = target;
-    parentNameSpace = nmspace;
+    // Check for gstreamermm base classes so that the Gst namespace and the
+    // gstreamermm include directory is always used with them.
+    if (
+      cppParentTypeName.compare("AudioFilter") == 0 ||
+      cppParentTypeName.compare("AudioSink") == 0 ||
+      cppParentTypeName.compare("AudioSrc") == 0 ||
+      cppParentTypeName.compare("BaseAudioSink") == 0 ||
+      cppParentTypeName.compare("BaseAudioSrc") == 0 ||
+      cppParentTypeName.compare("BaseSink") == 0 ||
+      cppParentTypeName.compare("BaseSrc") == 0 ||
+      cppParentTypeName.compare("BaseTransform") == 0 ||
+      cppParentTypeName.compare("Bin") == 0 ||
+      cppParentTypeName.compare("CddaBaseSrc") == 0 ||
+      cppParentTypeName.compare("Element") == 0 ||
+      cppParentTypeName.compare("Object") == 0 ||
+      cppParentTypeName.compare("Pipeline") == 0 ||
+      cppParentTypeName.compare("PushSrc") == 0 ||
+      cppParentTypeName.compare("VideoSink") == 0
+      )
+    {
+      parentInclude = "gstreamermm";
+      parentNameSpace = "Gst";
+    }
+    else
+    {
+      parentInclude = target;
+      parentNameSpace = nmspace;
+    }
 
     if (hgFile || ccgFile)
     {