gnomemm r1947 - in gstreamermm/trunk: . gstreamer/gstreamermm gstreamer/src tools/extra_defs_gen

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Mon Jan  5 22:46:49 2009
New Revision: 1947
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1947&view=rev

Log:
2009-01-05  Josà Alburquerque  <jaalburqu svn gnome org>

	* configure.ac:
	* gstreamer/src/Makefile_list_of_hg.am_fragment: Added GDPDepay and
	GDPPay plug-ins.

	* gstreamer/gstreamermm/object.cc:
	* tools/extra_defs_gen/generate_plugin_gmmproc_file.cc: Added floating
	reference aversion to ConstructParam Gst::Object constructor and
	removed it from plug-in constructors. Also removed code in plug-in
	generator to ensure that certain base classes are interpreted as
	belonging to the Gst namespace because the gstreamerbase branch has
	been merged into gstreamer and there's no possibility of these base
	classes being interpreted as belonging to the GstBase namespace or
	existing in the gstreamerbasemm directory anymore.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/configure.ac
   gstreamermm/trunk/gstreamer/gstreamermm/object.cc
   gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
   gstreamermm/trunk/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc

Modified: gstreamermm/trunk/configure.ac
==============================================================================
--- gstreamermm/trunk/configure.ac	(original)
+++ gstreamermm/trunk/configure.ac	Mon Jan  5 22:46:49 2009
@@ -172,8 +172,6 @@
 AC_ARG_VAR([GST_INSPECT], [Variable to store gst-inspect executable])
 AC_SUBST(GST_INSPECT)
 
-################ gstreamermm plug-in processing ################ 
-
 # To add a plugin, add the C++ class name (which must be the plugin name as
 # recognized by gst-inspect but in camel case -- as is appropriate for a class
 # name) to the plug-in C++ name list below.  Also add the target .hg file name
@@ -184,14 +182,10 @@
 GSTREAMERMM_ALL_PLUGIN_CPPNAMES="CapsFilter FakeSrc FakeSink FdSink FdSrc \
 FileSrc FileSink Identity MultiQueue Queue Tee TypeFind Adder AlsaMixer \
 AlsaSink AlsaSrc AudioConvert AudioResample AudioTestSrc CdParanoiaSrc \
-ClockOverlay DecodeBin FfmpegColorSpace GioSink GioSrc GioStreamSink \
-GioStreamSrc OggDemux OggMux PlayBin2 TextOverlay TextRender TheoraDec \
-TheoraEnc TimeOverlay VideoRate VideoScale VideoTestSrc Volume VorbisDec \
-VorbisEnc VorbisParse VorbisTag XImageSink XvImageSink"
-
-# TODO: gdpdepay and gdppay plug-ins (to be added above) cause several warnings
-# when their wrap_new() methods are registered in Gst::wrap_init() (from
-# Gst::init).
+ClockOverlay DecodeBin FfmpegColorSpace GDPDepay GDPPay GioSink GioSrc \
+GioStreamSink GioStreamSrc OggDemux OggMux PlayBin2 TextOverlay TextRender \
+TheoraDec TheoraEnc TimeOverlay VideoRate VideoScale VideoTestSrc Volume \
+VorbisDec VorbisEnc VorbisParse VorbisTag XImageSink XvImageSink"
 
 # TODO: The following plug-ins (to be added above) can't be wrapped yet because
 # their signals or properties use the GValueArray type which might have to be

Modified: gstreamermm/trunk/gstreamer/gstreamermm/object.cc
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/object.cc	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/object.cc	Mon Jan  5 22:46:49 2009
@@ -71,7 +71,10 @@
 :
   Glib::Object(construct_params)
 {
-
+  //The floating reference is convenience for C,
+  //but is useless and difficult for us:
+  gst_object_ref(gobj());
+  gst_object_sink(gobj());
 }
 
 Object::Object(GstObject* castitem)

Modified: gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment	(original)
+++ gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment	Mon Jan  5 22:46:49 2009
@@ -33,8 +33,8 @@
 		  adder.hg alsamixer.hg alsasink.hg alsasrc.hg \
 		  audioconvert.hg audioresample.hg audiotestsrc.hg \
 		  cdparanoiasrc.hg clockoverlay.hg decodebin.hg \
-		  ffmpegcolorspace.hg giosink.hg giosrc.hg giostreamsink.hg \
-		  giostreamsrc.hg \
+		  ffmpegcolorspace.hg gdpdepay.hg gdppay.hg giosink.hg \
+		  giosrc.hg giostreamsink.hg giostreamsrc.hg \
 		  oggdemux.hg oggmux.hg playbin2.hg \
 		  textoverlay.hg \
 		  textrender.hg theoradec.hg theoraenc.hg \

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 Jan  5 22:46:49 2009
@@ -529,21 +529,11 @@
 
   std::cout << cppTypeName << "::" << cppTypeName << "()" << std::endl;
   std::cout << ": _CONSTRUCT(\"name\", NULL)" << std::endl;
-  std::cout << "{" << std::endl;
-  std::cout << "  //The floating reference is convenience for C," << std::endl;
-  std::cout << " //but is useless and difficult for us:" << std::endl;
-  std::cout << " gst_object_ref(gobj());" << std::endl;
-  std::cout << " gst_object_sink(gobj());" << std::endl;
-  std::cout << "}" << std::endl << std::endl;
+  std::cout << "{}" << std::endl << std::endl;
 
   std::cout << cppTypeName << "::" << cppTypeName << "(const Glib::ustring& name)" << std::endl;
   std::cout << ": _CONSTRUCT(\"name\", name.c_str())" << std::endl;
-  std::cout << "{" << std::endl;
-  std::cout << "  //The floating reference is convenience for C," << std::endl;
-  std::cout << " //but is useless and difficult for us:" << std::endl;
-  std::cout << " gst_object_ref(gobj());" << std::endl;
-  std::cout << " gst_object_sink(gobj());" << std::endl;
-  std::cout << "}" << std::endl << std::endl;
+  std::cout << "{}" << std::endl << std::endl;
 
   std::cout << std::endl << "}" << std::endl;
 }
@@ -654,22 +644,8 @@
     cppParentTypeName = cParentTypeName.substr(3);
     castMacro = get_cast_macro(cTypeName);
 
-    if (cppParentTypeName.compare("BaseSrc") == 0 ||
-      cppParentTypeName.compare("BaseSink") == 0 ||
-      cppParentTypeName.compare("BaseTransform") == 0 ||
-      cppParentTypeName.compare("PushSrc") == 0 ||
-      cppParentTypeName.compare("Pipeline") == 0 ||
-      cppParentTypeName.compare("Bin") == 0 ||
-      cppParentTypeName.compare("Element") == 0)
-    {
-      parentInclude = "gstreamermm";
-      parentNameSpace = "Gst";
-    }
-    else
-    {
-      parentInclude = target;
-      parentNameSpace = nmspace;
-    }
+    parentInclude = target;
+    parentNameSpace = nmspace;
 
     if (hgFile || ccgFile)
     {