gnomemm r2159 - in gstreamermm/trunk: . build_shared tools/m4

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Thu Apr 16 05:53:19 2009
New Revision: 2159
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2159&view=rev

Log:
2009-04-16  Josà Alburquerque  <jaalburqu svn gnome org>

	* tools/m4/convert_gst.m4: Use ()->gobj() instead of Glib::unwrap()
	in conversions (for consistency).
	* build_shared/Makefile_gensrc.am_fragment: Repaired plug-in
	generation dependencies so that the .hg and .ccg generation rules do
	not depend on the regular m4 files (like convert.m4) because running
	the generated .hg and .ccg files through gmmproc only should have this
	dependency.  Also fixed the running plug-in .hg and .ccg files through
	gmmproc rule dependencies so that running the generated files does not
	depend on the plug-in m4 files (like ctocpp.m4) because the plug-in
	.hg and .ccg generation rules already have this dependency.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment
==============================================================================
--- gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment	(original)
+++ gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment	Thu Apr 16 05:53:19 2009
@@ -80,12 +80,12 @@
 # change because it will be a plug-in generation dependency):
 license_header_source_file = $(gensrc_destdir)/version.h
 
-# This is to generate plugin .hg files.  The generated .hg file s piped through
-# m4 using the macros in tools/m4/ctocpp_base.m4 which then produces the final
-# .hg file.  Finally, the camel hg file is linked to the final .hg file to
-# signal the successful generation of the .hg file.
+# This is to generate plugin .hg files.  The generated .hg file is piped
+# through m4 using the macros in tools/m4/ctocpp_base.m4 which then produces
+# the final .hg file.  Finally, the camel hg file is linked to the final .hg
+# file to signal the successful generation of the .hg file.
 $(files_all_plugin_camel_hg_with_path): $(generate_plugin_dep) \
-	$(tools_plugin_m4) $(files_defs) $(license_header_source_file)
+	$(tools_plugin_m4) $(license_header_source_file)
 	$(eval cppname = $$(notdir $$(basename $$@)))
 	$(eval plugin_def = $$(filter %=$$(cppname),$$(defs_plugin_all)))
 	$(eval plugin_name = $$(subst =$$(cppname),,$$(plugin_def)))
@@ -109,7 +109,7 @@
 # the camel ccg file is linked to the generated .ccg file to signal the
 # successful generation of the .hg file.
 $(files_all_plugin_camel_hg_with_path:.hg=.ccg): $(generate_plugin_dep) \
-	$(tools_plugin_m4) $(files_defs) $(license_header_source_file)
+	$(tools_plugin_m4) $(license_header_source_file)
 	$(eval cppname = $$(notdir $$(basename $$@)))
 	$(eval plugin_def = $$(filter %=$$(cppname),$$(defs_plugin_all)))
 	$(eval plugin_name = $$(subst =$$(cppname),,$$(plugin_def)))
@@ -128,7 +128,7 @@
 # This is to run the generated plug-in .hg and .ccg files through gmmproc
 # (they're generated if necessary by the .../%.hg and .../%.ccg dependencies.
 $(stamp_plugin_dir)/stamp-%-plugin: $(stamp_plugin_dir)/%.hg \
-	$(stamp_plugin_dir)/%.ccg $(tools_m4) $(tools_plugin_m4) $(files_defs)
+	$(stamp_plugin_dir)/%.ccg $(tools_m4) $(files_defs)
 	$(eval plugin_name_lowercase = \
 		$$(shell echo $$* | tr '[:upper:]' '[:lower:]'))
 	$(run_gmmproc) $(plugin_name_lowercase) $(srcdir) $(gensrc_destdir)

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Thu Apr 16 05:53:19 2009
@@ -35,34 +35,34 @@
 #Gst::Object
 _CONVERSION(`GstObject*',`Glib::RefPtr<Gst::Object>',`Glib::wrap($3)')
 _CONVERSION(`GstObject*',`Glib::RefPtr<const Gst::Object>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Object>&',`GstObject*',`Glib::unwrap($3)')
-_CONVERSION(`Glib::RefPtr<Gst::Object>',`GstObject*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Object>&',`GstObject*',`($3)->gobj()')
+_CONVERSION(`Glib::RefPtr<Gst::Object>',`GstObject*',`($3)->gobj()')
 _CONVERSION(`const Glib::RefPtr<const Gst::Object>&',`GstObject*',`const_cast<GstObject*>(($3)->gobj())')
 
 #Buffer
 _CONVERSION(`GstBuffer*',`Glib::RefPtr<Gst::Buffer>',`Gst::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Buffer>&',`GstBuffer*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<const Gst::Buffer>&',`GstBuffer*', `const_cast<GstBuffer*>(Glib::unwrap($3))')
-_CONVERSION(`const Glib::RefPtr<Gst::Buffer>&',`const GstBuffer*', `Glib::unwrap($3)')
-_CONVERSION(`Glib::RefPtr<Gst::Buffer>',`GstBuffer*', `Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Buffer>&',`GstBuffer*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::Buffer>&',`GstBuffer*', `const_cast<GstBuffer*>(($3)->gobj())')
+_CONVERSION(`const Glib::RefPtr<Gst::Buffer>&',`const GstBuffer*', `($3)->gobj()')
+_CONVERSION(`Glib::RefPtr<Gst::Buffer>',`GstBuffer*', `($3)->gobj()')
 
 #Bus
-_CONVERSION(`const Glib::RefPtr<Gst::Bus>&',`GstBus*', `Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Bus>&',`GstBus*', `($3)->gobj()')
 _CONVERSION(`GstBus*',`Glib::RefPtr<Gst::Bus>',`Glib::wrap($3)')
 
 #Caps
 _CONVERSION(`GstCaps*',`Glib::RefPtr<Gst::Caps>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Caps>&',`GstCaps*', `Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Caps>&',`GstCaps*', `($3)->gobj()')
 _CONVERSION(`const Glib::RefPtr<const Gst::Caps>&',`GstCaps*', `const_cast<$2>(($3)->gobj())')
-_CONVERSION(`const Glib::RefPtr<Gst::Caps>&',`const GstCaps*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<const Gst::Caps>&',`const GstCaps*', `Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Caps>&',`const GstCaps*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::Caps>&',`const GstCaps*', `($3)->gobj()')
 
 #Clock
 _CONVERSION(`GstClock*',`Glib::RefPtr<Gst::Clock>',`Glib::wrap($3)')
 _CONVERSION(`GstClock*',`Glib::RefPtr<const Gst::Clock>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Clock>&',`GstClock*', `Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Clock>&',`GstClock*', `($3)->gobj()')
 _CONVERSION(`const Clock&',`GstClock*',`((GstClock*)(&($3)))')
-_CONVERSION(`Glib::RefPtr<Gst::Clock>',`GstClock*', `Glib::unwrap($3)')
+_CONVERSION(`Glib::RefPtr<Gst::Clock>',`GstClock*', `($3)->gobj()')
 
 #ClockID
 _CONVERSION(`GstClockID',`Glib::RefPtr<Gst::ClockID>',`Glib::wrap((GstClockEntry*)($3))')
@@ -73,11 +73,11 @@
 _CONVERSION(`const Glib::RefPtr<const ColorBalanceChannel>&',`GstColorBalanceChannel*',`const_cast<GstColorBalanceChannel*>(($3)->gobj())')
 
 #Element
-_CONVERSION(`Glib::RefPtr<Gst::Element>',`GstElement*', `Glib::unwrap($3)')
+_CONVERSION(`Glib::RefPtr<Gst::Element>',`GstElement*', `($3)->gobj()')
 _CONVERSION(`GstElement*',`Glib::RefPtr<Gst::Element>',`Glib::wrap($3)')
 _CONVERSION(`GstElement*',`Glib::RefPtr<const Gst::Element>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Element>&',`GstElement*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<const Gst::Element>&',`GstElement*', `const_cast<GstElement*>(Glib::unwrap($3))')
+_CONVERSION(`const Glib::RefPtr<Gst::Element>&',`GstElement*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::Element>&',`GstElement*', `const_cast<GstElement*>(($3)->gobj())')
 _CONVERSION(`State&',`GstState*',`((GstState*)(&($3)))')
 
 #ElementFactory
@@ -89,8 +89,8 @@
 
 #Index
 _CONVERSION(`GstIndex*',`Glib::RefPtr<Gst::Index>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Index>&',`GstIndex*',`Glib::unwrap($3)')
-_CONVERSION(`Glib::RefPtr<Gst::Index>',`GstIndex*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Index>&',`GstIndex*',`($3)->gobj()')
+_CONVERSION(`Glib::RefPtr<Gst::Index>',`GstIndex*',`($3)->gobj()')
 
 #IndexFactory
 _CONVERSION(`GstIndexFactory*',`Glib::RefPtr<Gst::IndexFactory>',`Glib::wrap($3)')
@@ -105,18 +105,18 @@
 #Message
 _CONVERSION(`GstMessage*',`Glib::RefPtr<Gst::Message>',`Gst::Message::wrap($3)')
 _CONVERSION(`GstMessage*',`Glib::RefPtr<const Gst::Message>',`Gst::Message::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Message>&',`GstMessage*', `Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Message>&',`GstMessage*', `($3)->gobj()')
 
 #Mixer
-_CONVERSION(`const Glib::RefPtr<Gst::MixerOptions>&',`GstMixerOptions*', `Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::MixerOptions>&',`GstMixerOptions*', `($3)->gobj()')
 _CONVERSION(`const Glib::RefPtr<const Gst::MixerOptions>&',`GstMixerOptions*', `const_cast<$2>(($3)->gobj())')
-_CONVERSION(`const Glib::RefPtr<Gst::MixerTrack>&',`GstMixerTrack*', `Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::MixerTrack>&',`GstMixerTrack*', `($3)->gobj()')
 
 #Pad
 _CONVERSION(`GstPad*',`Glib::RefPtr<Gst::Pad>',`Glib::wrap($3)')
 _CONVERSION(`GstPad*',`Glib::RefPtr<const Gst::Pad>',`Glib::wrap($3)')
-_CONVERSION(`Glib::RefPtr<Gst::Pad>',`GstPad*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Pad>&',`GstPad*', `Glib::unwrap($3)')
+_CONVERSION(`Glib::RefPtr<Gst::Pad>',`GstPad*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::Pad>&',`GstPad*', `($3)->gobj()')
 _CONVERSION(`const Glib::RefPtr<const Gst::Pad>&',`GstPad*',`const_cast<GstPad*>(($3)->gobj())')
 
 #PadTemplate
@@ -124,12 +124,12 @@
 _CONVERSION(`const Glib::RefPtr<const Gst::PadTemplate>&',`GstPadTemplate*',`const_cast<GstPadTemplate*>(($3)->gobj())')
 
 #Plugin
-_CONVERSION(`const Glib::RefPtr<Gst::Plugin>&',`GstPlugin*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Plugin>&',`GstPlugin*',`($3)->gobj()')
 _CONVERSION(`GstPlugin*',`Glib::RefPtr<Gst::Plugin>',`Glib::wrap($3)')
 
 #PluginFeature
 _CONVERSION(`GstPluginFeature*',`Glib::RefPtr<Gst::PluginFeature>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::PluginFeature>&',`GstPluginFeature*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::PluginFeature>&',`GstPluginFeature*',`($3)->gobj()')
 
 #Query
 _CONVERSION(`const Glib::RefPtr<Gst::Query>&',`GstQuery*', `Gst::unwrap($3)')
@@ -154,17 +154,17 @@
 #TunerChannel
 _CONVERSION(`GstTunerChannel*',`Glib::RefPtr<Gst::TunerChannel>', `Glib::wrap($3)')
 _CONVERSION(`GstTunerChannel*',`Glib::RefPtr<const Gst::TunerChannel>', `Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::TunerChannel>&',`GstTunerChannel*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<const Gst::TunerChannel>&',`GstTunerChannel*', `const_cast<GstTunerChannel*>(Glib::unwrap($3))')
+_CONVERSION(`const Glib::RefPtr<Gst::TunerChannel>&',`GstTunerChannel*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::TunerChannel>&',`GstTunerChannel*', `const_cast<GstTunerChannel*>(($3)->gobj())')
 
 #TunerNorm
 _CONVERSION(`GstTunerNorm*',`Glib::RefPtr<Gst::TunerNorm>', `Glib::wrap($3)')
 _CONVERSION(`GstTunerNorm*',`Glib::RefPtr<const Gst::TunerNorm>', `Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::TunerNorm>&',`GstTunerNorm*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<const Gst::TunerNorm>&',`GstTunerNorm*', `const_cast<GstTunerNorm*>(Glib::unwrap($3))')
+_CONVERSION(`const Glib::RefPtr<Gst::TunerNorm>&',`GstTunerNorm*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::TunerNorm>&',`GstTunerNorm*', `const_cast<GstTunerNorm*>(($3)->gobj())')
 
 #URIHandler
-_CONVERSION(`const Glib::RefPtr<Gst::URIHandler>&',`GstURIHandler*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::URIHandler>&',`GstURIHandler*',`($3)->gobj()')
 
 ###################General Conversions############################