gnomemm r1835 - in gstreamermm/trunk: . gstreamer/src gstreamerbase/src tools/extra_defs_gen tools/m4



Author: jaalburqu
Date: Fri Dec 12 03:49:44 2008
New Revision: 1835
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1835&view=rev

Log:
2008-12-11  Josà Alburquerque  <jaalburqu svn gnome org>

	* tools/m4/convert_gst.m4:
	* gstreamer/src/basesink.hg:
	* gstreamer/src/basesrc.hg:
	* gstreamer/src/basetransform.hg:
	* gstreamer/src/bin.ccg:
	* gstreamer/src/bin.hg:
	* gstreamer/src/buffer.ccg:
	* gstreamer/src/buffer.hg:
	* gstreamer/src/bus.hg:
	* gstreamer/src/caps.ccg:
	* gstreamer/src/caps.hg:
	* gstreamer/src/childproxy.ccg:
	* gstreamer/src/childproxy.hg:
	* gstreamer/src/clock.hg:
	* gstreamer/src/element.ccg:
	* gstreamer/src/element.hg:
	* gstreamer/src/elementfactory.ccg:
	* gstreamer/src/elementfactory.hg:
	* gstreamer/src/event.ccg:
	* gstreamer/src/event.hg:
	* gstreamer/src/ghostpad.ccg:
	* gstreamer/src/ghostpad.hg:
	* gstreamer/src/index.hg:
	* gstreamer/src/indexfactory.hg:
	* gstreamer/src/interface.hg:
	* gstreamer/src/message.ccg:
	* gstreamer/src/message.hg:
	* gstreamer/src/pad.ccg:
	* gstreamer/src/pad.hg:
	* gstreamer/src/padtemplate.hg:
	* gstreamer/src/parse.ccg:
	* gstreamer/src/parse.hg:
	* gstreamer/src/pipeline.hg:
	* gstreamer/src/plugin.hg:
	* gstreamer/src/pluginfeature.hg:
	* gstreamer/src/query.ccg:
	* gstreamer/src/query.hg:
	* gstreamer/src/registry.ccg:
	* gstreamer/src/registry.hg:
	* gstreamer/src/systemclock.hg:
	* gstreamer/src/taglist.hg:
	* gstreamer/src/tagsetter.hg:
	* gstreamer/src/urihandler.hg:
	* gstreamer/src/xml.ccg:
	* gstreamer/src/xml.hg: Specified namespace wherever necessary so that
	the conversions in convert_gst.m4 can also be used with classes in
	gstreamerbase branch.
	* tools/m4/convert_gstbase.m4: Typo.

	* tools/extra_defs_gen/generate_defs_gstbase.cc: Modified to include
	some base classes that plug-ins derive from and all gst-plugins-base
	plug-ins.

	* gstreamerbase/src/generate-enums.sh:
	* gstreamerbase/src/generate-extra-defs.sh:
	* gstreamerbase/src/generate-methods.sh: Modified defs generation
	scripts to include plug-in directories and to patch when necessary.
	* gstreamerbase/src/gstbase_enums.defs:
	* gstreamerbase/src/gstbase_enums.defs.patch:
	* gstreamerbase/src/gstbase_methods.defs:
	* gstreamerbase/src/gstbase_signals.defs:
	* gstreamerbase/src/gstbase_signals.defs.patch: Regenerated and create
	patches to use where types are not quite correct.

	* gstreamerbase/src/Makefile_list_of_hg.am_fragment:
	* gstreamerbase/src/audiosink.ccg:
	* gstreamerbase/src/audiosink.hg:
	* gstreamerbase/src/audiosrc.ccg:
	* gstreamerbase/src/audiosrc.hg:
	* gstreamerbase/src/baseaudiosink.ccg:
	* gstreamerbase/src/baseaudiosink.hg:
	* gstreamerbase/src/baseaudiosrc.ccg:
	* gstreamerbase/src/baseaudiosrc.hg: Added these base classes on
	which some plug-ins depend (derive from).  Also made a Doxygen group
	for them in element.hg.

	* tools/extra_defs_gen/generate_plugin_gmmproc_file.cc: Modified to
	not include an m4 conversion from a Glib::RefPtr<> to the underlying
	object in the generated plugin .hg file because the conversions in the
	convert_*.m4 files can be used just as well.  Also modified to
	generate a _WRAP_ENUM for flags specific to the plug-in.

Added:
   gstreamermm/trunk/gstreamerbase/src/audiosink.ccg
   gstreamermm/trunk/gstreamerbase/src/audiosink.hg
   gstreamermm/trunk/gstreamerbase/src/audiosrc.ccg
   gstreamermm/trunk/gstreamerbase/src/audiosrc.hg
   gstreamermm/trunk/gstreamerbase/src/baseaudiosink.ccg
   gstreamermm/trunk/gstreamerbase/src/baseaudiosink.hg
   gstreamermm/trunk/gstreamerbase/src/baseaudiosrc.ccg
   gstreamermm/trunk/gstreamerbase/src/baseaudiosrc.hg
   gstreamermm/trunk/gstreamerbase/src/gstbase_enums.defs.patch
   gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs.patch
Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/basesink.hg
   gstreamermm/trunk/gstreamer/src/basesrc.hg
   gstreamermm/trunk/gstreamer/src/basetransform.hg
   gstreamermm/trunk/gstreamer/src/bin.ccg
   gstreamermm/trunk/gstreamer/src/bin.hg
   gstreamermm/trunk/gstreamer/src/buffer.ccg
   gstreamermm/trunk/gstreamer/src/buffer.hg
   gstreamermm/trunk/gstreamer/src/bus.hg
   gstreamermm/trunk/gstreamer/src/caps.ccg
   gstreamermm/trunk/gstreamer/src/caps.hg
   gstreamermm/trunk/gstreamer/src/childproxy.ccg
   gstreamermm/trunk/gstreamer/src/childproxy.hg
   gstreamermm/trunk/gstreamer/src/clock.hg
   gstreamermm/trunk/gstreamer/src/element.ccg
   gstreamermm/trunk/gstreamer/src/element.hg
   gstreamermm/trunk/gstreamer/src/elementfactory.ccg
   gstreamermm/trunk/gstreamer/src/elementfactory.hg
   gstreamermm/trunk/gstreamer/src/event.ccg
   gstreamermm/trunk/gstreamer/src/event.hg
   gstreamermm/trunk/gstreamer/src/ghostpad.ccg
   gstreamermm/trunk/gstreamer/src/ghostpad.hg
   gstreamermm/trunk/gstreamer/src/index.hg
   gstreamermm/trunk/gstreamer/src/indexfactory.hg
   gstreamermm/trunk/gstreamer/src/interface.hg
   gstreamermm/trunk/gstreamer/src/message.ccg
   gstreamermm/trunk/gstreamer/src/message.hg
   gstreamermm/trunk/gstreamer/src/pad.ccg
   gstreamermm/trunk/gstreamer/src/pad.hg
   gstreamermm/trunk/gstreamer/src/padtemplate.hg
   gstreamermm/trunk/gstreamer/src/parse.ccg
   gstreamermm/trunk/gstreamer/src/parse.hg
   gstreamermm/trunk/gstreamer/src/pipeline.hg
   gstreamermm/trunk/gstreamer/src/plugin.hg
   gstreamermm/trunk/gstreamer/src/pluginfeature.hg
   gstreamermm/trunk/gstreamer/src/query.ccg
   gstreamermm/trunk/gstreamer/src/query.hg
   gstreamermm/trunk/gstreamer/src/registry.ccg
   gstreamermm/trunk/gstreamer/src/registry.hg
   gstreamermm/trunk/gstreamer/src/systemclock.hg
   gstreamermm/trunk/gstreamer/src/taglist.hg
   gstreamermm/trunk/gstreamer/src/tagsetter.hg
   gstreamermm/trunk/gstreamer/src/urihandler.hg
   gstreamermm/trunk/gstreamer/src/xml.ccg
   gstreamermm/trunk/gstreamer/src/xml.hg
   gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment
   gstreamermm/trunk/gstreamerbase/src/generate-enums.sh
   gstreamermm/trunk/gstreamerbase/src/generate-extra-defs.sh
   gstreamermm/trunk/gstreamerbase/src/generate-methods.sh
   gstreamermm/trunk/gstreamerbase/src/gstbase_enums.defs
   gstreamermm/trunk/gstreamerbase/src/gstbase_methods.defs
   gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs
   gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gstbase.cc
   gstreamermm/trunk/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
   gstreamermm/trunk/tools/m4/convert_gst.m4
   gstreamermm/trunk/tools/m4/convert_gstbase.m4

Modified: gstreamermm/trunk/gstreamer/src/basesink.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/basesink.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/basesink.hg	Fri Dec 12 03:49:44 2008
@@ -159,14 +159,14 @@
   //TODO: Doesn't compile with GStreamer 0.10.20:
   //_WRAP_METHOD(ClockTime get_render_delay(), gst_base_sink_get_render_delay)
 
-  _WRAP_METHOD(Glib::RefPtr<Buffer> get_last_buffer(), gst_base_sink_get_last_buffer)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Buffer> get_last_buffer(), gst_base_sink_get_last_buffer)
 
   /** Gets the sink Gst::Pad object of the element.
    */
-  _MEMBER_GET(sink_pad, sinkpad, Glib::RefPtr<Pad>, GstPad*)
+  _MEMBER_GET(sink_pad, sinkpad, Glib::RefPtr<Gst::Pad>, GstPad*)
 
   _WRAP_PROPERTY("async", bool)
-  _WRAP_PROPERTY("last-buffer", Glib::RefPtr<Buffer>)
+  _WRAP_PROPERTY("last-buffer", Glib::RefPtr<Gst::Buffer>)
   _WRAP_PROPERTY("max-lateness", gint64)
   _WRAP_PROPERTY("preroll-queue-len", guint)
   _WRAP_PROPERTY("qos", bool)
@@ -181,25 +181,25 @@
   //to be specified for the callback, in which case the bool vfuncs can be made
   //to return true which would then work.
 
-#m4 _CONVERSION(`Glib::RefPtr<Caps>', `GstCaps*', `($3)->gobj()')
+#m4 _CONVERSION(`Glib::RefPtr<Gst::Caps>', `GstCaps*', `($3)->gobj()')
   /** Called to get sink pad caps from the subclass.
    */
-  _WRAP_VFUNC(Glib::RefPtr<Caps> get_caps(), "get_caps")
+  _WRAP_VFUNC(Glib::RefPtr<Gst::Caps> get_caps(), "get_caps")
 
-#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Caps>&', `Glib::wrap($3)')
+#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3)')
   ///** Notify subclass of changed caps.
    //*/
-  //_WRAP_VFUNC(bool set_caps(const Glib::RefPtr<Caps>& caps), "set_caps")
+  //_WRAP_VFUNC(bool set_caps(const Glib::RefPtr<Gst::Caps>& caps), "set_caps")
 
-//TODO: #m4 _CONVERSION(`Glib::RefPtr<Buffer>&', `GstBuffer**', `*($3)')
-  //_WRAP_VFUNC(FlowReturn buffer_alloc(guint64 offset, guint size, Glib::RefPtr<Buffer>& buffer), "buffer_alloc")
+//TODO: #m4 _CONVERSION(`Glib::RefPtr<Gst::Buffer>&', `GstBuffer**', `*($3)')
+  //_WRAP_VFUNC(FlowReturn buffer_alloc(guint64 offset, guint size, Glib::RefPtr<Gst::Buffer>& buffer), "buffer_alloc")
 
-#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Buffer>&', `Gst::wrap($3)')
+#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Gst::wrap($3)')
 #m4 _CONVERSION(`GstClockTime*', `ClockTime&', `*($3)')
   /** Called to get the start and end times for synchronising the passed buffer
    * to the clock.
    */
-  _WRAP_VFUNC(void get_times(const Glib::RefPtr<Buffer>& buffer, ClockTime& start, ClockTime& end), "get_times")
+  _WRAP_VFUNC(void get_times(const Glib::RefPtr<Gst::Buffer>& buffer, ClockTime& start, ClockTime& end), "get_times")
 
   ///** Start processing. Ideal for opening resources in the subclass.
    //*/
@@ -216,16 +216,16 @@
 
   ///** Override this to handle events arriving on the sink pad.
    //*/
-  //_WRAP_VFUNC(bool event(const Glib::RefPtr<Event>& event), "event")
+  //_WRAP_VFUNC(bool event(const Glib::RefPtr<Gst::Event>& event), "event")
 
   /** Called to present the preroll buffer if desired.
    */
-  _WRAP_VFUNC(FlowReturn preroll(const Glib::RefPtr<Buffer>& buffer), "preroll")
+  _WRAP_VFUNC(FlowReturn preroll(const Glib::RefPtr<Gst::Buffer>& buffer), "preroll")
 
   /** Called when a buffer should be presented or output, at the correct moment
    * if the Gst::BaseSink has been set to sync to the clock.
    */
-  _WRAP_VFUNC(FlowReturn render(const Glib::RefPtr<Buffer>& buffer), "render")
+  _WRAP_VFUNC(FlowReturn render(const Glib::RefPtr<Gst::Buffer>& buffer), "render")
 
   /** Subclasses should override this when they need to perform special
    * processing when changing to the PLAYING state asynchronously. Called with
@@ -246,7 +246,7 @@
    * have ideas about what should be the default values for the caps you
    * support.
    */
-  _WRAP_VFUNC(void fixate(const Glib::RefPtr<Caps>& caps), "fixate")
+  _WRAP_VFUNC(void fixate(const Glib::RefPtr<Gst::Caps>& caps), "fixate")
 
   ///** Clear the previous unlock request. Subclasses should clear any state they
    //* set during unlock_vfunc(), such as clearing command queues.

Modified: gstreamermm/trunk/gstreamer/src/basesrc.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/basesrc.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/basesrc.hg	Fri Dec 12 03:49:44 2008
@@ -156,7 +156,7 @@
 
   /** Gets the source Gst::Pad object of the element.
    */
-  _MEMBER_GET(src_pad, srcpad, Glib::RefPtr<Pad>, GstPad*)
+  _MEMBER_GET(src_pad, srcpad, Glib::RefPtr<Gst::Pad>, GstPad*)
 
   _WRAP_PROPERTY("blocksize", gulong)
   _WRAP_PROPERTY("do-timestamp", bool)
@@ -171,15 +171,15 @@
   //to be specified for the callback, in which case the bool vfuncs can be made
   //to return true which would then work.
 
-#m4 _CONVERSION(`Glib::RefPtr<Caps>', `GstCaps*', `($3)->gobj()')
+#m4 _CONVERSION(`Glib::RefPtr<Gst::Caps>', `GstCaps*', `($3)->gobj()')
   /** Called to get the caps to report.
    */
-  _WRAP_VFUNC(Glib::RefPtr<Caps> get_caps(), "get_caps")
+  _WRAP_VFUNC(Glib::RefPtr<Gst::Caps> get_caps(), "get_caps")
 
-#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Caps>&', `Glib::wrap($3)')
+#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3)')
   ///** Notify subclass of changed output caps.
    //*/
-  //_WRAP_VFUNC(bool set_caps(const Glib::RefPtr<Caps>& caps), "set_caps")
+  //_WRAP_VFUNC(bool set_caps(const Glib::RefPtr<Gst::Caps>& caps), "set_caps")
 
   ///** Negotiated the caps with the peer.
    //*/
@@ -198,12 +198,12 @@
    //*/
   //_WRAP_VFUNC(bool stop(), "stop")
 
-#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Buffer>&', `Gst::wrap($3)')
+#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Gst::wrap($3)')
 #m4 _CONVERSION(`GstClockTime*', `ClockTime&', `*($3)')
   /** Given a buffer, return the start and stop time when it should be pushed
    * out. The base class will sync on the clock using these times.
    */
-  _WRAP_VFUNC(void get_times(const Glib::RefPtr<Buffer>& buffer, ClockTime& start, ClockTime& end), "get_times")
+  _WRAP_VFUNC(void get_times(const Glib::RefPtr<Gst::Buffer>& buffer, ClockTime& start, ClockTime& end), "get_times")
 
 #m4 _CONVERSION(`guint64&', `guint64*', `&($3)')
 #m4 _CONVERSION(`guint64*', `guint64&', `*($3)')
@@ -222,10 +222,10 @@
 
   ///** Override this to implement custom event handling.
    //*/
-  //_WRAP_VFUNC(bool event(const Glib::RefPtr<Event>& event), "event")
+  //_WRAP_VFUNC(bool event(const Glib::RefPtr<Gst::Event>& event), "event")
 
-//TODO: #m4 _CONVERSION(`Glib::RefPtr<Buffer>&', `GstBuffer**', `*($3)')
-  //_WRAP_VFUNC(FlowReturn create(guint64 offset, guint size, Glib::RefPtr<Buffer>& buffer), "create")
+//TODO: #m4 _CONVERSION(`Glib::RefPtr<Gst::Buffer>&', `GstBuffer**', `*($3)')
+  //_WRAP_VFUNC(FlowReturn create(guint64 offset, guint size, Glib::RefPtr<Gst::Buffer>& buffer), "create")
 
 #m4 _CONVERSION(`Segment', `GstSegment*', `($3).gobj()')
 #m4 _CONVERSION(`GstSegment*', `Segment', `Glib::wrap($3)')
@@ -235,7 +235,7 @@
 
   ///** Handle a requested query.
    //*/
-  //_WRAP_VFUNC(bool query(const Glib::RefPtr<Query>& query), "query")
+  //_WRAP_VFUNC(bool query(const Glib::RefPtr<Gst::Query>& query), "query")
 
   ///** Check whether the source would support pull-based operation if it were to
    //* be opened now. This vfunc is optional, but should be implemented if
@@ -248,7 +248,7 @@
   /** Called during negotiation if caps need fixating. Implement instead of
    * setting a fixate function on the source pad.
    */
-  _WRAP_VFUNC(void fixate(const Glib::RefPtr<Caps>& caps), "fixate")
+  _WRAP_VFUNC(void fixate(const Glib::RefPtr<Gst::Caps>& caps), "fixate")
 
   ///** Clear the previous unlock request. Subclasses should clear any state they
    //* set during unlock_vfunc(), such as clearing command queues.
@@ -261,7 +261,7 @@
    //* default, it tries to convert the seek arguments to the configured native
    //* format and prepare a segment in that format.
    //*/
-  //_WRAP_VFUNC(bool prepare_seek_segment(const Glib::RefPtr<Event>& seek, Segment segment), "prepare_seek_segment")
+  //_WRAP_VFUNC(bool prepare_seek_segment(const Glib::RefPtr<Gst::Event>& seek, Segment segment), "prepare_seek_segment")
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/basetransform.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/basetransform.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/basetransform.hg	Fri Dec 12 03:49:44 2008
@@ -163,11 +163,11 @@
 
   /** Gives the refptr to the sink Gst::Pad object of the element.
    */
-  _MEMBER_GET(sink_pad, sinkpad, Glib::RefPtr<Pad>, GstPad*)
+  _MEMBER_GET(sink_pad, sinkpad, Glib::RefPtr<Gst::Pad>, GstPad*)
 
   /** Gives the refptr to the source Gst::Pad object of the element.
    */
-  _MEMBER_GET(src_pad, srcpad, Glib::RefPtr<Pad>, GstPad*)
+  _MEMBER_GET(src_pad, srcpad, Glib::RefPtr<Gst::Pad>, GstPad*)
 
   _WRAP_PROPERTY("qos", bool)
 
@@ -179,33 +179,33 @@
   //to be specified for the callback, in which case the bool vfuncs can be made
   //to return true which would then work.
 
-#m4 _CONVERSION(`Glib::RefPtr<Caps>', `GstCaps*', `($3)->gobj()')
-#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Caps>&', `Glib::wrap($3)')
+#m4 _CONVERSION(`Glib::RefPtr<Gst::Caps>', `GstCaps*', `($3)->gobj()')
+#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3)')
   /** Optional. Given the pad in this direction and the given caps, what caps
    * are allowed on the other pad in this element ?
    */
-  _WRAP_VFUNC(Glib::RefPtr<Caps> transform_caps(PadDirection direction, const Glib::RefPtr<Caps>& caps), "transform_caps")
+  _WRAP_VFUNC(Glib::RefPtr<Gst::Caps> transform_caps(PadDirection direction, const Glib::RefPtr<Gst::Caps>& caps), "transform_caps")
 
   /** Optional. Given the pad in this direction and the given caps, fixate the
    * caps on the other pad.
    */
-  _WRAP_VFUNC(void fixate_caps(PadDirection direction, const Glib::RefPtr<Caps>& caps, const Glib::RefPtr<Caps>& othercaps), "fixate_caps")
+  _WRAP_VFUNC(void fixate_caps(PadDirection direction, const Glib::RefPtr<Gst::Caps>& caps, const Glib::RefPtr<Gst::Caps>& othercaps), "fixate_caps")
 
   ///** Optional. Given the size of a buffer in the given direction with the
    //* given caps, calculate the size in bytes of a buffer on the other pad with
    //* the given other caps. The default implementation uses
    //* get_unit_size_vfunc() and keeps the number of units the same.
    //*/
-  //_WRAP_VFUNC(bool transform_size(PadDirection direction, const Glib::RefPtr<Caps>& caps, guint size, const Glib::RefPtr<Caps>& othercaps, guint* othersize), "transform_size")
+  //_WRAP_VFUNC(bool transform_size(PadDirection direction, const Glib::RefPtr<Gst::Caps>& caps, guint size, const Glib::RefPtr<Gst::Caps>& othercaps, guint* othersize), "transform_size")
 
   ///** Required if the transform is not in-place. Get the size in bytes of one
    //* unit for the given caps.
    //*/
-  //_WRAP_VFUNC(bool get_unit_size(const Glib::RefPtr<Caps>& caps, guint* size), "get_unit_size")
+  //_WRAP_VFUNC(bool get_unit_size(const Glib::RefPtr<Gst::Caps>& caps, guint* size), "get_unit_size")
 
   ///** Allows the subclass to be notified of the actual caps set.
    //*/
-  //_WRAP_VFUNC(bool set_caps(const Glib::RefPtr<Caps>& incaps, const Glib::RefPtr<Caps>& outcaps), "set_caps")
+  //_WRAP_VFUNC(bool set_caps(const Glib::RefPtr<Gst::Caps>& incaps, const Glib::RefPtr<Gst::Caps>& outcaps), "set_caps")
 
   ///** Optional. Called when the element starts processing. Allows opening
    //* external resources.
@@ -220,30 +220,30 @@
   ///** Optional. Event handler on the sink pad. This function should return TRUE
    //* if the base class should forward the event.
    //*/
-  //_WRAP_VFUNC(bool event(const Glib::RefPtr<Event>& event), "event")
+  //_WRAP_VFUNC(bool event(const Glib::RefPtr<Gst::Event>& event), "event")
 
-#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Buffer>&', `Gst::wrap($3)')
+#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Gst::wrap($3)')
   /** Required if the element does not operate in-place. Transforms one
    * incoming buffer to one outgoing buffer. The function is allowed to change
    * size/timestamp/duration of the outgoing buffer.
    */
-  _WRAP_VFUNC(FlowReturn transform(const Glib::RefPtr<Buffer>& inbuf, const Glib::RefPtr<Buffer>& outbuf), "transform")
+  _WRAP_VFUNC(FlowReturn transform(const Glib::RefPtr<Gst::Buffer>& inbuf, const Glib::RefPtr<Gst::Buffer>& outbuf), "transform")
 
   /** Required if the element operates in-place. Transform the incoming buffer
    * in-place.
    */
-  _WRAP_VFUNC(FlowReturn transform_ip(const Glib::RefPtr<Buffer>& buf), "transform_ip")
+  _WRAP_VFUNC(FlowReturn transform_ip(const Glib::RefPtr<Gst::Buffer>& buf), "transform_ip")
 
   //TODO: Should "passthrough_on_same_caps" variable in GstBaseTransformClass
   //be wrapped?
 
-//TODO: #m4 _CONVERSION(`Glib::RefPtr<Buffer>&', `GstBuffer**', `&(($3)->gobj())')
-//#m4 _CONVERSION(`GstBuffer**', `Glib::RefPtr<Buffer>&', `Gst::wrap(*($3))')
-  //_WRAP_VFUNC(FlowReturn prepare_output_buffer(const Glib::RefPtr<Buffer>& input, int size, const Glib::RefPtr<Caps>& caps, Glib::RefPtr<Buffer>&), "prepare_output_buffer")
+//TODO: #m4 _CONVERSION(`Glib::RefPtr<Gst::Buffer>&', `GstBuffer**', `&(($3)->gobj())')
+//#m4 _CONVERSION(`GstBuffer**', `Glib::RefPtr<Gst::Buffer>&', `Gst::wrap(*($3))')
+  //_WRAP_VFUNC(FlowReturn prepare_output_buffer(const Glib::RefPtr<Gst::Buffer>& input, int size, const Glib::RefPtr<Gst::Caps>& caps, Glib::RefPtr<Gst::Buffer>&), "prepare_output_buffer")
 
   ///** Optional. Event handler on the source pad.
    //*/
-  //_WRAP_VFUNC(bool src_event(const Glib::RefPtr<Event>& event), "src_event")
+  //_WRAP_VFUNC(bool src_event(const Glib::RefPtr<Gst::Event>& event), "src_event")
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/bin.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/bin.ccg	Fri Dec 12 03:49:44 2008
@@ -36,7 +36,7 @@
 {}
 
 
-Glib::RefPtr<Bin> Bin::add(const Glib::RefPtr<Element>& element)
+Glib::RefPtr<Gst::Bin> Bin::add(const Glib::RefPtr<Gst::Element>& element)
 {
   // The following is needed because when adding an element to a bin, the bin
   // likes to have the last reference and then destroy it when the bin itself
@@ -58,7 +58,7 @@
     throw std::runtime_error("Failed to add " + element->get_name() + " element");
 }
 
-Glib::RefPtr<Bin> Bin::remove(const Glib::RefPtr<Element>& element)
+Glib::RefPtr<Gst::Bin> Bin::remove(const Glib::RefPtr<Gst::Element>& element)
 {
   const bool result = gst_bin_remove(gobj(), element->gobj());
 
@@ -67,7 +67,7 @@
   if(result)
     return Glib::wrap(gobj(), true);
   else
-    return Glib::RefPtr<Bin>(0);
+    return Glib::RefPtr<Gst::Bin>(0);
 }
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/bin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/bin.hg	Fri Dec 12 03:49:44 2008
@@ -163,7 +163,7 @@
    *
    * @throws std::runtime_error if the Bin does not want to accept the Element.
    */
-  Glib::RefPtr<Bin> add(const Glib::RefPtr<Element>& element);
+  Glib::RefPtr<Gst::Bin> add(const Glib::RefPtr<Gst::Element>& element);
   _IGNORE(gst_bin_add, gst_bin_add_many)
 
   /** Removes the element from the bin, unparenting it as well. Unparenting the
@@ -180,64 +180,64 @@
    * Returns this Gst::Bin if successful (for further removing if wanted), NULL
    * otherwise
    */
-  Glib::RefPtr<Bin> remove(const Glib::RefPtr<Element>& element);
+  Glib::RefPtr<Gst::Bin> remove(const Glib::RefPtr<Gst::Element>& element);
   _IGNORE(gst_bin_remove, gst_bin_remove_many)
 
   //We could add a bool recurse_up = false parameter, 
   //but get_element() and get_element_recurse_up() seem different enough to be separate.
   //One recurses down and the other recurses up, so it's not just additional behaviour. 
-  _WRAP_METHOD(Glib::RefPtr<Element> get_element(const Glib::ustring& name), gst_bin_get_by_name)
-  _WRAP_METHOD(Glib::RefPtr<const Element> get_element(const Glib::ustring& name) const, gst_bin_get_by_name)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Element> get_element(const Glib::ustring& name), gst_bin_get_by_name)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Element> get_element(const Glib::ustring& name) const, gst_bin_get_by_name)
 
-  _WRAP_METHOD(Glib::RefPtr<Element> get_element_recurse_up(const Glib::ustring& name), gst_bin_get_by_name_recurse_up)
-  _WRAP_METHOD(Glib::RefPtr<const Element> get_element_recurse_up(const Glib::ustring& name) const, gst_bin_get_by_name_recurse_up)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Element> get_element_recurse_up(const Glib::ustring& name), gst_bin_get_by_name_recurse_up)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Element> get_element_recurse_up(const Glib::ustring& name) const, gst_bin_get_by_name_recurse_up)
  
-  _WRAP_METHOD(Glib::RefPtr<Element> get_element(GType interface), gst_bin_get_by_interface)
-  _WRAP_METHOD(Glib::RefPtr<const Element> get_element(GType interface) const, gst_bin_get_by_interface)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Element> get_element(GType interface), gst_bin_get_by_interface)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Element> get_element(GType interface) const, gst_bin_get_by_interface)
 
-  _WRAP_METHOD(Glib::RefPtr<Pad> find_unlinked_pad(PadDirection dir), gst_bin_find_unlinked_pad)
-  _WRAP_METHOD(Glib::RefPtr<const Pad> find_unlinked_pad(PadDirection dir) const, gst_bin_find_unlinked_pad)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Pad> find_unlinked_pad(PadDirection dir), gst_bin_find_unlinked_pad)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Pad> find_unlinked_pad(PadDirection dir) const, gst_bin_find_unlinked_pad)
   _IGNORE(gst_bin_find_unconnected_pad)
 
-  _WRAP_METHOD(Iterator<Element> iterate_elements(), gst_bin_iterate_elements)
-  _WRAP_METHOD(Iterator<Element> iterate_recurse(), gst_bin_iterate_recurse)
-  _WRAP_METHOD(Iterator<Element> iterate_sorted(), gst_bin_iterate_sorted)
-  _WRAP_METHOD(Iterator<Element> iterate_sources(), gst_bin_iterate_sources)
-  _WRAP_METHOD(Iterator<Element> iterate_sinks(), gst_bin_iterate_sinks)
-  _WRAP_METHOD(Iterator<Element> iterate_by_interface(GType iface), gst_bin_iterate_all_by_interface)
+  _WRAP_METHOD(Gst::Iterator<Gst::Element> iterate_elements(), gst_bin_iterate_elements)
+  _WRAP_METHOD(Gst::Iterator<Gst::Element> iterate_recurse(), gst_bin_iterate_recurse)
+  _WRAP_METHOD(Gst::Iterator<Gst::Element> iterate_sorted(), gst_bin_iterate_sorted)
+  _WRAP_METHOD(Gst::Iterator<Gst::Element> iterate_sources(), gst_bin_iterate_sources)
+  _WRAP_METHOD(Gst::Iterator<Gst::Element> iterate_sinks(), gst_bin_iterate_sinks)
+  _WRAP_METHOD(Gst::Iterator<Gst::Element> iterate_by_interface(GType iface), gst_bin_iterate_all_by_interface)
 
-#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Element> >',`$2($3, Glib::OWNERSHIP_SHALLOW)')
+#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Gst::Element> >',`$2($3, Glib::OWNERSHIP_SHALLOW)')
   /** Gets the bin's list of children.
    */
-  _MEMBER_GET(children, children, Glib::ListHandle< Glib::RefPtr<Element> >, GList*)
+  _MEMBER_GET(children, children, Glib::ListHandle< Glib::RefPtr<Gst::Element> >, GList*)
 
   /** Gets the number of children in the bin.
    */
   _MEMBER_GET(num_children, numchildren, int, int)
 
-#m4 _CONVERSION(`GstElement*',`const Glib::RefPtr<Element>&', `Glib::wrap($3, true)')
+#m4 _CONVERSION(`GstElement*',`const Glib::RefPtr<Gst::Element>&', `Glib::wrap($3, true)')
 
   /** Will be emitted after the element was added to the bin.
    */
-  _WRAP_SIGNAL(void element_added(const Glib::RefPtr<Element>& element), "element-added")
+  _WRAP_SIGNAL(void element_added(const Glib::RefPtr<Gst::Element>& element), "element-added")
 
   /** Will be emitted after the element was removed from the bin.
    */
-  _WRAP_SIGNAL(void element_removed(const Glib::RefPtr<Element>& element), "element-removed")
+  _WRAP_SIGNAL(void element_removed(const Glib::RefPtr<Gst::Element>& element), "element-removed")
 
   _WRAP_PROPERTY("async-handling", bool)
 
   /** Method to add an element to a bin.
    */
-  _WRAP_VFUNC(bool add_element(const Glib::RefPtr<Element>& element), "add_element")
+  _WRAP_VFUNC(bool add_element(const Glib::RefPtr<Gst::Element>& element), "add_element")
 
   /** Method to remove an element from a bin.
    */
-  _WRAP_VFUNC(bool remove_element(const Glib::RefPtr<Element>& element), "remove_element")
+  _WRAP_VFUNC(bool remove_element(const Glib::RefPtr<Gst::Element>& element), "remove_element")
 
   /** Method to handle a message from the children.
    */
-  _WRAP_VFUNC(void handle_message(const Glib::RefPtr<Message>& message), "handle_message")
+  _WRAP_VFUNC(void handle_message(const Glib::RefPtr<Gst::Message>& message), "handle_message")
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/buffer.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/buffer.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/buffer.ccg	Fri Dec 12 03:49:44 2008
@@ -28,12 +28,12 @@
 namespace Gst
 {
 
-Glib::RefPtr<Buffer> Buffer::copy() const
+Glib::RefPtr<Gst::Buffer> Buffer::copy() const
 {
   return Gst::wrap(gst_buffer_copy(gobj()));
 }
 
-Glib::RefPtr<Buffer> Buffer::create_writable()
+Glib::RefPtr<Gst::Buffer> Buffer::create_writable()
 {
   return Gst::wrap(gst_buffer_make_writable(gobj()));
 }

Modified: gstreamermm/trunk/gstreamer/src/buffer.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/buffer.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/buffer.hg	Fri Dec 12 03:49:44 2008
@@ -50,16 +50,16 @@
   _CLASS_GSTMINIOBJECT(Buffer, GstBuffer, GST_BUFFER, Gst::MiniObject, GstMiniObject)
 
 public:
-  _WRAP_METHOD(static Glib::RefPtr<Buffer> create(), gst_buffer_new)
-  _WRAP_METHOD(static Glib::RefPtr<Buffer> create(guint size), gst_buffer_try_new_and_alloc)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Buffer> create(), gst_buffer_new)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Buffer> create(guint size), gst_buffer_try_new_and_alloc)
 
   /** Create a copy of the given buffer. This will also make a newly allocated
    * copy of the data the source buffer contains.
    * @return The Gst::Buffer copy.
    */
-  Glib::RefPtr<Buffer> copy() const;
+  Glib::RefPtr<Gst::Buffer> copy() const;
 
-  _WRAP_METHOD(void copy_metadata(const Glib::RefPtr<Buffer>& source_buffer, BufferCopyFlags flags), gst_buffer_copy_metadata)
+  _WRAP_METHOD(void copy_metadata(const Glib::RefPtr<Gst::Buffer>& source_buffer, BufferCopyFlags flags), gst_buffer_copy_metadata)
   _WRAP_METHOD(bool is_metadata_writable() const, gst_buffer_is_metadata_writable)
 
   /** Makes a writable buffer from the given buffer. If the source buffer is
@@ -67,27 +67,27 @@
    * otherwise be made.
    * @return A buffer (possibly the same pointer) that is writable.
    */
-  Glib::RefPtr<Buffer> create_writable();
+  Glib::RefPtr<Gst::Buffer> create_writable();
 
   //This is const because it always returns a new buffer:
-  _WRAP_METHOD(Glib::RefPtr<Buffer> make_metadata_writable() const, gst_buffer_make_metadata_writable)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Buffer> make_metadata_writable() const, gst_buffer_make_metadata_writable)
 
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_caps(), gst_buffer_get_caps)
-  _WRAP_METHOD(Glib::RefPtr<const Caps > get_caps() const, gst_buffer_get_caps, constversion)
-  _WRAP_METHOD(void set_caps(const Glib::RefPtr<Caps>& caps), gst_buffer_set_caps)
-  _WRAP_METHOD(Glib::RefPtr<Buffer> create_sub(const guint& offset, const guint& size), gst_buffer_create_sub)
-  _WRAP_METHOD(Glib::RefPtr<const Buffer > create_sub(const guint& offset, const guint& size) const, gst_buffer_create_sub, constversion)
-  _WRAP_METHOD(bool is_span_fast(const Glib::RefPtr<const Buffer>& other_buffer) const, gst_buffer_is_span_fast)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> get_caps(), gst_buffer_get_caps)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Caps > get_caps() const, gst_buffer_get_caps, constversion)
+  _WRAP_METHOD(void set_caps(const Glib::RefPtr<Gst::Caps>& caps), gst_buffer_set_caps)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Buffer> create_sub(const guint& offset, const guint& size), gst_buffer_create_sub)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Buffer > create_sub(const guint& offset, const guint& size) const, gst_buffer_create_sub, constversion)
+  _WRAP_METHOD(bool is_span_fast(const Glib::RefPtr<const Gst::Buffer>& other_buffer) const, gst_buffer_is_span_fast)
 
   //This is const because it always returns a new buffer:
-  _WRAP_METHOD(Glib::RefPtr<Buffer> span(const guint32& offset, const Glib::RefPtr<Buffer>& other_buffer, const guint32& len) const, gst_buffer_span)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Buffer> span(const guint32& offset, const Glib::RefPtr<Gst::Buffer>& other_buffer, const guint32& len) const, gst_buffer_span)
 
   //We ignore gst_buffer_join() because it is just a C convenience function.
   //It is gst_buffer_merge() with unrefs.
   _IGNORE(gst_buffer_join)
 
   //This is const because it always returns a new buffer:
-  _WRAP_METHOD(Glib::RefPtr<Buffer> merge(const Glib::RefPtr<const Buffer>& other_buffer) const, gst_buffer_merge)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Buffer> merge(const Glib::RefPtr<const Gst::Buffer>& other_buffer) const, gst_buffer_merge)
 
   /** Get the data element of this buffer.
    * @returns A pointer to the data element of this buffer.

Modified: gstreamermm/trunk/gstreamer/src/bus.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bus.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/bus.hg	Fri Dec 12 03:49:44 2008
@@ -96,13 +96,13 @@
    * The message function should return true if it wants to continue to receive
    * messages, or false otherwise.
    */
-  typedef sigc::slot< bool, const Glib::RefPtr<Bus>&, const Glib::RefPtr<Message>& > SlotMessage;
+  typedef sigc::slot< bool, const Glib::RefPtr<Gst::Bus>&, const Glib::RefPtr<Gst::Message>& > SlotMessage;
 
   /** For example,
    * BusSyncReply on_bus_sync_message(const Glib::RefPtr<Gst::Bus>& bus, const
    * Glib::RefPtr<Gst::Message>& message);.
    */
-  typedef sigc::slot< BusSyncReply, const Glib::RefPtr<Bus>&, const Glib::RefPtr<Message>& > SlotMessageSync;
+  typedef sigc::slot< BusSyncReply, const Glib::RefPtr<Gst::Bus>&, const Glib::RefPtr<Gst::Message>& > SlotMessageSync;
 
   /** Creates a new Gst::Bus instance.
    *
@@ -110,16 +110,16 @@
    */
   _WRAP_CREATE()
 
-  _WRAP_METHOD(bool post(const Glib::RefPtr<Message>& message), gst_bus_post)
+  _WRAP_METHOD(bool post(const Glib::RefPtr<Gst::Message>& message), gst_bus_post)
   _WRAP_METHOD(bool have_pending() const, gst_bus_have_pending)
 
-  _WRAP_METHOD(Glib::RefPtr<Message> peek(), gst_bus_peek)
-  _WRAP_METHOD(Glib::RefPtr<const Message> peek() const, gst_bus_peek)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Message> peek(), gst_bus_peek)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Message> peek() const, gst_bus_peek)
 
-  _WRAP_METHOD(Glib::RefPtr<Message> pop(), gst_bus_pop)
-  _WRAP_METHOD(Glib::RefPtr<Message> pop(MessageType message_type), gst_bus_pop_filtered)
-  _WRAP_METHOD(Glib::RefPtr<Message> pop(ClockTime timeout), gst_bus_timed_pop)
-  _WRAP_METHOD(Glib::RefPtr<Message> pop(ClockTime timeout, MessageType message_type), gst_bus_timed_pop_filtered)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Message> pop(), gst_bus_pop)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Message> pop(MessageType message_type), gst_bus_pop_filtered)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Message> pop(ClockTime timeout), gst_bus_timed_pop)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Message> pop(ClockTime timeout, MessageType message_type), gst_bus_timed_pop_filtered)
 
   _WRAP_METHOD(void set_flushing(bool flushing = true), gst_bus_set_flushing)
 
@@ -164,15 +164,15 @@
   _IGNORE(gst_bus_add_signal_watch)
 
   _WRAP_METHOD(void remove_signal_watch(), gst_bus_remove_signal_watch)
-  _WRAP_METHOD(Glib::RefPtr<Message> poll(MessageType message_type, ClockTimeDiff timeout), gst_bus_poll)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Message> poll(MessageType message_type, ClockTimeDiff timeout), gst_bus_poll)
 
-#m4 _CONVERSION(`GstMessage*',`const Glib::RefPtr<Message>&', `Gst::Message::wrap($3, true)')
+#m4 _CONVERSION(`GstMessage*',`const Glib::RefPtr<Gst::Message>&', `Gst::Message::wrap($3, true)')
 
   /** A message has been posted on the bus. This signal is emitted from a
    * GSource added to the mainloop. this signal will only be emitted when there
    * is a mainloop running.
    */
-  _WRAP_SIGNAL(void message(const Glib::RefPtr<Message>& message), "message")
+  _WRAP_SIGNAL(void message(const Glib::RefPtr<Gst::Message>& message), "message")
 
   /** A message has been posted on the bus. This signal is emitted from the
    * thread that posted the message so one has to be careful with locking.
@@ -181,7 +181,7 @@
    * enable_sync_message_emission().
    *
    */
-  _WRAP_SIGNAL(void sync_message(const Glib::RefPtr<Message>& message), "sync-message")
+  _WRAP_SIGNAL(void sync_message(const Glib::RefPtr<Gst::Message>& message), "sync-message")
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/caps.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/caps.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/caps.ccg	Fri Dec 12 03:49:44 2008
@@ -30,7 +30,7 @@
   return gst_caps_get_type();
 }
 
-Glib::RefPtr<Caps> Caps::create_any()
+Glib::RefPtr<Gst::Caps> Caps::create_any()
 {
   return Glib::wrap(gst_caps_new_any());
 }
@@ -41,15 +41,15 @@
   creates a GstStructure for the GstCaps and will not be called, we must create
   our own GstStructure here and append it to the GstCaps.
 */
-Glib::RefPtr<Caps> Caps::create_simple(const Glib::ustring& media_type)
+Glib::RefPtr<Gst::Caps> Caps::create_simple(const Glib::ustring& media_type)
 {
-  Glib::RefPtr<Caps> result = Glib::wrap(gst_caps_new_empty());
+  Glib::RefPtr<Gst::Caps> result = Glib::wrap(gst_caps_new_empty());
   GstStructure* gst_struct = gst_structure_empty_new(media_type.c_str());
   gst_caps_append_structure(result->gobj(), gst_struct);
   return result;
 }
 
-Glib::RefPtr<Caps> Caps::create(const Structure& structure)
+Glib::RefPtr<Gst::Caps> Caps::create(const Structure& structure)
 {
   //We take a copy because gst_caps_append_structure() wants to take ownership:
   GstStructure* copy = gst_structure_copy(structure.gobj());
@@ -90,7 +90,7 @@
   value to be set instead of listing out each field in the value as would be
   done with gst_caps_set_simple()
 */
-//Glib::RefPtr<Caps>
+//Glib::RefPtr<Gst::Caps>
 void
 Caps::set_simple(const Glib::ustring& name, const Glib::ValueBase& value)
 {

Modified: gstreamermm/trunk/gstreamer/src/caps.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/caps.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/caps.hg	Fri Dec 12 03:49:44 2008
@@ -72,14 +72,14 @@
    *
    * @return The new Gst::Caps.
    */
-  static Glib::RefPtr<Caps> create_any();
+  static Glib::RefPtr<Gst::Caps> create_any();
 
   /** Creates a new Gst::Caps that contains one Gst::Structure.
    *
    * @param media_type The media type of the structure.
    * @return The new Gst::Caps.
    */
-  static Glib::RefPtr<Caps> create_simple(const Glib::ustring& media_type);
+  static Glib::RefPtr<Gst::Caps> create_simple(const Glib::ustring& media_type);
 
   /** Creates a new Gst::Caps and adds the given Gst::Structure.
    * Use append_structure() to add additional structures.
@@ -87,14 +87,14 @@
    * @param first_struct The first structure to add.
    * @return Returns the new Gst::Caps.
    */
-  static Glib::RefPtr<Caps> create(const Structure& first_struct);
+  static Glib::RefPtr<Gst::Caps> create(const Structure& first_struct);
 
-  _WRAP_METHOD(static Glib::RefPtr<Caps> create_from_string(const Glib::ustring& string), gst_caps_from_string)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Caps> create_from_string(const Glib::ustring& string), gst_caps_from_string)
 
-  _WRAP_METHOD(Glib::RefPtr<Caps> copy() const, gst_caps_copy)
-  _WRAP_METHOD(Glib::RefPtr<Caps> copy_nth(guint nth) const, gst_caps_copy_nth)
-  _WRAP_METHOD(void append(const Glib::RefPtr<Caps>& caps), gst_caps_append)
-  _WRAP_METHOD(void merge(const Glib::RefPtr<Caps>& caps), gst_caps_merge)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> copy() const, gst_caps_copy)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> copy_nth(guint nth) const, gst_caps_copy_nth)
+  _WRAP_METHOD(void append(const Glib::RefPtr<Gst::Caps>& caps), gst_caps_append)
+  _WRAP_METHOD(void merge(const Glib::RefPtr<Gst::Caps>& caps), gst_caps_merge)
 
   /** Appends a structure to caps.
    *
@@ -155,19 +155,19 @@
   _WRAP_METHOD(bool is_any() const, gst_caps_is_any)
   _WRAP_METHOD(bool empty() const, gst_caps_is_empty)
   _WRAP_METHOD(bool is_fixed() const, gst_caps_is_fixed)
-  _WRAP_METHOD(bool equals(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_is_equal)
-  _WRAP_METHOD(bool equals_fixed(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_is_equal_fixed)
-  _WRAP_METHOD(bool is_always_compatible(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_is_always_compatible)
-  _WRAP_METHOD(bool is_subset(const Glib::RefPtr<Caps>& superset_caps) const, gst_caps_is_subset)
+  _WRAP_METHOD(bool equals(const Glib::RefPtr<Gst::Caps>& other_caps) const, gst_caps_is_equal)
+  _WRAP_METHOD(bool equals_fixed(const Glib::RefPtr<Gst::Caps>& other_caps) const, gst_caps_is_equal_fixed)
+  _WRAP_METHOD(bool is_always_compatible(const Glib::RefPtr<Gst::Caps>& other_caps) const, gst_caps_is_always_compatible)
+  _WRAP_METHOD(bool is_subset(const Glib::RefPtr<Gst::Caps>& superset_caps) const, gst_caps_is_subset)
 
   //This is const (returns a non const) because it always creates a new instance:
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_intersect(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_intersect)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> get_intersect(const Glib::RefPtr<Gst::Caps>& other_caps) const, gst_caps_intersect)
 
   //This is const (returns a non const) because it always creates a new instance:
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_union(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_union)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> get_union(const Glib::RefPtr<Gst::Caps>& other_caps) const, gst_caps_union)
 
   //This is const (returns a non const) because it always creates a new instance:
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_normal() const, gst_caps_normalize)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> get_normal() const, gst_caps_normalize)
 
   _WRAP_METHOD(bool simplify(), gst_caps_do_simplify)
 
@@ -178,12 +178,12 @@
   xmlpp::Node* save(xmlpp::Node* parent) const;
   _IGNORE(gst_caps_save_thyself)
 
-  _WRAP_METHOD(static Glib::RefPtr<Caps> load(xmlpp::Node* parent), gst_caps_load_thyself)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Caps> load(xmlpp::Node* parent), gst_caps_load_thyself)
 
   _WRAP_METHOD(Glib::ustring to_string() const, gst_caps_to_string)
 
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_difference(const Glib::RefPtr<const Caps>& subtrahend_caps) const, gst_caps_subtract)
-  _WRAP_METHOD(Glib::RefPtr<Caps> make_writable(), gst_caps_make_writable)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> get_difference(const Glib::RefPtr<const Gst::Caps>& subtrahend_caps) const, gst_caps_subtract)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> make_writable(), gst_caps_make_writable)
   _WRAP_METHOD(void truncate(), gst_caps_truncate)
 };
 

Modified: gstreamermm/trunk/gstreamer/src/childproxy.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/childproxy.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/childproxy.ccg	Fri Dec 12 03:49:44 2008
@@ -22,13 +22,13 @@
 namespace Gst
 {
 
-Glib::RefPtr<ChildProxy> ChildProxy::get_proxy_property(const Glib::ustring& name, Glib::ValueBase& value)
+Glib::RefPtr<Gst::ChildProxy> ChildProxy::get_proxy_property(const Glib::ustring& name, Glib::ValueBase& value)
 {
   gst_child_proxy_get_property(GST_OBJECT(gobj()), name.c_str(), value.gobj());
   return Glib::wrap(gobj(), true);
 }
 
-Glib::RefPtr<ChildProxy> ChildProxy::set_proxy_property(const Glib::ustring& name, const Glib::ValueBase& value)
+Glib::RefPtr<Gst::ChildProxy> ChildProxy::set_proxy_property(const Glib::ustring& name, const Glib::ValueBase& value)
 {
   gst_child_proxy_set_property(GST_OBJECT(gobj()), name.c_str(), value.gobj());
   return Glib::wrap(gobj(), true);

Modified: gstreamermm/trunk/gstreamer/src/childproxy.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/childproxy.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/childproxy.hg	Fri Dec 12 03:49:44 2008
@@ -61,7 +61,7 @@
    * @return This Gst::ChildProxy so more properties can be retrieved if
    * needed.
    */
-  Glib::RefPtr<ChildProxy> get_proxy_property(const Glib::ustring& name, Glib::ValueBase& value);
+  Glib::RefPtr<Gst::ChildProxy> get_proxy_property(const Glib::ustring& name, Glib::ValueBase& value);
   _IGNORE(gst_child_proxy_get_property, gst_child_proxy_get, gst_child_proxy_get_valist)
 
   /** Sets a single property using the Gst::ChildProxy mechanism.
@@ -69,7 +69,7 @@
    * @param value The Glib::ValueBase to set the property to (non-empty).
    * @return This Gst::ChildProxy so more properties can be set.
    */
-  Glib::RefPtr<ChildProxy> set_proxy_property(const Glib::ustring& name, const Glib::ValueBase& value);
+  Glib::RefPtr<Gst::ChildProxy> set_proxy_property(const Glib::ustring& name, const Glib::ValueBase& value);
   _IGNORE(gst_child_proxy_set_property, gst_child_proxy_set, gst_child_proxy_set_valist)
 
   /** Emits the "child-added" signal.

Modified: gstreamermm/trunk/gstreamer/src/clock.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/clock.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/clock.hg	Fri Dec 12 03:49:44 2008
@@ -75,7 +75,7 @@
    * Glib::RefPtr<Gst::ClockID>& id);.
    * The clock function return value is currently unused (see GstClockCallback).
    */
-  typedef sigc::slot< bool, const Glib::RefPtr<Clock>&, ClockTime, const Glib::RefPtr<ClockID>& > SlotClock;
+  typedef sigc::slot< bool, const Glib::RefPtr<Gst::Clock>&, ClockTime, const Glib::RefPtr<Gst::ClockID>& > SlotClock;
 
   _WRAP_METHOD(ClockTime get_time() const, gst_clock_id_get_time)
   _WRAP_METHOD(ClockReturn wait(ClockTimeDiff& jitter), gst_clock_id_wait)
@@ -229,12 +229,12 @@
 public:
   _WRAP_METHOD(bool add_observation(ClockTime slave_time, ClockTime master_time, gdouble* result), gst_clock_add_observation)
   _WRAP_METHOD(bool set_master(const Clock& master_clock), gst_clock_set_master)
-  _WRAP_METHOD(Glib::RefPtr<Clock> get_master(), gst_clock_get_master)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Clock> get_master(), gst_clock_get_master)
   _WRAP_METHOD(ClockTime set_resolution(ClockTime resolution), gst_clock_set_resolution)
   _WRAP_METHOD(ClockTime get_resolution() const, gst_clock_get_resolution)
   _WRAP_METHOD(ClockTime get_time() const, gst_clock_get_time)
-  _WRAP_METHOD(Glib::RefPtr<ClockID> create_single_shot_id(ClockTime time), gst_clock_new_single_shot_id)
-  _WRAP_METHOD(Glib::RefPtr<ClockID> create_periodic_id(ClockTime start_time, ClockTime intervals), gst_clock_new_periodic_id)
+  _WRAP_METHOD(Glib::RefPtr<Gst::ClockID> create_single_shot_id(ClockTime time), gst_clock_new_single_shot_id)
+  _WRAP_METHOD(Glib::RefPtr<Gst::ClockID> create_periodic_id(ClockTime start_time, ClockTime intervals), gst_clock_new_periodic_id)
   _WRAP_METHOD(ClockTime get_internal_time() const, gst_clock_get_internal_time)
   _WRAP_METHOD(ClockTime adjust_unlocked(ClockTime internal_time), gst_clock_adjust_unlocked)
   _WRAP_METHOD(ClockTime unadjust_unlocked(ClockTime external_time), gst_clock_unadjust_unlocked)
@@ -261,16 +261,16 @@
 
   /** Perform an asynchronous wait for the given Gst::ClockID.
    */
-  _WRAP_VFUNC(ClockReturn wait_async(const Glib::RefPtr<ClockID>& id), "wait_async")
+  _WRAP_VFUNC(ClockReturn wait_async(const Glib::RefPtr<Gst::ClockID>& id), "wait_async")
 
   /** Unblock a blocking or async wait operation.
    */
-  _WRAP_VFUNC(void unschedule(const Glib::RefPtr<ClockID>& id), "unschedule")
+  _WRAP_VFUNC(void unschedule(const Glib::RefPtr<Gst::ClockID>& id), "unschedule")
 
   /** Perform a blocking wait on the given Gst::ClockID and return the jitter.
    * (Since: 0.10.10)
    */
-  _WRAP_VFUNC(ClockReturn wait_jitter(const Glib::RefPtr<ClockID>& id, ClockTimeDiff& jitter), "wait_jitter")
+  _WRAP_VFUNC(ClockReturn wait_jitter(const Glib::RefPtr<Gst::ClockID>& id, ClockTimeDiff& jitter), "wait_jitter")
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/element.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.ccg	Fri Dec 12 03:49:44 2008
@@ -59,7 +59,7 @@
 
 } //namespace Enums
 
-Glib::RefPtr<Element> Element::link(const Glib::RefPtr<Element>& dest)
+Glib::RefPtr<Gst::Element> Element::link(const Glib::RefPtr<Gst::Element>& dest)
 {
   const bool result = gst_element_link(gobj(), dest->gobj());
 
@@ -69,13 +69,13 @@
     throw std::runtime_error("failed to link: " + get_name() + "->" + dest->get_name());
 }
 
-Glib::RefPtr<Pad> Element::create_compatible_pad(const Glib::RefPtr<Pad>& pad, const Glib::RefPtr<Caps>& caps)
+Glib::RefPtr<Gst::Pad> Element::create_compatible_pad(const Glib::RefPtr<Gst::Pad>& pad, const Glib::RefPtr<Gst::Caps>& caps)
 {
   GstPad* c_pad = gst_element_get_compatible_pad(gobj(), pad->gobj(), caps->gobj());
   return Glib::wrap(c_pad); //gst_element_get_compatible_pad gives us a reference.
 }
 
-Glib::RefPtr<PadTemplate> Element::get_compatible_pad_template(const Glib::RefPtr<PadTemplate>& padtemplate)
+Glib::RefPtr<Gst::PadTemplate> Element::get_compatible_pad_template(const Glib::RefPtr<Gst::PadTemplate>& padtemplate)
 {
   GstPadTemplate* c_padtemplate = gst_element_get_compatible_pad_template(gobj(), padtemplate->gobj());
   return Glib::wrap(c_padtemplate, true /* take reference */); //gst_element_get_compatible_pad_template() does not give us a reference.
@@ -93,7 +93,7 @@
 
 // This method is written manually because an extra ref is necessary. See
 // gst_element_send_event() docs
-bool Element::send_event(const Glib::RefPtr<Event>& event)
+bool Element::send_event(const Glib::RefPtr<Gst::Event>& event)
 {
   event->reference();
   return gst_element_send_event(gobj(), event->gobj());

Modified: gstreamermm/trunk/gstreamer/src/element.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.hg	Fri Dec 12 03:49:44 2008
@@ -38,13 +38,17 @@
  */
 
 /** @defgroup GstBasePlugins gstreamerbasemm Plugins
- *  Wrapped GStreamer base plugins.
+ *  Wrapped gst-plugins-base plugins.
  */
 
 /** @defgroup GstBaseClasses gstreamermm Base Classes
  *  Wrapped GStreamer base classes (plug-ins derrive from these).
  */
 
+/** @defgroup GstBaseBaseClasses gstreamerbasemm Base Classes
+ *  Wrapped gst-plugins-base base classes (plug-ins derrive from these).
+ */
+
 class Bus;
 class Caps;
 class Clock;
@@ -157,67 +161,67 @@
    *
    * @throws std::runtime_error If the elements could not be linked.
    */
-  Glib::RefPtr<Element> link(const Glib::RefPtr<Element>& dest);
+  Glib::RefPtr<Gst::Element> link(const Glib::RefPtr<Gst::Element>& dest);
   _IGNORE(gst_element_link, gst_element_link_many)
 
-  _WRAP_METHOD(bool add_pad(const Glib::RefPtr<Pad>& pad), gst_element_add_pad)
+  _WRAP_METHOD(bool add_pad(const Glib::RefPtr<Gst::Pad>& pad), gst_element_add_pad)
   _WRAP_METHOD(void create_all_pads(), gst_element_create_all_pads)
 
   //TODO: Can this be const?
-  Glib::RefPtr<Pad> create_compatible_pad(const Glib::RefPtr<Pad>& pad, const Glib::RefPtr<Caps>& caps);
+  Glib::RefPtr<Gst::Pad> create_compatible_pad(const Glib::RefPtr<Gst::Pad>& pad, const Glib::RefPtr<Gst::Caps>& caps);
   _IGNORE(gst_element_get_compatible_pad)
 
   //TODO: Can this be const?
-  Glib::RefPtr<PadTemplate> get_compatible_pad_template(const Glib::RefPtr<PadTemplate>& padtemplate);
+  Glib::RefPtr<Gst::PadTemplate> get_compatible_pad_template(const Glib::RefPtr<Gst::PadTemplate>& padtemplate);
   _IGNORE(gst_element_get_compatible_pad_template)
 
   //TODO: The documentation says "The pad should be released with gst_element_release_request_pad().", which is odd. murrayc
-  _WRAP_METHOD(Glib::RefPtr<Pad> get_request_pad(const Glib::ustring& name), gst_element_get_request_pad)
-  _WRAP_METHOD(Glib::RefPtr<Pad> get_static_pad(const Glib::ustring& name), gst_element_get_static_pad)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Pad> get_request_pad(const Glib::ustring& name), gst_element_get_request_pad)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Pad> get_static_pad(const Glib::ustring& name), gst_element_get_static_pad)
   _IGNORE(gst_element_get_pad)
 
   _WRAP_METHOD(void no_more_pads(), gst_element_no_more_pads)
-  _WRAP_METHOD(void release_request_pad(const Glib::RefPtr<Pad>& pad), gst_element_release_request_pad)
-  _WRAP_METHOD(bool remove_pad(const Glib::RefPtr<Pad>& pad), gst_element_remove_pad)
-  _WRAP_METHOD(Iterator<Pad> iterate_pads(), gst_element_iterate_pads)
-  _WRAP_METHOD(Iterator<Pad> iterate_sink_pads(), gst_element_iterate_sink_pads)
-  _WRAP_METHOD(Iterator<Pad> iterate_src_pads(), gst_element_iterate_src_pads)
-  _WRAP_METHOD(void unlink(const Glib::RefPtr<Element>& other_element), gst_element_unlink)
+  _WRAP_METHOD(void release_request_pad(const Glib::RefPtr<Gst::Pad>& pad), gst_element_release_request_pad)
+  _WRAP_METHOD(bool remove_pad(const Glib::RefPtr<Gst::Pad>& pad), gst_element_remove_pad)
+  _WRAP_METHOD(Gst::Iterator<Gst::Pad> iterate_pads(), gst_element_iterate_pads)
+  _WRAP_METHOD(Gst::Iterator<Gst::Pad> iterate_sink_pads(), gst_element_iterate_sink_pads)
+  _WRAP_METHOD(Gst::Iterator<Gst::Pad> iterate_src_pads(), gst_element_iterate_src_pads)
+  _WRAP_METHOD(void unlink(const Glib::RefPtr<Gst::Element>& other_element), gst_element_unlink)
   _IGNORE(gst_element_unlink_many)
 
   //TODO: Make this like link()?
-  _WRAP_METHOD(bool link_pads(const Glib::ustring& padname, const Glib::RefPtr<Element>& other_element, const Glib::ustring& others_padname), gst_element_link_pads)
+  _WRAP_METHOD(bool link_pads(const Glib::ustring& padname, const Glib::RefPtr<Gst::Element>& other_element, const Glib::ustring& others_padname), gst_element_link_pads)
 
-  _WRAP_METHOD(void unlink_pads(const Glib::ustring& padname, const Glib::RefPtr<Element>& other_element, const Glib::ustring& other_padname), gst_element_unlink_pads)
+  _WRAP_METHOD(void unlink_pads(const Glib::ustring& padname, const Glib::RefPtr<Gst::Element>& other_element, const Glib::ustring& other_padname), gst_element_unlink_pads)
 
   //TODO: Make this like link()?
-  _WRAP_METHOD(bool link_pads_filtered(const Glib::ustring& padname, const Glib::RefPtr<Element>& other_element, const Glib::ustring& others_padname, const Glib::RefPtr<Caps>& filter), gst_element_link_pads_filtered)
+  _WRAP_METHOD(bool link_pads_filtered(const Glib::ustring& padname, const Glib::RefPtr<Gst::Element>& other_element, const Glib::ustring& others_padname, const Glib::RefPtr<Gst::Caps>& filter), gst_element_link_pads_filtered)
 
   //TODO: Make this like link()?
-  _WRAP_METHOD(bool link_filtered(const Glib::RefPtr<Element>& other_element, const Glib::RefPtr<Caps>& filter), gst_element_link_filtered)
+  _WRAP_METHOD(bool link_filtered(const Glib::RefPtr<Gst::Element>& other_element, const Glib::RefPtr<Gst::Caps>& filter), gst_element_link_filtered)
 
   _WRAP_METHOD(void set_base_time(ClockTime time), gst_element_set_base_time)
   _WRAP_METHOD(ClockTime get_base_time() const, gst_element_get_base_time)
-  _WRAP_METHOD(void set_bus(const Glib::RefPtr<Bus>& bus), gst_element_set_bus)
-  _WRAP_METHOD(Glib::RefPtr<Bus> get_bus(), gst_element_get_bus)
-  _WRAP_METHOD(Glib::RefPtr<const Bus> get_bus() const, gst_element_get_bus, constversion)
-  _WRAP_METHOD(void set_index(const Glib::RefPtr<Index>& index), gst_element_set_index)
+  _WRAP_METHOD(void set_bus(const Glib::RefPtr<Gst::Bus>& bus), gst_element_set_bus)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Bus> get_bus(), gst_element_get_bus)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Bus> get_bus() const, gst_element_get_bus, constversion)
+  _WRAP_METHOD(void set_index(const Glib::RefPtr<Gst::Index>& index), gst_element_set_index)
 
   //Note: gst_element_get_index provides a reference.
-  _WRAP_METHOD(Glib::RefPtr<Index> get_index(), gst_element_get_index)
-  _WRAP_METHOD(Glib::RefPtr<const Index > get_index() const, gst_element_get_index, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Index> get_index(), gst_element_get_index)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Index > get_index() const, gst_element_get_index, constversion)
 
-  _WRAP_METHOD(Glib::RefPtr<ElementFactory> get_factory(), gst_element_get_factory, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const ElementFactory> get_factory() const, gst_element_get_factory, refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gst::ElementFactory> get_factory(), gst_element_get_factory, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::ElementFactory> get_factory() const, gst_element_get_factory, refreturn, constversion)
 
   _WRAP_METHOD(bool is_indexable() const, gst_element_is_indexable)
   _WRAP_METHOD(bool requires_clock() const, gst_element_requires_clock)
-  _WRAP_METHOD(bool set_clock(const Glib::RefPtr<Clock>& clock), gst_element_set_clock)
-  _WRAP_METHOD(Glib::RefPtr<Clock> get_clock(), gst_element_get_clock)
-  _WRAP_METHOD(Glib::RefPtr<const Clock> get_clock() const, gst_element_get_clock, constversion)
+  _WRAP_METHOD(bool set_clock(const Glib::RefPtr<Gst::Clock>& clock), gst_element_set_clock)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Clock> get_clock(), gst_element_get_clock)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Clock> get_clock() const, gst_element_get_clock, constversion)
   _WRAP_METHOD(bool provides_clock() const, gst_element_provides_clock)
-  _WRAP_METHOD(Glib::RefPtr<Clock> provide_clock(), gst_element_provide_clock)
-  _WRAP_METHOD(Glib::RefPtr<const Clock> provide_clock() const, gst_element_provide_clock, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Clock> provide_clock(), gst_element_provide_clock)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Clock> provide_clock() const, gst_element_provide_clock, constversion)
   _WRAP_METHOD(StateChangeReturn set_state(State state), gst_element_set_state)
   _WRAP_METHOD(StateChangeReturn get_state(State& state, State& pending, ClockTime timeout) const, gst_element_get_state)
   _WRAP_METHOD(bool set_locked_state(gboolean locked_state), gst_element_set_locked_state)
@@ -227,17 +231,17 @@
   _WRAP_METHOD(void lost_state(), gst_element_lost_state)
   _WRAP_METHOD(bool sync_state_with_parent(), gst_element_sync_state_with_parent)
   _WRAP_METHOD(StateChangeReturn change_state(StateChange transition), gst_element_change_state)
-  _WRAP_METHOD(void found_tags(const TagList& list), gst_element_found_tags)
-  _WRAP_METHOD(void found_tags_for_pad(const Glib::RefPtr<Pad>& pad, const TagList& list), gst_element_found_tags_for_pad)
+  _WRAP_METHOD(void found_tags(const Gst::TagList& list), gst_element_found_tags)
+  _WRAP_METHOD(void found_tags_for_pad(const Glib::RefPtr<Gst::Pad>& pad, const Gst::TagList& list), gst_element_found_tags_for_pad)
 
   //TODO: Change the parameter order?
   _WRAP_METHOD(void post_message(MessageType message_type, const Glib::QueryQuark& domain, int code, const Glib::ustring& message, const Glib::ustring& debug, const Glib::ustring& filename, const Glib::ustring& function_name, int line_number), gst_element_message_full)
-  _WRAP_METHOD(bool post_message(const Glib::RefPtr<Message>& message), gst_element_post_message)
+  _WRAP_METHOD(bool post_message(const Glib::RefPtr<Gst::Message>& message), gst_element_post_message)
 
 #m4 _CONVERSION(`const GstQueryType*',`Glib::ArrayHandle<QueryType>',`Glib::ArrayHandle<QueryType>((QueryType*)($3), Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(Glib::ArrayHandle<QueryType> get_query_types() const, gst_element_get_query_types)
 
-  _WRAP_METHOD(bool query(const Glib::RefPtr<Query>& query), gst_element_query)
+  _WRAP_METHOD(bool query(const Glib::RefPtr<Gst::Query>& query), gst_element_query)
   _WRAP_METHOD(bool query_convert(Format src_format, gint64 src_value, Format& dst_format, gint64& dst_value) const, gst_element_query_convert)
   _WRAP_METHOD(bool query_position(Format& format, gint64& position) const, gst_element_query_position)
 
@@ -271,7 +275,7 @@
    * @param event The Gst::Event to send to the element.
    * @return true if the event was handled. MT safe. 
    */
-  bool send_event(const Glib::RefPtr<Event>& event);
+  bool send_event(const Glib::RefPtr<Gst::Event>& event);
   _IGNORE(gst_element_send_event)
 
   _WRAP_METHOD(bool implements_interface(GType iface_type), gst_element_implements_interface)
@@ -280,23 +284,23 @@
    */
   _WRAP_SIGNAL(void no_more_pads(), "no-more-pads")
 
-#m4 _CONVERSION(`GstPad*',`const Glib::RefPtr<Pad>&',`Glib::wrap($3, true)')
+#m4 _CONVERSION(`GstPad*',`const Glib::RefPtr<Gst::Pad>&',`Glib::wrap($3, true)')
 
   /** signals that a new Gst::Pad has been added to the element.
    */
-  _WRAP_SIGNAL(void pad_added(const Glib::RefPtr<Pad>& new_pad), "pad-added")
+  _WRAP_SIGNAL(void pad_added(const Glib::RefPtr<Gst::Pad>& new_pad), "pad-added")
 
   /** signals that a Gst::Pad has been removed from the element
    */
-  _WRAP_SIGNAL(void pad_removed(const Glib::RefPtr<Pad>& old_pad), "pad-removed")
+  _WRAP_SIGNAL(void pad_removed(const Glib::RefPtr<Gst::Pad>& old_pad), "pad-removed")
 
   /** Called when a new pad is requested.
    */
-  _WRAP_VFUNC(Glib::RefPtr<Pad> request_new_pad(const Glib::RefPtr<PadTemplate>& templ, const Glib::ustring& name), "request_new_pad")
+  _WRAP_VFUNC(Glib::RefPtr<Gst::Pad> request_new_pad(const Glib::RefPtr<Gst::PadTemplate>& templ, const Glib::ustring& name), "request_new_pad")
 
   /** Called when a request pad is to be released.
    */
-  _WRAP_VFUNC(void release_pad(const Glib::RefPtr<Pad>& pad), "release_pad")
+  _WRAP_VFUNC(void release_pad(const Glib::RefPtr<Gst::Pad>& pad), "release_pad")
 
   /** Get the state of the element.
    */
@@ -312,11 +316,11 @@
 
   /** Set a Gst::Bus on the element.
    */
-  _WRAP_VFUNC(void set_bus(const Glib::RefPtr<Bus>& bus), "set_bus")
+  _WRAP_VFUNC(void set_bus(const Glib::RefPtr<Gst::Bus>& bus), "set_bus")
 
   /** Gets the Gst::Clock provided by the element.
    */
-  _WRAP_VFUNC(Glib::RefPtr<Clock> provide_clock(), "provide_clock")
+  _WRAP_VFUNC(Glib::RefPtr<Gst::Clock> provide_clock(), "provide_clock")
 
   //TODO: Wrapping this vfunc causes problems for generated plug-ins because
   //the underlying C base class (GstElement) does not have a default set_clock
@@ -336,19 +340,19 @@
   //problems.
   // /** Set the Gst::Clock on the element.
   //  */
-  //_WRAP_VFUNC(bool set_clock(const Glib::RefPtr<Clock>& clock), "set_clock")
+  //_WRAP_VFUNC(bool set_clock(const Glib::RefPtr<Gst::Clock>& clock), "set_clock")
 
   /** Get a Gst::Index on the element.
    */
-  _WRAP_VFUNC(Glib::RefPtr<Index> get_index(), "get_index")
+  _WRAP_VFUNC(Glib::RefPtr<Gst::Index> get_index(), "get_index")
 
   /** Set the Gst::Index of an element.
    */
-  _WRAP_VFUNC(void set_index(const Glib::RefPtr<Index>& index), "set_index")
+  _WRAP_VFUNC(void set_index(const Glib::RefPtr<Gst::Index>& index), "set_index")
 
   /** Send a Gst::Event to the element.
    */
-  _WRAP_VFUNC(bool send_event(const Glib::RefPtr<Event>& event), "send_event")
+  _WRAP_VFUNC(bool send_event(const Glib::RefPtr<Gst::Event>& event), "send_event")
 
   //TODO: This vfunc can't be wrapped without getting a compile error in the
   //generated code.  The compile error comes about because the code assumes
@@ -362,7 +366,7 @@
 
   /** Perform a Gst::Query on the element.
    */
-  _WRAP_VFUNC(bool query(const Glib::RefPtr<Query>& query), "query")
+  _WRAP_VFUNC(bool query(const Glib::RefPtr<Gst::Query>& query), "query")
 };
 
 /** Templated class used for casting Gst::Element to interfaces that its

Modified: gstreamermm/trunk/gstreamer/src/elementfactory.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/elementfactory.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/elementfactory.ccg	Fri Dec 12 03:49:44 2008
@@ -30,7 +30,7 @@
 namespace Gst
 {
 
-Glib::RefPtr<Element> ElementFactory::create_element(const Glib::ustring& factory_name)
+Glib::RefPtr<Gst::Element> ElementFactory::create_element(const Glib::ustring& factory_name)
 {
   return Glib::wrap(gst_element_factory_make(factory_name.c_str(), NULL));
 }

Modified: gstreamermm/trunk/gstreamer/src/elementfactory.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/elementfactory.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/elementfactory.hg	Fri Dec 12 03:49:44 2008
@@ -77,12 +77,12 @@
   _CLASS_GOBJECT(ElementFactory, GstElementFactory, GST_ELEMENT_FACTORY, PluginFeature, GstPluginFeature)
 
 public:
-  _WRAP_METHOD(static Glib::RefPtr<ElementFactory> find(const Glib::ustring& name), gst_element_factory_find)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::ElementFactory> find(const Glib::ustring& name), gst_element_factory_find)
 
   //Note that name can't be NULL here, though it seems like gstreamer should allow that as for gst_element_factory_make().
-  _WRAP_METHOD(Glib::RefPtr<Element> create_named_element(const Glib::ustring& name), gst_element_factory_create)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Element> create_named_element(const Glib::ustring& name), gst_element_factory_create)
 
-  _WRAP_METHOD(static Glib::RefPtr<Element> create_element(const Glib::ustring& factory_name, const Glib::ustring& name), gst_element_factory_make)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Element> create_element(const Glib::ustring& factory_name, const Glib::ustring& name), gst_element_factory_make)
   
   /** Create a new element of the type defined by the given element factory, 
    * with a guaranteed unique name consisting of the element factory name and a
@@ -91,7 +91,7 @@
    * @param name Name of new element.
    * @return New Gst::Element or an empty RefPtr if unable to create element.
    */
-  static Glib::RefPtr<Element> create_element(const Glib::ustring& factory_name);
+  static Glib::RefPtr<Gst::Element> create_element(const Glib::ustring& factory_name);
 
   _WRAP_METHOD(GType get_element_type() const, gst_element_factory_get_element_type)
   _WRAP_METHOD(Glib::ustring get_long_name() const, gst_element_factory_get_longname)
@@ -105,11 +105,11 @@
   _WRAP_METHOD(Glib::StringArrayHandle get_uri_protocols() const, gst_element_factory_get_uri_protocols)
 
   _WRAP_METHOD(bool has_interface(const Glib::ustring& name) const, gst_element_factory_has_interface)
-  _WRAP_METHOD(bool can_sink_caps(const Glib::RefPtr<const Caps>& caps) const, gst_element_factory_can_sink_caps)
-  _WRAP_METHOD(bool can_src_caps(const Glib::RefPtr<const Caps>& caps) const, gst_element_factory_can_src_caps)
+  _WRAP_METHOD(bool can_sink_caps(const Glib::RefPtr<const Gst::Caps>& caps) const, gst_element_factory_can_sink_caps)
+  _WRAP_METHOD(bool can_src_caps(const Glib::RefPtr<const Gst::Caps>& caps) const, gst_element_factory_can_src_caps)
 
-#m4 _CONVERSION(`const GList*', `Glib::ListHandle< Glib::RefPtr<const PadTemplate> >', `$2(const_cast<GList*>($3), Glib::OWNERSHIP_NONE)')
-  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const PadTemplate> > get_static_pad_templates(), gst_element_factory_get_static_pad_templates)
+#m4 _CONVERSION(`const GList*', `Glib::ListHandle< Glib::RefPtr<const Gst::PadTemplate> >', `$2(const_cast<GList*>($3), Glib::OWNERSHIP_NONE)')
+  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const Gst::PadTemplate> > get_static_pad_templates(), gst_element_factory_get_static_pad_templates)
 };
 
 } // namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/event.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.ccg	Fri Dec 12 03:49:44 2008
@@ -47,12 +47,12 @@
 
 } //namespace Enums
 
-Glib::RefPtr<Event> Event::copy() const
+Glib::RefPtr<Gst::Event> Event::copy() const
 {
   return Gst::wrap(gst_event_copy(gobj()));
 }
 
-Glib::RefPtr<Event> Event::create_writable()
+Glib::RefPtr<Gst::Event> Event::create_writable()
 {
   return
    Gst::wrap(GST_EVENT(gst_mini_object_make_writable(GST_MINI_OBJECT(gobj()))));
@@ -78,7 +78,7 @@
 {
 }
 
-Glib::RefPtr<Event> EventFlushStart::create()
+Glib::RefPtr<Gst::Event> EventFlushStart::create()
 {
   GstEvent* event = gst_event_new_flush_start();
   return Gst::Event::wrap(event, false);
@@ -89,7 +89,7 @@
 {
 }
 
-Glib::RefPtr<Event> EventFlushStop::create()
+Glib::RefPtr<Gst::Event> EventFlushStop::create()
 {
   GstEvent* event = gst_event_new_flush_stop();
   return Gst::Event::wrap(event, false);
@@ -100,7 +100,7 @@
 {
 }
 
-Glib::RefPtr<Event> EventEos::create()
+Glib::RefPtr<Gst::Event> EventEos::create()
 {
   GstEvent* event = gst_event_new_eos();
   return Gst::Event::wrap(event, false);
@@ -111,7 +111,7 @@
 {
 }
 
-Glib::RefPtr<Event> EventNewSegment::create(bool update, double rate, Format format, gint64 start, gint64 stop, gint64 position, double applied_rate)
+Glib::RefPtr<Gst::Event> EventNewSegment::create(bool update, double rate, Format format, gint64 start, gint64 stop, gint64 position, double applied_rate)
 {
   GstEvent* event = gst_event_new_new_segment_full(update, rate, applied_rate, GstFormat(format), start, stop, position);
   return Gst::Event::wrap(event, false);
@@ -136,7 +136,7 @@
 {
 }
 
-Glib::RefPtr<Event> EventTag::create(const TagList& taglist)
+Glib::RefPtr<Gst::Event> EventTag::create(const Gst::TagList& taglist)
 {
   //We create a copy because gst_event_new_tag() takes ownership:
   GstTagList* c_taglist = gst_tag_list_copy(taglist.gobj());
@@ -144,11 +144,11 @@
   return Gst::Event::wrap(event, false);
 }
 
-TagList EventTag::parse()
+Gst::TagList EventTag::parse()
 {
   GstTagList* gst_taglist = gst_tag_list_new();
   gst_event_parse_tag(gobj(), &gst_taglist);
-  return TagList(gst_taglist);
+  return Gst::TagList(gst_taglist);
 }
 
 EventBufferSize::EventBufferSize(GstEvent* castitem) :
@@ -156,7 +156,7 @@
 {
 }
 
-Glib::RefPtr<Event> EventBufferSize::create(Format format, gint64 minsize, gint64 maxsize, bool async)
+Glib::RefPtr<Gst::Event> EventBufferSize::create(Format format, gint64 minsize, gint64 maxsize, bool async)
 {
   GstEvent* event = gst_event_new_buffer_size(GstFormat(format), minsize, maxsize, async);
   return Gst::Event::wrap(event, false);
@@ -174,7 +174,7 @@
 {
 }
 
-Glib::RefPtr<Event> EventQos::create(double proportion, ClockTimeDiff diff, ClockTime timestamp)
+Glib::RefPtr<Gst::Event> EventQos::create(double proportion, ClockTimeDiff diff, ClockTime timestamp)
 {
   GstEvent* event = gst_event_new_qos(proportion, GstClockTimeDiff(diff), GstClockTime(timestamp));
   return Gst::Event::wrap(event, false);
@@ -190,7 +190,7 @@
 {
 }
 
-Glib::RefPtr<Event> EventSeek::create(double rate, Format format, SeekFlags flags, SeekType start_type, gint64 start, SeekType stop_type, gint64 stop)
+Glib::RefPtr<Gst::Event> EventSeek::create(double rate, Format format, SeekFlags flags, SeekType start_type, gint64 start, SeekType stop_type, gint64 stop)
 {
   GstEvent* event = gst_event_new_seek(rate, GstFormat(format), GstSeekFlags(flags), GstSeekType(start_type), start, GstSeekType(stop_type), stop);
   return Gst::Event::wrap(event, false);
@@ -206,7 +206,7 @@
 {
 }
 
-Glib::RefPtr<Event> EventNavigation::create(Structure& structure)
+Glib::RefPtr<Gst::Event> EventNavigation::create(Gst::Structure& structure)
 {
   GstEvent* event = gst_event_new_navigation(structure.gobj());
   return Gst::Event::wrap(event, false);
@@ -222,49 +222,49 @@
   gst_event_parse_latency(gobj(), &latency);
 }
 
-Glib::RefPtr<Event> EventLatency::create(ClockTime time)
+Glib::RefPtr<Gst::Event> EventLatency::create(ClockTime time)
 {
   GstEvent* event = gst_event_new_latency(GstClockTime(time));
   return Gst::Event::wrap(event, false);
 }
 
-Glib::RefPtr<Event> Event::wrap(GstEvent* event, bool take_copy) {
+Glib::RefPtr<Gst::Event> Event::wrap(GstEvent* event, bool take_copy) {
 
-  Glib::RefPtr<Event> result;
+  Glib::RefPtr<Gst::Event> result;
 
   if(!event)
     return result;
 
   switch (GST_EVENT_TYPE(event)) {
     case GST_EVENT_FLUSH_START:
-      result = Glib::RefPtr<Event>( new Gst::EventFlushStart(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventFlushStart(event) );
       break;
     case GST_EVENT_FLUSH_STOP:
-      result = Glib::RefPtr<Event>( new Gst::EventFlushStop(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventFlushStop(event) );
       break;
     case GST_EVENT_EOS:
-      result = Glib::RefPtr<Event>( new Gst::EventEos(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventEos(event) );
       break;
     case GST_EVENT_NEWSEGMENT:
-      result = Glib::RefPtr<Event>( new Gst::EventNewSegment(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventNewSegment(event) );
       break;
     case GST_EVENT_TAG:
-      result = Glib::RefPtr<Event>( new Gst::EventTag(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventTag(event) );
       break;
     case GST_EVENT_BUFFERSIZE:
-      result = Glib::RefPtr<Event>( new Gst::EventBufferSize(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventBufferSize(event) );
       break;
     case GST_EVENT_QOS:
-      result = Glib::RefPtr<Event>( new Gst::EventQos(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventQos(event) );
       break;
     case GST_EVENT_SEEK:
-      result = Glib::RefPtr<Event>( new Gst::EventSeek(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventSeek(event) );
       break;
     case GST_EVENT_NAVIGATION:
-      result = Glib::RefPtr<Event>( new Gst::EventNavigation(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventNavigation(event) );
       break;
     case GST_EVENT_LATENCY:
-      result = Glib::RefPtr<Event>( new Gst::EventLatency(event) );
+      result = Glib::RefPtr<Gst::Event>( new Gst::EventLatency(event) );
       break;
     default:
       result = Gst::wrap(event, false);

Modified: gstreamermm/trunk/gstreamer/src/event.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.hg	Fri Dec 12 03:49:44 2008
@@ -127,21 +127,21 @@
    * derived one) because the derived Gst::Event classes do not correspond
    * to GType types in the GStreamer API.
    */
-  static Glib::RefPtr<Event> wrap(GstEvent* event, bool take_copy=false);
+  static Glib::RefPtr<Gst::Event> wrap(GstEvent* event, bool take_copy=false);
 
   /** Copy the event using the event specific copy function.
    * @return The Gst::Event copy.
    */
-  Glib::RefPtr<Event> copy() const;
+  Glib::RefPtr<Gst::Event> copy() const;
 
-  _WRAP_METHOD(const Structure get_structure() const, gst_event_get_structure)
+  _WRAP_METHOD(const Gst::Structure get_structure() const, gst_event_get_structure)
   _WRAP_METHOD(bool has_name(const Glib::ustring& name), gst_event_has_name)
 
   /** Checks if an event is writable.  If not, a writable copy is made and
    * returned.
    * @return A Gst::Event (possibly the same pointer) that is writable. 
    */
-  Glib::RefPtr<Event> create_writable();
+  Glib::RefPtr<Gst::Event> create_writable();
 
   /** Check if an event can travel downstream.
    */
@@ -199,7 +199,7 @@
    *
    * @return A new flush start event.
    */
-  static Glib::RefPtr<Event> create();
+  static Glib::RefPtr<Gst::Event> create();
 };
 
 /**  A flush stop event.  See create() for more details.
@@ -222,7 +222,7 @@
    *
    * @return A new flush stop event.
    */
-  static Glib::RefPtr<Event> create();
+  static Glib::RefPtr<Gst::Event> create();
 };
 
 /** An end of stream event. See create() for more details.
@@ -246,7 +246,7 @@
    *
    * @return The new EOS event. 
    */
-  static Glib::RefPtr<Event> create();
+  static Glib::RefPtr<Gst::Event> create();
 };
 
 /** A new segment event.  See create() for more details.
@@ -296,7 +296,7 @@
    *
    * Since 0.10.6
    */
-  static Glib::RefPtr<Event> create(bool update, double rate, Format format, gint64 strat, gint64 stop, gint64 position, double applied_rate=1.0);
+  static Glib::RefPtr<Gst::Event> create(bool update, double rate, Format format, gint64 strat, gint64 stop, gint64 position, double applied_rate=1.0);
 
   /** Get the update flag, rate, format, start, stop and position in the
    * newsegment event.
@@ -339,12 +339,12 @@
    * @param taglist Metadata list.
    * @return A new Gst::Event.
    */
-  static Glib::RefPtr<Event> create(const TagList& taglist);
+  static Glib::RefPtr<Gst::Event> create(const Gst::TagList& taglist);
 
   /** Parses a tag event and stores the results in the given taglist location.
    * @return Metadata list.
    */
-  TagList parse();
+  Gst::TagList parse();
   _IGNORE(gst_event_parse_tag)
 };
 
@@ -366,7 +366,7 @@
    * @param async Thread behavior.
    * @return A new Gst::EventBufferSize.
    */
-  static Glib::RefPtr<Event> create(Format format, gint64 minsize, gint64 maxsize, bool async);
+  static Glib::RefPtr<Gst::Event> create(Format format, gint64 minsize, gint64 maxsize, bool async);
 
   /** Get the format, minsize, maxsize and async-flag in the buffersize event.
    *
@@ -423,7 +423,7 @@
    * @param timestamp The timestamp of the buffer.
    * @return A new QOS event.
    */
-  static Glib::RefPtr<Event> create(double proportion, ClockTimeDiff diff, ClockTime timestamp);
+  static Glib::RefPtr<Gst::Event> create(double proportion, ClockTimeDiff diff, ClockTime timestamp);
 
   /** Get the proportion, diff and timestamp in the qos event. See create() for
    * more information about the different QoS values.
@@ -483,7 +483,7 @@
    * @param stop The value of the new stop position.
    * @return A new seek event.
    */
-  static Glib::RefPtr<Event> create(double rate, Format format, SeekFlags flags, SeekType start_type, gint64 start, SeekType stop_type, gint64 stop);
+  static Glib::RefPtr<Gst::Event> create(double rate, Format format, SeekFlags flags, SeekType start_type, gint64 start, SeekType stop_type, gint64 stop);
 
   /** Parses a seek event and stores the results in the given result locations.
    *
@@ -513,7 +513,7 @@
    * @param structure Description of the event.
    * @return A new Gst::EventNavigation.
    */
-  static Glib::RefPtr<Event> create(Structure& structure);
+  static Glib::RefPtr<Gst::Event> create(Gst::Structure& structure);
 };
 
 /** A latency event.  See create() for more details.
@@ -535,7 +535,7 @@
    *
    * Since 0.10.12 
    */
-  static Glib::RefPtr<Event> create(ClockTime latency);
+  static Glib::RefPtr<Gst::Event> create(ClockTime latency);
 
   /** Get the latency in the latency event.
    *

Modified: gstreamermm/trunk/gstreamer/src/ghostpad.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/ghostpad.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/ghostpad.ccg	Fri Dec 12 03:49:44 2008
@@ -27,13 +27,13 @@
 namespace Gst
 {
 
-GhostPad::GhostPad(const Glib::ustring& name, const Glib::RefPtr<Pad>& target)
+GhostPad::GhostPad(const Glib::ustring& name, const Glib::RefPtr<Gst::Pad>& target)
   : _CONSTRUCT("name", name.c_str(),
       "direction", (GstPadDirection) target->get_direction())
 {
   if (!gst_ghost_pad_construct(gobj(), name.c_str(), target->gobj()))
     g_warning("Gst::GhostPad::GhostPad(const Glib::ustring&,"
-      " const Glib::RefPtr<Pad>&): Unsuccessful construction of ghost pad.");
+      " const Glib::RefPtr<Gst::Pad>&): Unsuccessful construction of ghost pad.");
 }
 
 GhostPad::GhostPad(const Glib::ustring& name, PadDirection direction)
@@ -46,27 +46,27 @@
   }
 }
 
-GhostPad::GhostPad(const Glib::ustring& name, const Glib::RefPtr<Pad>& target,
-  const Glib::RefPtr<PadTemplate>& templ)
+GhostPad::GhostPad(const Glib::ustring& name, const Glib::RefPtr<Gst::Pad>& target,
+  const Glib::RefPtr<Gst::PadTemplate>& templ)
     : _CONSTRUCT("name", name.c_str(), "direction",
         (GstPadDirection) target->get_direction(), "template", templ->gobj())
 {
   if (!gst_ghost_pad_construct_from_template(gobj(), name.c_str(), target->gobj(), templ->gobj()))
   {
     g_warning("Gst::GhostPad::GhostPad(const Glib::ustring&,"
-      " const Glib::RefPtr<Pad>&, const Glib::RefPtr<PadTemplate>&):"
+      " const Glib::RefPtr<Gst::Pad>&, const Glib::RefPtr<Gst::PadTemplate>&):"
         " Unsuccessful construction of ghost pad.");
   }
 }
 
-GhostPad::GhostPad(const Glib::ustring& name, const Glib::RefPtr<PadTemplate>& templ)
+GhostPad::GhostPad(const Glib::ustring& name, const Glib::RefPtr<Gst::PadTemplate>& templ)
     : _CONSTRUCT("name", name.c_str(), "direction", 
         (GstPadDirection) templ->get_direction(), "template", templ->gobj())
 {
   if (!gst_ghost_pad_construct_no_target_from_template(gobj(), name.c_str(), templ->gobj()))
   {
     g_warning("Gst::GhostPad::GhostPad(const Glib::ustring&,"
-      " const Glib::RefPtr<PadTemplate>&): Unsuccessful construction of ghost"
+      " const Glib::RefPtr<Gst::PadTemplate>&): Unsuccessful construction of ghost"
         " pad.");
   }
 }

Modified: gstreamermm/trunk/gstreamer/src/ghostpad.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/ghostpad.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/ghostpad.hg	Fri Dec 12 03:49:44 2008
@@ -50,10 +50,10 @@
   _CLASS_GOBJECT(GhostPad, GstGhostPad, GST_GHOST_PAD, Pad, GstPad)
 
 protected:
-  GhostPad(const Glib::ustring& name, const Glib::RefPtr<Pad>& target);
+  GhostPad(const Glib::ustring& name, const Glib::RefPtr<Gst::Pad>& target);
   GhostPad(const Glib::ustring& name, PadDirection direction);
-  GhostPad(const Glib::ustring& name, const Glib::RefPtr<Pad>& target, const Glib::RefPtr<PadTemplate>& templ);
-  GhostPad(const Glib::ustring& name, const Glib::RefPtr<PadTemplate>& templ);
+  GhostPad(const Glib::ustring& name, const Glib::RefPtr<Gst::Pad>& target, const Glib::RefPtr<Gst::PadTemplate>& templ);
+  GhostPad(const Glib::ustring& name, const Glib::RefPtr<Gst::PadTemplate>& templ);
 
 public:
   /** Create a new ghostpad with @a target as the target. The direction will be
@@ -63,7 +63,7 @@
    * @param target The pad to ghost.
    * @returns A new Gst::GhostPad, or an empty RefPtr in case of an error.
    */
-  _WRAP_CREATE(const Glib::ustring& name, const Glib::RefPtr<Pad>& target)
+  _WRAP_CREATE(const Glib::ustring& name, const Glib::RefPtr<Gst::Pad>& target)
 
   /** Create a new ghostpad without a target with the given direction. A target
    * can be set on the ghostpad later with the set_target() function.

Modified: gstreamermm/trunk/gstreamer/src/index.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/index.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/index.hg	Fri Dec 12 03:49:44 2008
@@ -87,19 +87,20 @@
   _WRAP_METHOD(void set_certainty(IndexCertainty certainty), gst_index_set_certainty)
   _WRAP_METHOD(IndexCertainty set_certainty() const, gst_index_get_certainty)
   _WRAP_METHOD(bool get_writer_id(const Glib::RefPtr<Gst::Object>& writer, int& id) const, gst_index_get_writer_id)
-  _WRAP_METHOD(IndexEntry add_format(int id, Format format), gst_index_add_format)
-  _WRAP_METHOD(IndexEntry add_association(int id, AssocFlags flags, int n, const IndexAssociation& list), gst_index_add_associationv)
-  _WRAP_METHOD(IndexEntry add_id(int id, const Glib::ustring& description), gst_index_add_id)
+  _WRAP_METHOD(Gst::IndexEntry add_format(int id, Format format), gst_index_add_format)
+  _WRAP_METHOD(Gst::IndexEntry add_association(int id, AssocFlags flags, int n, const Gst::IndexAssociation& list), gst_index_add_associationv)
+  _WRAP_METHOD(Gst::IndexEntry add_id(int id, const Glib::ustring& description), gst_index_add_id)
 
   //TODO: Reorder parameters to allow default values?
-  _WRAP_METHOD(IndexEntry get_assoc_entry(int id, IndexLookupMethod method, AssocFlags flags, Format format, gint64 value) const, gst_index_get_assoc_entry)
+  _WRAP_METHOD(Gst::IndexEntry get_assoc_entry(int id, IndexLookupMethod method, AssocFlags flags, Format format, gint64 value) const, gst_index_get_assoc_entry)
 
   /** For example,
-   * bool on_filter(const Glib::RefPtr<Gst::Index>& index, IndexEntry entry);.
+   * bool on_filter(const Glib::RefPtr<Gst::Index>& index, Gst::IndexEntry
+   * entry);.
    * The filter function should return true if the entry is to be added to the
    * index, false otherwise.
    */ 
-  typedef sigc::slot<bool, const Glib::RefPtr<Index>&, IndexEntry> SlotFilter;
+  typedef sigc::slot<bool, const Glib::RefPtr<Gst::Index>&, Gst::IndexEntry> SlotFilter;
 
   /** Lets the app register a custom filter slot so that it can select what
    * entries should be stored in the index.
@@ -114,7 +115,7 @@
    * The resolve function should return true if an id could be assigned to
    * writer.
    */ 
-  typedef sigc::slot<bool, const Glib::RefPtr<Index>&, const Glib::RefPtr<Gst::Object>&, Glib::ustring&> SlotResolver;
+  typedef sigc::slot<bool, const Glib::RefPtr<Gst::Index>&, const Glib::RefPtr<Gst::Object>&, Glib::ustring&> SlotResolver;
 
   /** Lets the app register a custom slot to map index ids to writer
    * descriptions.
@@ -124,7 +125,7 @@
 
   /** Emitted when a new entry is added to the index.
    */
-  _WRAP_SIGNAL(void entry_added(const IndexEntry& entry), "entry-added")
+  _WRAP_SIGNAL(void entry_added(const Gst::IndexEntry& entry), "entry-added")
 
   _WRAP_PROPERTY("resolver", Gst::Index::SlotResolver)
 };

Modified: gstreamermm/trunk/gstreamer/src/indexfactory.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/indexfactory.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/indexfactory.hg	Fri Dec 12 03:49:44 2008
@@ -50,10 +50,10 @@
    */
   _WRAP_CREATE(const Glib::ustring& name, const Glib::ustring& longdesc, GType type)
 
-  _WRAP_METHOD(static Glib::RefPtr<IndexFactory> find(const Glib::ustring& name), gst_index_factory_find)
-  _WRAP_METHOD(Glib::RefPtr<Index> create_index(), gst_index_factory_create)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::IndexFactory> find(const Glib::ustring& name), gst_index_factory_find)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Index> create_index(), gst_index_factory_create)
 
-  _WRAP_METHOD(static Glib::RefPtr<Index> create_index(const Glib::ustring& factory_name), gst_index_factory_make)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Index> create_index(const Glib::ustring& factory_name), gst_index_factory_make)
 
   //Destruction occurs in destructor.
   _IGNORE(gst_index_factory_destroy)

Modified: gstreamermm/trunk/gstreamer/src/interface.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/interface.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/interface.hg	Fri Dec 12 03:49:44 2008
@@ -37,10 +37,10 @@
   _CLASS_INTERFACE(Interface, GstImplementsInterface, GST_IMPLEMENTS_INTERFACE, GstImplementsInterface)
 
 public:
-  _WRAP_METHOD(static bool element_implements(const Glib::RefPtr<const Element>&element, GType iface_type), gst_element_implements_interface)
+  _WRAP_METHOD(static bool element_implements(const Glib::RefPtr<const Gst::Element>&element, GType iface_type), gst_element_implements_interface)
 
   template <class T_CastTo>
-  static Glib::RefPtr< ElementInterfaced<T_CastTo> > cast(const Glib::RefPtr<Element>& element);
+  static Glib::RefPtr< Gst::ElementInterfaced<T_CastTo> > cast(const Glib::RefPtr<Gst::Element>& element);
 
   //For some reason, gmmproc thinks that all of the GstElement functions (and
   //signals) are also members of GstImplementsInterface.
@@ -104,7 +104,7 @@
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
 template <class T_CastTo>
-Glib::RefPtr< Gst::ElementInterfaced<T_CastTo> > Interface::cast(const Glib::RefPtr<Element>& element)
+Glib::RefPtr< Gst::ElementInterfaced<T_CastTo> > Interface::cast(const Glib::RefPtr<Gst::Element>& element)
 {
   if (element && gst_element_implements_interface(element->gobj(), T_CastTo::get_type()))
   {

Modified: gstreamermm/trunk/gstreamer/src/message.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/message.ccg	Fri Dec 12 03:49:44 2008
@@ -42,12 +42,12 @@
 
 } //namespace Enums
 
-Glib::RefPtr<Message> Message::copy() const
+Glib::RefPtr<Gst::Message> Message::copy() const
 {
   return Gst::wrap(gst_message_copy(gobj()));
 }
 
-Glib::RefPtr<Message> Message::create_writable()
+Glib::RefPtr<Gst::Message> Message::create_writable()
 {
   return Gst::wrap(gst_message_make_writable(gobj()));
 }
@@ -57,7 +57,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageEos::create(const Glib::RefPtr<Object>& src)
+Glib::RefPtr<Gst::Message> MessageEos::create(const Glib::RefPtr<Gst::Object>& src)
 {
   GstMessage* message = gst_message_new_eos(src->gobj());
   return Gst::Message::wrap(message, false);
@@ -68,7 +68,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageError::create(const Glib::RefPtr<Object>& src, Glib::Error& error, const std::string& debug)
+Glib::RefPtr<Gst::Message> MessageError::create(const Glib::RefPtr<Gst::Object>& src, Glib::Error& error, const std::string& debug)
 {
   GstMessage* message = gst_message_new_error(src->gobj(), error.gobj(),(gchar*)(debug.c_str()));
   return Gst::Message::wrap(message, false);
@@ -112,7 +112,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageWarning::create(const Glib::RefPtr<Object>& src, Glib::Error& error, const std::string& debug)
+Glib::RefPtr<Gst::Message> MessageWarning::create(const Glib::RefPtr<Gst::Object>& src, Glib::Error& error, const std::string& debug)
 {
   GstMessage* message = gst_message_new_warning(src->gobj(), error.gobj(),(gchar*)(debug.c_str()));
   return Gst::Message::wrap(message, false);
@@ -156,7 +156,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageInfo::create(const Glib::RefPtr<Object>& src, Glib::Error& error, const std::string& debug)
+Glib::RefPtr<Gst::Message> MessageInfo::create(const Glib::RefPtr<Gst::Object>& src, Glib::Error& error, const std::string& debug)
 {
   GstMessage* message = gst_message_new_info(src->gobj(), error.gobj(),(gchar*)(debug.c_str()));
   return Gst::Message::wrap(message, false);
@@ -201,7 +201,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageTag::create(const Glib::RefPtr<Object>& src, const TagList& taglist)
+Glib::RefPtr<Gst::Message> MessageTag::create(const Glib::RefPtr<Gst::Object>& src, const Gst::TagList& taglist)
 {
   //We create a copy because gst_message_new_tag() takes ownership:
   GstTagList* c_taglist = gst_tag_list_copy(taglist.gobj());
@@ -209,11 +209,11 @@
   return Gst::Message::wrap(message, false);
 }
 
-TagList MessageTag::parse()
+Gst::TagList MessageTag::parse()
 {
   GstTagList* gst_tag_list = gst_tag_list_new();
   gst_message_parse_tag(gobj(), &gst_tag_list);
-  return TagList(gst_tag_list);
+  return Gst::TagList(gst_tag_list);
 }
 
 MessageBuffering::MessageBuffering(GstMessage* castitem)
@@ -221,7 +221,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageBuffering::create(const Glib::RefPtr<Object>& src, int percent)
+Glib::RefPtr<Gst::Message> MessageBuffering::create(const Glib::RefPtr<Gst::Object>& src, int percent)
 {
   GstMessage* message = gst_message_new_buffering(src->gobj(), percent);
   return Gst::Message::wrap(message, false);
@@ -286,7 +286,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageStateChanged::create(const Glib::RefPtr<Object>& src, State oldstate, State newstate, State pending)
+Glib::RefPtr<Gst::Message> MessageStateChanged::create(const Glib::RefPtr<Gst::Object>& src, State oldstate, State newstate, State pending)
 {
   GstMessage* message = gst_message_new_state_changed(src->gobj(), GstState(oldstate), GstState(newstate), GstState(pending));
   return Gst::Message::wrap(message, false);
@@ -325,7 +325,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageStateDirty::create(const Glib::RefPtr<Object>& src)
+Glib::RefPtr<Gst::Message> MessageStateDirty::create(const Glib::RefPtr<Gst::Object>& src)
 {
   GstMessage* message = gst_message_new_state_dirty(src->gobj());
   return Gst::Message::wrap(message, false);
@@ -336,13 +336,13 @@
 {
 }
 
-Glib::RefPtr<Message> MessageClockProvide::create(const Glib::RefPtr<Object>& src, const Glib::RefPtr<Clock>& clock, bool ready)
+Glib::RefPtr<Gst::Message> MessageClockProvide::create(const Glib::RefPtr<Gst::Object>& src, const Glib::RefPtr<Gst::Clock>& clock, bool ready)
 {
   GstMessage* message = gst_message_new_clock_provide(src->gobj(), clock->gobj(), ready);
   return Gst::Message::wrap(message, false);
 }
 
-void MessageClockProvide::parse(Glib::RefPtr<Clock>& clock, bool& ready)
+void MessageClockProvide::parse(Glib::RefPtr<Gst::Clock>& clock, bool& ready)
 {
   GstClock* cclock = 0;
   gboolean ready_ = false;
@@ -351,7 +351,7 @@
   ready = ready_;
 }
 
-Glib::RefPtr<Clock> MessageClockProvide::parse()
+Glib::RefPtr<Gst::Clock> MessageClockProvide::parse()
 {
   GstClock* cclock = 0;
   gst_message_parse_clock_provide(gobj(), &cclock, NULL);
@@ -370,13 +370,13 @@
 {
 }
 
-Glib::RefPtr<Message> MessageClockLost::create(const Glib::RefPtr<Object>& src, const Glib::RefPtr<Clock>& clock)
+Glib::RefPtr<Gst::Message> MessageClockLost::create(const Glib::RefPtr<Gst::Object>& src, const Glib::RefPtr<Gst::Clock>& clock)
 {
   GstMessage* message = gst_message_new_clock_lost(src->gobj(), clock->gobj());
   return Gst::Message::wrap(message, false);
 }
 
-Glib::RefPtr<Clock> MessageClockLost::parse()
+Glib::RefPtr<Gst::Clock> MessageClockLost::parse()
 {
   GstClock* cclock = 0;
   gst_message_parse_clock_lost(gobj(), &cclock);
@@ -388,13 +388,13 @@
 {
 }
 
-Glib::RefPtr<Message> MessageNewClock::create(const Glib::RefPtr<Object>& src, const Glib::RefPtr<Clock>& clock)
+Glib::RefPtr<Gst::Message> MessageNewClock::create(const Glib::RefPtr<Gst::Object>& src, const Glib::RefPtr<Gst::Clock>& clock)
 {
   GstMessage* message = gst_message_new_new_clock(src->gobj(), clock->gobj());
   return Gst::Message::wrap(message, false);
 }
 
-Glib::RefPtr<Clock> MessageNewClock::parse()
+Glib::RefPtr<Gst::Clock> MessageNewClock::parse()
 {
   GstClock* cclock = 0;
   gst_message_parse_new_clock(gobj(), &cclock);
@@ -406,14 +406,14 @@
 {
 }
 
-Glib::RefPtr<Message> MessageApplication::create(const Glib::RefPtr<Object>& src, Structure& structure)
+Glib::RefPtr<Gst::Message> MessageApplication::create(const Glib::RefPtr<Gst::Object>& src, Gst::Structure& structure)
 {
   GstStructure* copy_struct = gst_structure_copy(structure.gobj());
   GstMessage* message = gst_message_new_application(src->gobj(), copy_struct);
   return Gst::Message::wrap(message, false);
 }
 
-Glib::RefPtr<Message> MessageApplication::create(const Glib::RefPtr<Object>& src)
+Glib::RefPtr<Gst::Message> MessageApplication::create(const Glib::RefPtr<Gst::Object>& src)
 {
   GstMessage* message = gst_message_new_application(src->gobj(), NULL);
   return Gst::Message::wrap(message, false);
@@ -424,14 +424,14 @@
 {
 }
 
-Glib::RefPtr<Message> MessageElement::create(const Glib::RefPtr<Object>& src, Structure& structure)
+Glib::RefPtr<Gst::Message> MessageElement::create(const Glib::RefPtr<Gst::Object>& src, Gst::Structure& structure)
 {
   GstStructure* copy_struct = gst_structure_copy(structure.gobj());
   GstMessage* message = gst_message_new_element(src->gobj(), copy_struct);
   return Gst::Message::wrap(message, false);
 }
 
-Glib::RefPtr<Message> MessageElement::create(const Glib::RefPtr<Object>& src)
+Glib::RefPtr<Gst::Message> MessageElement::create(const Glib::RefPtr<Gst::Object>& src)
 {
   GstMessage* message = gst_message_new_element(src->gobj(), NULL);
   return Gst::Message::wrap(message, false);
@@ -442,7 +442,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageCustom::create(MessageType type, const Glib::RefPtr<Object>& src, Structure& structure)
+Glib::RefPtr<Gst::Message> MessageCustom::create(MessageType type, const Glib::RefPtr<Gst::Object>& src, Gst::Structure& structure)
 {
   GstStructure* copy_struct = gst_structure_copy(structure.gobj());
   GstMessage* message = gst_message_new_custom(GstMessageType(type),
@@ -450,7 +450,7 @@
   return Gst::Message::wrap(message, false);
 }
 
-Glib::RefPtr<Message> MessageCustom::create(MessageType type, const Glib::RefPtr<Object>& src)
+Glib::RefPtr<Gst::Message> MessageCustom::create(MessageType type, const Glib::RefPtr<Gst::Object>& src)
 {
   GstMessage* message = gst_message_new_custom(GstMessageType(type),
     src->gobj(), NULL);
@@ -462,7 +462,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageSegmentStart::create(const Glib::RefPtr<Object>& src, Format format, gint64 position)
+Glib::RefPtr<Gst::Message> MessageSegmentStart::create(const Glib::RefPtr<Gst::Object>& src, Format format, gint64 position)
 {
   GstMessage* message = gst_message_new_segment_start(src->gobj(), GstFormat(format), position);
   return Gst::Message::wrap(message, false);
@@ -492,7 +492,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageSegmentDone::create(const Glib::RefPtr<Object>& src, Format format, gint64 position)
+Glib::RefPtr<Gst::Message> MessageSegmentDone::create(const Glib::RefPtr<Gst::Object>& src, Format format, gint64 position)
 {
   GstMessage* message = gst_message_new_segment_done(src->gobj(), GstFormat(format), position);
   return Gst::Message::wrap(message, false);
@@ -522,7 +522,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageDuration::create(const Glib::RefPtr<Object>& src, Format format, gint64 position)
+Glib::RefPtr<Gst::Message> MessageDuration::create(const Glib::RefPtr<Gst::Object>& src, Format format, gint64 position)
 {
   GstMessage* message = gst_message_new_duration(src->gobj(), GstFormat(format), position);
   return Gst::Message::wrap(message, false);
@@ -552,7 +552,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageLatency::create(const Glib::RefPtr<Object>& src)
+Glib::RefPtr<Gst::Message> MessageLatency::create(const Glib::RefPtr<Gst::Object>& src)
 {
   GstMessage* message = gst_message_new_latency(src->gobj());
   return Gst::Message::wrap(message, false);
@@ -563,7 +563,7 @@
 {
 }
 
-Glib::RefPtr<Message> MessageAsyncStart::create(const Glib::RefPtr<Object>& src, bool new_base_time)
+Glib::RefPtr<Gst::Message> MessageAsyncStart::create(const Glib::RefPtr<Gst::Object>& src, bool new_base_time)
 {
   GstMessage* message = gst_message_new_async_start(src->gobj(), new_base_time);
   return Gst::Message::wrap(message, false);
@@ -581,76 +581,76 @@
 {
 }
 
-Glib::RefPtr<Message> MessageAsyncDone::create(const Glib::RefPtr<Object>& src)
+Glib::RefPtr<Gst::Message> MessageAsyncDone::create(const Glib::RefPtr<Gst::Object>& src)
 {
   GstMessage* message = gst_message_new_async_done(src->gobj());
   return Gst::Message::wrap(message, false);
 }
 
-Glib::RefPtr<Message> Message::wrap(GstMessage* message, bool take_copy)
+Glib::RefPtr<Gst::Message> Message::wrap(GstMessage* message, bool take_copy)
 {
-  Glib::RefPtr<Message> result;
+  Glib::RefPtr<Gst::Message> result;
 
   if(!message)
     return result;
 
   switch (GST_MESSAGE_TYPE(message)) {
     case GST_MESSAGE_EOS:
-      result = Glib::RefPtr<Message>( new Gst::MessageEos(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageEos(message) );
       break;
     case GST_MESSAGE_ERROR:
-      result = Glib::RefPtr<Message>( new Gst::MessageError(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageError(message) );
       break;
     case GST_MESSAGE_WARNING:
-      result = Glib::RefPtr<Message>( new Gst::MessageWarning(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageWarning(message) );
       break;
     case GST_MESSAGE_INFO:
-      result = Glib::RefPtr<Message>( new Gst::MessageInfo(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageInfo(message) );
       break;
     case GST_MESSAGE_TAG:
-      result = Glib::RefPtr<Message>( new Gst::MessageTag(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageTag(message) );
       break;
     case GST_MESSAGE_BUFFERING:
-      result = Glib::RefPtr<MessageBuffering>( new Gst::MessageBuffering(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageBuffering(message) );
       break;
     case GST_MESSAGE_STATE_CHANGED:
-      result = Glib::RefPtr<Message>( new Gst::MessageStateChanged(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageStateChanged(message) );
       break;
     case GST_MESSAGE_STATE_DIRTY:
-      result = Glib::RefPtr<Message>( new Gst::MessageStateDirty(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageStateDirty(message) );
       break;
     case GST_MESSAGE_CLOCK_PROVIDE:
-      result = Glib::RefPtr<Message>( new Gst::MessageClockProvide(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageClockProvide(message) );
       break;
     case GST_MESSAGE_CLOCK_LOST:
-      result = Glib::RefPtr<Message>( new Gst::MessageClockLost(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageClockLost(message) );
       break;
     case GST_MESSAGE_NEW_CLOCK:
-      result = Glib::RefPtr<Message>( new Gst::MessageNewClock(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageNewClock(message) );
       break;
     case GST_MESSAGE_APPLICATION:
-      result = Glib::RefPtr<Message>( new Gst::MessageApplication(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageApplication(message) );
       break;
     case GST_MESSAGE_ELEMENT:
-      result = Glib::RefPtr<Message>( new Gst::MessageElement(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageElement(message) );
       break;
     case GST_MESSAGE_SEGMENT_START:
-      result = Glib::RefPtr<Message>( new Gst::MessageSegmentStart(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageSegmentStart(message) );
       break;
     case GST_MESSAGE_SEGMENT_DONE:
-      result = Glib::RefPtr<Message>( new Gst::MessageSegmentDone(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageSegmentDone(message) );
       break;
     case GST_MESSAGE_DURATION:
-      result = Glib::RefPtr<MessageDuration>( new Gst::MessageDuration(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageDuration(message) );
       break;
     case GST_MESSAGE_LATENCY:
-      result = Glib::RefPtr<Message>( new Gst::MessageLatency(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageLatency(message) );
       break;
     case GST_MESSAGE_ASYNC_START:
-      result = Glib::RefPtr<Message>( new Gst::MessageAsyncStart(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageAsyncStart(message) );
       break;
     case GST_MESSAGE_ASYNC_DONE:
-      result = Glib::RefPtr<Message>( new Gst::MessageAsyncDone(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageAsyncDone(message) );
       break;
     case GST_MESSAGE_UNKNOWN:
     case GST_MESSAGE_ANY:
@@ -658,7 +658,7 @@
       break;
       /* The rest of the message types are custom ones */
     default:
-      result = Glib::RefPtr<Message>( new Gst::MessageCustom(message) );
+      result = Glib::RefPtr<Gst::Message>( new Gst::MessageCustom(message) );
   }
 
   if(result && take_copy)

Modified: gstreamermm/trunk/gstreamer/src/message.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/message.hg	Fri Dec 12 03:49:44 2008
@@ -78,20 +78,20 @@
    *  (rather than a derived one) because the derived Gst::Message classes
    *  do not correspond to GType types in the GStreamer API.
    */
-  static Glib::RefPtr<Message> wrap(GstMessage* message, bool take_copy=false);
+  static Glib::RefPtr<Gst::Message> wrap(GstMessage* message, bool take_copy=false);
 
   /** Creates a copy of the message.  MT safe.
    * @return A copy of the message.
    */
-   Glib::RefPtr<Message> copy() const;
+   Glib::RefPtr<Gst::Message> copy() const;
 
-  _WRAP_METHOD(const Structure get_structure() const, gst_message_get_structure)
+  _WRAP_METHOD(const Gst::Structure get_structure() const, gst_message_get_structure)
 
   /** Checks if a message is writable. If not, a writable copy is made and
    * returned.
    * @return A Gst::Message (possibly the same pointer) that is writable.
    */
-   Glib::RefPtr<Message> create_writable();
+   Glib::RefPtr<Gst::Message> create_writable();
 
   /** Get the GstMessageType of message.
    */
@@ -128,7 +128,7 @@
    * @param src The object originating the message.
    * @return The new eos message. MT safe. 
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src);
 };
 
 /** An error message.
@@ -149,7 +149,7 @@
    * @param debug A debugging string for something or other.
    * @return The new error message. MT safe. 
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, Glib::Error& error, const std::string& debug);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, Glib::Error& error, const std::string& debug);
 
   /** Extracts the Glib::Error and debug string from the Gst::MessageError.
    *
@@ -194,7 +194,7 @@
    * @param debug A debugging string for something or other.
    * @return The new warning message. MT safe. 
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, Glib::Error& error, const std::string& debug);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, Glib::Error& error, const std::string& debug);
 
   /** Extracts the Glib::Error and debug string from the Gst::MessageWarning.
    *
@@ -240,7 +240,7 @@
    *
    * Since 0.10.12 MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, Glib::Error& error, const std::string& debug);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, Glib::Error& error, const std::string& debug);
 
   /** Extracts the Glib::Error and debug string from the Gst::MessageInfo.
    *
@@ -284,7 +284,7 @@
    * @param tag_list The tag list for the message.
    * @return The new tag message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, const TagList& taglist);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, const Gst::TagList& taglist);
 
   /** Extracts and returns the Gst::TagList from the Gst::MessageTag.
    *
@@ -292,7 +292,7 @@
    *
    * @return A copy of the Gst::TagList.
    */
-  TagList parse();
+  Gst::TagList parse();
   _IGNORE(gst_message_parse_tag)
 };
 
@@ -322,7 +322,7 @@
    *
    * Since 0.10.11 MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, int percent);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, int percent);
 
   /** Extracts and returns the buffering percent from the
    * Gst::MessageBuffering.
@@ -398,7 +398,7 @@
    * @param pending The pending (target) state.
    * @return The new state change message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, State oldstate, State newstate, State pending);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, State oldstate, State newstate, State pending);
 
   /** Extracts the old, new and pending states from the
    * Gst::MessageStateChanged.
@@ -452,7 +452,7 @@
    * @param src The object originating the message.
    * @return The new state dirty message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src);
 };
 
 /** A clock provide message.
@@ -474,7 +474,7 @@
    * @param ready true if the sender can provide a clock.
    * @return The new provide clock message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, const Glib::RefPtr<Clock>& clock, bool ready);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, const Glib::RefPtr<Gst::Clock>& clock, bool ready);
 
   /** Extracts the clock and ready flag from the Gst::MessageClockProvide. The
    * clock object returned remains valid until the message is freed.
@@ -484,7 +484,7 @@
    * @param clock Location in which to hold a clock object.
    * @param ready Location in which to hold the ready flag.
    */
-  void parse(Glib::RefPtr<Clock>& clock, bool& ready);
+  void parse(Glib::RefPtr<Gst::Clock>& clock, bool& ready);
   _IGNORE(gst_message_parse_clock_provide)
 
   /** Extracts and returns the clock from the Gst::MessageClockProvide. The
@@ -494,7 +494,7 @@
    *
    * @return The clock object of the message.
    */
-  Glib::RefPtr<Clock> parse();
+  Glib::RefPtr<Gst::Clock> parse();
 
   /** Extracts and returns the ready flag from the Gst::MessageClockProvide.
    *
@@ -522,7 +522,7 @@
    * @param clock The clock that was lost.
    * @return The new clock lost message. MT safe. 
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, const Glib::RefPtr<Clock>& clock);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, const Glib::RefPtr<Gst::Clock>& clock);
 
   /** Extracts and returns the lost clock from the Gst::MessageClockLost. The
    * clock object returned remains valid until the message is freed.
@@ -530,7 +530,7 @@
    * MT safe.
    * @return The lost clock.
    */
-  Glib::RefPtr<Clock> parse();
+  Glib::RefPtr<Gst::Clock> parse();
   _IGNORE(gst_message_parse_clock_lost)
 };
 
@@ -549,7 +549,7 @@
    * @param clock The new selected clock.
    * @return The new new clock message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, const Glib::RefPtr<Clock>& clock);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, const Glib::RefPtr<Gst::Clock>& clock);
 
   /** Extracts and returns the new clock from the Gst::MessageNewClock. The
    * clock object returned remains valid until the message is freed.
@@ -558,7 +558,7 @@
    *
    * @return The selected new clock.
    */
-  Glib::RefPtr<Clock> parse();
+  Glib::RefPtr<Gst::Clock> parse();
   _IGNORE(gst_message_parse_new_clock)
 };
 
@@ -578,7 +578,7 @@
    * copied.
    * @return The new application message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, Structure& structure);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, Gst::Structure& structure);
 
   /** Create a new application-typed message (no Gst::Structure is needed).
    * GStreamer will never create these messages; they are a gift from us to
@@ -587,7 +587,7 @@
    * @param src The object originating the message.
    * @return The new application message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src);
 };
 
 /** An element specific message.
@@ -608,7 +608,7 @@
    * copy of the structure.
    * @return The new element message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, Structure& structure);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, Gst::Structure& structure);
 
   /** Create a new element-specific message. This is meant as a generic way of
    * allowing one-way communication from an element to an application, for
@@ -619,7 +619,7 @@
    * @param src The object originating the message.
    * @return The new element message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src);
 };
 
 /** A custom message.
@@ -639,7 +639,7 @@
    * a copy of the structure.
    * @return The new message. MT safe.
    */
-  static Glib::RefPtr<Message> create(MessageType type, const Glib::RefPtr<Object>& src, Structure& structure);
+  static Glib::RefPtr<Gst::Message> create(MessageType type, const Glib::RefPtr<Gst::Object>& src, Gst::Structure& structure);
 
   /** Create a new custom-typed message. This can be used for anything not
    * handled by other message-specific functions to pass a message to the app.
@@ -649,7 +649,7 @@
    * @param src The object originating the message.
    * @return The new message. MT safe.
    */
-  static Glib::RefPtr<Message> create(MessageType type, const Glib::RefPtr<Object>& src);
+  static Glib::RefPtr<Gst::Message> create(MessageType type, const Glib::RefPtr<Gst::Object>& src);
 };
 
 /** A segment start message.
@@ -670,7 +670,7 @@
    * @param position The position of the segment being played.
    * @return The new segment start message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, Format format, gint64 position);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, Format format, gint64 position);
 
   /** Extracts the position and format from the segment start message.
    *
@@ -717,7 +717,7 @@
    * @param position The position of the segment being done.
    * @return The new segment done message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, Format format, gint64 position);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, Format format, gint64 position);
 
   /** Extracts the position and format from the segment done message.
    *
@@ -767,7 +767,7 @@
    * @param duration The new duration.  
    * @return The new duration message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, Format format, gint64 position);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, Format format, gint64 position);
 
   /** Extracts the duration and format from the duration message. The duration
    * might be Gst::CLOCK_TIME_NONE, which indicates that the duration has
@@ -820,7 +820,7 @@
    *
    * Since 0.10.12.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src);
 };
 
 /** An asynchronous start message.
@@ -841,7 +841,7 @@
    *
    * Since 0.10.13 
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src, bool new_base_time);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src, bool new_base_time);
 
   /** Extract and return the boolean new_base_time from the async_start
    * message.
@@ -870,7 +870,7 @@
    * @param src The object originating the message.  
    * @return The new async_done message. MT safe.
    */
-  static Glib::RefPtr<Message> create(const Glib::RefPtr<Object>& src);
+  static Glib::RefPtr<Gst::Message> create(const Glib::RefPtr<Gst::Object>& src);
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/pad.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/pad.ccg	Fri Dec 12 03:49:44 2008
@@ -82,26 +82,26 @@
   : _CONSTRUCT("name", NULL, "direction", dir)
 {}
 
-Pad::Pad(const Glib::RefPtr<PadTemplate>& templ, const Glib::ustring& name)
+Pad::Pad(const Glib::RefPtr<Gst::PadTemplate>& templ, const Glib::ustring& name)
   : _CONSTRUCT("name", name.c_str(), "direction", templ->get_direction(),
       "template", templ->gobj())
 {}
 
-Pad::Pad(const Glib::RefPtr<PadTemplate>& templ)
+Pad::Pad(const Glib::RefPtr<Gst::PadTemplate>& templ)
   : _CONSTRUCT("name", NULL, "direction", templ->get_direction(), "template",
       templ->gobj())
 {}
 
 // This is handcoded because the documentation tells us that we need to copy
 // the Caps
-Glib::RefPtr<const Caps> Pad::get_pad_template_caps() const
+Glib::RefPtr<const Gst::Caps> Pad::get_pad_template_caps() const
 {
   const GstCaps* caps = gst_pad_get_pad_template_caps(const_cast<GstPad*>(gobj()));
   GstCaps* copy_caps = gst_caps_copy(caps);
   return Glib::wrap(copy_caps, false);
 }
 
-FlowReturn Pad::alloc_buffer(guint64 offset, int size, const Glib::RefPtr<Caps>& caps, Glib::RefPtr<Buffer>& buffer)
+FlowReturn Pad::alloc_buffer(guint64 offset, int size, const Glib::RefPtr<Gst::Caps>& caps, Glib::RefPtr<Gst::Buffer>& buffer)
 {
   GstBuffer* c_buffer = 0;
   GstFlowReturn result = gst_pad_alloc_buffer(gobj(), offset, size, caps->gobj(), &c_buffer);
@@ -109,7 +109,7 @@
   return FlowReturn(result);
 }
 
-FlowReturn Pad::alloc_buffer_and_set_caps(guint64 offset, int size, const Glib::RefPtr<Caps>& caps, Glib::RefPtr<Buffer>& buffer)
+FlowReturn Pad::alloc_buffer_and_set_caps(guint64 offset, int size, const Glib::RefPtr<Gst::Caps>& caps, Glib::RefPtr<Gst::Buffer>& buffer)
 {
   GstBuffer* c_buffer = 0;
   GstFlowReturn result = gst_pad_alloc_buffer_and_set_caps(gobj(), offset, size, caps->gobj(), &c_buffer);
@@ -117,7 +117,7 @@
   return FlowReturn(result);
 }
 
-FlowReturn Pad::get_range(guint64 offset, guint size, Glib::RefPtr<Buffer>& buffer)
+FlowReturn Pad::get_range(guint64 offset, guint size, Glib::RefPtr<Gst::Buffer>& buffer)
 {
   GstBuffer* c_buffer = 0;
   GstFlowReturn result = gst_pad_get_range(gobj(), offset, size, &c_buffer);
@@ -125,19 +125,19 @@
   return FlowReturn(result);
 }
 
-FlowReturn Pad::push(const Glib::RefPtr<Buffer>& buffer)
+FlowReturn Pad::push(const Glib::RefPtr<Gst::Buffer>& buffer)
 {
   buffer->reference();
   return FlowReturn(gst_pad_push(gobj(), buffer->gobj()));
 }
 
-bool Pad::push_event(const Glib::RefPtr<Event>& event)
+bool Pad::push_event(const Glib::RefPtr<Gst::Event>& event)
 {
   event->reference();
   return gst_pad_push_event(gobj(), event->gobj());
 }
 
-FlowReturn Pad::pull_range(guint64 offset, guint size, Glib::RefPtr<Buffer>& buffer)
+FlowReturn Pad::pull_range(guint64 offset, guint size, Glib::RefPtr<Gst::Buffer>& buffer)
 {
   GstBuffer* c_buffer = 0;
   GstFlowReturn result = gst_pad_pull_range(gobj(), offset, size, &c_buffer);
@@ -145,7 +145,7 @@
   return FlowReturn(result);
 }
 
-bool Pad::send_event(const Glib::RefPtr<Event>& event)
+bool Pad::send_event(const Glib::RefPtr<Gst::Event>& event)
 {
   event->reference();
   return gst_pad_send_event(gobj(), event->gobj());
@@ -171,7 +171,7 @@
   return gst_pad_query_peer_duration(const_cast<GstPad*>(gobj()), reinterpret_cast<GstFormat*>(&format), NULL);
 }
 
-FlowReturn Pad::chain(const Glib::RefPtr<Buffer>& buffer)
+FlowReturn Pad::chain(const Glib::RefPtr<Gst::Buffer>& buffer)
 {
   buffer->reference();
   return FlowReturn(gst_pad_chain(gobj(), buffer->gobj()));

Modified: gstreamermm/trunk/gstreamer/src/pad.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/pad.hg	Fri Dec 12 03:49:44 2008
@@ -80,14 +80,14 @@
 protected:
   _WRAP_CTOR(Pad(const Glib::ustring& name, PadDirection direction), gst_pad_new)
   Pad(PadDirection dir);
-  Pad(const Glib::RefPtr<PadTemplate>& templ, const Glib::ustring& name);
-  Pad(const Glib::RefPtr<PadTemplate>& templ);
+  Pad(const Glib::RefPtr<Gst::PadTemplate>& templ, const Glib::ustring& name);
+  Pad(const Glib::RefPtr<Gst::PadTemplate>& templ);
 
 public:
   /** For example,
    * void on_block(const Glib::RefPtr<Gst::Pad>& pad, bool blocked);.
    */
-  typedef sigc::slot<void, const Glib::RefPtr<Pad>&, bool> SlotBlock;
+  typedef sigc::slot<void, const Glib::RefPtr<Gst::Pad>&, bool> SlotBlock;
 
   /** For example,
    * bool on_have_data(const Glib::RefPtr<Gst::Pad>& pad, const
@@ -95,7 +95,7 @@
    * The data method should return true to keep the data in the pipeline, false
    * to drop it (throw it away).
    */
-  typedef sigc::slot< bool, const Glib::RefPtr<Pad>&, const Glib::RefPtr<MiniObject>& > SlotData;
+  typedef sigc::slot< bool, const Glib::RefPtr<Gst::Pad>&, const Glib::RefPtr<Gst::MiniObject>& > SlotData;
 
   /** Creates a new pad with the given name in the given direction.
    *
@@ -119,7 +119,7 @@
    * @param name The name of the element.
    * @return A new Gst::Pad, or NULL in case of an error.
    */
-  _WRAP_CREATE(const Glib::RefPtr<PadTemplate>& pad_template)
+  _WRAP_CREATE(const Glib::RefPtr<Gst::PadTemplate>& pad_template)
 
   /** Creates a new pad with a guaranteed unique name (across all pads) from
    * the given template.
@@ -127,36 +127,36 @@
    * @param templ The pad template to use.
    * @return A new Gst::Pad, or NULL in case of an error.
    */
-  _WRAP_CREATE(const Glib::RefPtr<PadTemplate>& pad_template, const Glib::ustring& name)
+  _WRAP_CREATE(const Glib::RefPtr<Gst::PadTemplate>& pad_template, const Glib::ustring& name)
 
   _WRAP_METHOD(PadDirection get_direction() const, gst_pad_get_direction)
-  _WRAP_METHOD(Glib::RefPtr<Element> get_parent_element(), gst_pad_get_parent_element)
-  _WRAP_METHOD(Glib::RefPtr<const Element> get_parent_element() const, gst_pad_get_parent_element, constversion)
-  _WRAP_METHOD(Glib::RefPtr<PadTemplate> get_pad_template() const, gst_pad_get_pad_template)
-  _WRAP_METHOD(PadLinkReturn link(const Glib::RefPtr<Pad>& sink_pad), gst_pad_link)
-  _WRAP_METHOD(bool unlink(const Glib::RefPtr<Pad>& sink_pad), gst_pad_unlink)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Element> get_parent_element(), gst_pad_get_parent_element)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Element> get_parent_element() const, gst_pad_get_parent_element, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gst::PadTemplate> get_pad_template() const, gst_pad_get_pad_template)
+  _WRAP_METHOD(PadLinkReturn link(const Glib::RefPtr<Gst::Pad>& sink_pad), gst_pad_link)
+  _WRAP_METHOD(bool unlink(const Glib::RefPtr<Gst::Pad>& sink_pad), gst_pad_unlink)
   _WRAP_METHOD(bool is_linked() const, gst_pad_is_linked)
-  _WRAP_METHOD(bool can_link(const Glib::RefPtr<Pad>& other_pad), gst_pad_can_link)
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_caps(), gst_pad_get_caps)
-  _WRAP_METHOD(Glib::RefPtr<const Caps> get_caps() const, gst_pad_get_caps, constversion)
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_allowed_caps(), gst_pad_get_allowed_caps)
-  _WRAP_METHOD(Glib::RefPtr<const Caps> get_allowed_caps() const, gst_pad_get_allowed_caps, constversion)
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_negotiated_caps(), gst_pad_get_negotiated_caps)
-  _WRAP_METHOD(Glib::RefPtr<const Caps> get_negotiated_caps() const, gst_pad_get_negotiated_caps, constversion)
+  _WRAP_METHOD(bool can_link(const Glib::RefPtr<Gst::Pad>& other_pad), gst_pad_can_link)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> get_caps(), gst_pad_get_caps)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Caps> get_caps() const, gst_pad_get_caps, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> get_allowed_caps(), gst_pad_get_allowed_caps)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Caps> get_allowed_caps() const, gst_pad_get_allowed_caps, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> get_negotiated_caps(), gst_pad_get_negotiated_caps)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Caps> get_negotiated_caps() const, gst_pad_get_negotiated_caps, constversion)
 
   //The documentation gst_pad_get_pad_template_caps() suggests that there shouldn't be a non-const return:
   /** Gets the capabilities for pad's template.
    *
    * @return The Gst::Caps of this pad template.
    */
-  Glib::RefPtr<const Caps> get_pad_template_caps() const;
+  Glib::RefPtr<const Gst::Caps> get_pad_template_caps() const;
   _IGNORE(gst_pad_get_pad_template_caps)
 
-  _WRAP_METHOD(bool set_caps (const Glib::RefPtr<Caps>& caps), gst_pad_set_caps)
-  _WRAP_METHOD(Glib::RefPtr<Pad> get_peer(), gst_pad_get_peer)
-  _WRAP_METHOD(Glib::RefPtr<const Pad> get_peer() const, gst_pad_get_peer, constversion)
-  _WRAP_METHOD(Glib::RefPtr<Caps> peer_get_caps(), gst_pad_peer_get_caps)
-  _WRAP_METHOD(Glib::RefPtr<const Caps> peer_get_caps() const, gst_pad_peer_get_caps, constversion)
+  _WRAP_METHOD(bool set_caps (const Glib::RefPtr<Gst::Caps>& caps), gst_pad_set_caps)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Pad> get_peer(), gst_pad_get_peer)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Pad> get_peer() const, gst_pad_get_peer, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> peer_get_caps(), gst_pad_peer_get_caps)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Caps> peer_get_caps() const, gst_pad_peer_get_caps, constversion)
   _WRAP_METHOD(void use_fixed_caps(), gst_pad_use_fixed_caps)
   _WRAP_METHOD(bool is_active() const, gst_pad_is_active)
   _WRAP_METHOD(bool set_blocked(bool blocked = true), gst_pad_set_blocked)
@@ -229,7 +229,7 @@
   _WRAP_METHOD(void remove_buffer_probe(guint handler_id), gst_pad_remove_buffer_probe)
   _WRAP_METHOD(void remove_event_probe(guint handler_id), gst_pad_remove_event_probe)
 
-  //This is handwritten because conversion from Glib::RefPtr<Buffer>& to
+  //This is handwritten because conversion from Glib::RefPtr<Gst::Buffer>& to
   //GstBuffer** is difficult.
   /** Allocates a new, empty buffer optimized to push to pad pad. This function
    * only works if pad is a source pad and has a peer.
@@ -247,10 +247,10 @@
    * can occur if the pad is not connected or when the downstream peer elements
    * cannot provide an acceptable buffer. MT safe.
    */
-  FlowReturn alloc_buffer(guint64 offset, int size, const Glib::RefPtr<Caps>& caps, Glib::RefPtr<Buffer>& buf);
+  FlowReturn alloc_buffer(guint64 offset, int size, const Glib::RefPtr<Gst::Caps>& caps, Glib::RefPtr<Gst::Buffer>& buf);
   _IGNORE(gst_pad_alloc_buffer)
 
-  //This is handwritten because conversion from Glib::RefPtr<Buffer>& to
+  //This is handwritten because conversion from Glib::RefPtr<Gst::Buffer>& to
   //GstBuffer** is difficult.
   /** In addition to the function alloc_buffer(), this function automatically
    * calls set_caps() when the caps of the newly allocated buffer are different
@@ -265,20 +265,20 @@
    * can occur if the pad is not connected or when the downstream peer elements
    * cannot provide an acceptable buffer. MT safe.
    */
-  FlowReturn alloc_buffer_and_set_caps(guint64 offset, int size, const Glib::RefPtr<Caps>& caps, Glib::RefPtr<Buffer>& buf);
+  FlowReturn alloc_buffer_and_set_caps(guint64 offset, int size, const Glib::RefPtr<Gst::Caps>& caps, Glib::RefPtr<Gst::Buffer>& buf);
   _IGNORE(gst_pad_alloc_buffer_and_set_caps)
 
-  //This is handwritten because conversion from Glib::RefPtr<Buffer>& to
+  //This is handwritten because conversion from Glib::RefPtr<Gst::Buffer>& to
   //GstBuffer** is difficult.
-  FlowReturn get_range(guint64 offset, guint size, Glib::RefPtr<Buffer>& buffer);
+  FlowReturn get_range(guint64 offset, guint size, Glib::RefPtr<Gst::Buffer>& buffer);
   _IGNORE(gst_pad_get_range)
 
-  _WRAP_METHOD(bool accept_caps(const Glib::RefPtr<Caps>& caps), gst_pad_accept_caps)
-  _WRAP_METHOD(Glib::RefPtr<Caps> proxy_getcaps(), gst_pad_proxy_getcaps)
-  _WRAP_METHOD(Glib::RefPtr<const Caps > proxy_getcaps() const, gst_pad_proxy_getcaps, constversion)
-  _WRAP_METHOD(bool proxy_setcaps(const Glib::RefPtr<Caps>& caps), gst_pad_proxy_setcaps)
-  _WRAP_METHOD(void fixate_caps(const Glib::RefPtr<Caps>& caps), gst_pad_fixate_caps)
-  _WRAP_METHOD(bool peer_accept_caps(const Glib::RefPtr<Caps>& caps), gst_pad_peer_accept_caps)
+  _WRAP_METHOD(bool accept_caps(const Glib::RefPtr<Gst::Caps>& caps), gst_pad_accept_caps)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> proxy_getcaps(), gst_pad_proxy_getcaps)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Caps > proxy_getcaps() const, gst_pad_proxy_getcaps, constversion)
+  _WRAP_METHOD(bool proxy_setcaps(const Glib::RefPtr<Gst::Caps>& caps), gst_pad_proxy_setcaps)
+  _WRAP_METHOD(void fixate_caps(const Glib::RefPtr<Gst::Caps>& caps), gst_pad_fixate_caps)
+  _WRAP_METHOD(bool peer_accept_caps(const Glib::RefPtr<Gst::Caps>& caps), gst_pad_peer_accept_caps)
 
   // This method is written manually because an extra ref is necessary
   /** Pushes a buffer to the peer of the pad. The pad must be a source pad,
@@ -300,7 +300,7 @@
    * @param buffer The Gst::Buffer to push.
    * @return A Gst::FlowReturn from the peer pad. MT safe.
    */
-  FlowReturn push(const Glib::RefPtr<Buffer>& buffer);
+  FlowReturn push(const Glib::RefPtr<Gst::Buffer>& buffer);
   _IGNORE(gst_pad_push)
 
   // This method is written manually because an extra ref is necessary
@@ -310,12 +310,12 @@
    * @param event The GstEvent to send to the pad.
    * @return true if the event was handled. MT safe.
    */
-  bool push_event(const Glib::RefPtr<Event>& event);
+  bool push_event(const Glib::RefPtr<Gst::Event>& event);
   _IGNORE(gst_pad_push_event)
 
   _WRAP_METHOD(bool check_pull_range() const, gst_pad_check_pull_range)
 
-  FlowReturn pull_range(guint64 offset, guint size, Glib::RefPtr<Buffer>& buffer);
+  FlowReturn pull_range(guint64 offset, guint size, Glib::RefPtr<Gst::Buffer>& buffer);
   _IGNORE(gst_pad_pull_range)
 
   _WRAP_METHOD(bool activate_pull(bool active = true), gst_pad_activate_pull)
@@ -344,13 +344,13 @@
    * @param event The Gst::Event to send to the pad.
    * @return true if the event was handled. 
    */
-  bool send_event(const Glib::RefPtr<Event>& event);
+  bool send_event(const Glib::RefPtr<Gst::Event>& event);
   _IGNORE(gst_pad_send_event)
 
-  _WRAP_METHOD(bool event_default(const Glib::RefPtr<Event>& event), gst_pad_event_default)
-  _WRAP_METHOD(bool query(const Glib::RefPtr<Query>& query), gst_pad_query)
-  _WRAP_METHOD(bool peer_query(const Glib::RefPtr<Query>& query), gst_pad_peer_query)
-  _WRAP_METHOD(bool query_default(const Glib::RefPtr<Query>& query), gst_pad_query_default)
+  _WRAP_METHOD(bool event_default(const Glib::RefPtr<Gst::Event>& event), gst_pad_event_default)
+  _WRAP_METHOD(bool query(const Glib::RefPtr<Gst::Query>& query), gst_pad_query)
+  _WRAP_METHOD(bool peer_query(const Glib::RefPtr<Gst::Query>& query), gst_pad_peer_query)
+  _WRAP_METHOD(bool query_default(const Glib::RefPtr<Gst::Query>& query), gst_pad_query_default)
   _WRAP_METHOD(bool query_position(Format& format, gint64& position) const, gst_pad_query_position)
 
   /** Queries a pad for the stream position parsing only the format.
@@ -395,12 +395,12 @@
   _WRAP_METHOD(Glib::ArrayHandle<QueryType> get_query_types() const, gst_pad_get_query_types)
   _WRAP_METHOD(Glib::ArrayHandle<QueryType> get_query_types_default() const, gst_pad_get_query_types_default)
 
-#m4 _CONVERSION(`GList*', `Glib::ListHandle< Glib::RefPtr<Pad> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Pad> > get_internal_links(), gst_pad_get_internal_links)
-  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Pad> > get_internal_links_default(), gst_pad_get_internal_links_default)
+#m4 _CONVERSION(`GList*', `Glib::ListHandle< Glib::RefPtr<Gst::Pad> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
+  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Gst::Pad> > get_internal_links(), gst_pad_get_internal_links)
+  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Gst::Pad> > get_internal_links_default(), gst_pad_get_internal_links_default)
 
   // This method is written manually because an extra ref is necessary
-  FlowReturn chain(const Glib::RefPtr<Buffer>& buffer);
+  FlowReturn chain(const Glib::RefPtr<Gst::Buffer>& buffer);
   _IGNORE(gst_pad_chain)
 
   _WRAP_METHOD(bool pause_task() , gst_pad_pause_task)
@@ -433,10 +433,10 @@
   //and buffer probes do emit.
   _IGNORE_SIGNAL(have_data)
 
-#m4 _CONVERSION(`GstPad*',`const Glib::RefPtr<Pad>&',`Glib::wrap($3, true)')
+#m4 _CONVERSION(`GstPad*',`const Glib::RefPtr<Gst::Pad>&',`Glib::wrap($3, true)')
   /** Signals that a pad has been linked to the peer pad.
    */
-  _WRAP_SIGNAL(void linked(const Glib::RefPtr<Pad>& peer_pad), "linked")
+  _WRAP_SIGNAL(void linked(const Glib::RefPtr<Gst::Pad>& peer_pad), "linked")
 
   /** Signals that a pad connection has been requested.
    */
@@ -444,9 +444,9 @@
 
   /** Signals that a pad has been unlinked from the peer pad.
    */
-  _WRAP_SIGNAL(void unlinked(const Glib::RefPtr<Pad>& peer_pad), "unlinked")
+  _WRAP_SIGNAL(void unlinked(const Glib::RefPtr<Gst::Pad>& peer_pad), "unlinked")
 
-  _WRAP_PROPERTY("caps", Glib::RefPtr<Caps>)
+  _WRAP_PROPERTY("caps", Glib::RefPtr<Gst::Caps>)
   _WRAP_PROPERTY("direction", PadDirection)
   _WRAP_PROPERTY("template", PadTemplate)
 };

Modified: gstreamermm/trunk/gstreamer/src/padtemplate.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/padtemplate.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/padtemplate.hg	Fri Dec 12 03:49:44 2008
@@ -64,7 +64,7 @@
   _CLASS_GOBJECT(PadTemplate, GstPadTemplate, GST_PAD_TEMPLATE, Object, GstObject)
 
 protected:
-  _WRAP_CTOR(PadTemplate(const Glib::ustring& name_template, PadDirection direction, PadPresence presence, const Glib::RefPtr<Caps>& caps), gst_pad_template_new)
+  _WRAP_CTOR(PadTemplate(const Glib::ustring& name_template, PadDirection direction, PadPresence presence, const Glib::RefPtr<Gst::Caps>& caps), gst_pad_template_new)
 
 public:
   /** Creates a new pad template with a name according to the given template
@@ -78,10 +78,10 @@
    * of.
    * @return A new Gst::PadTemplate.
    */
-  _WRAP_CREATE(const Glib::ustring& name_template, PadDirection direction, PadPresence presence, const Glib::RefPtr<Caps>& caps)
+  _WRAP_CREATE(const Glib::ustring& name_template, PadDirection direction, PadPresence presence, const Glib::RefPtr<Gst::Caps>& caps)
 
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_caps(), gst_pad_template_get_caps)
-  _WRAP_METHOD(Glib::RefPtr<const Caps> get_caps() const, gst_pad_template_get_caps, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Caps> get_caps(), gst_pad_template_get_caps)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Caps> get_caps() const, gst_pad_template_get_caps, constversion)
 
   /** Get the nametemplate of the padtemplate.
    */
@@ -95,11 +95,11 @@
    */
   _MEMBER_GET(presence, presence, PadPresence, GstPadPresence)
 
-#m4 _CONVERSION(`GstPad*',`const Glib::RefPtr<Pad>&',`Glib::wrap($3, true)')
+#m4 _CONVERSION(`GstPad*',`const Glib::RefPtr<Gst::Pad>&',`Glib::wrap($3, true)')
 
   /** This signal is fired when an element creates a pad from this template.
    */
-  _WRAP_SIGNAL(void pad_created(const Glib::RefPtr<Pad>& pad), "pad-created")
+  _WRAP_SIGNAL(void pad_created(const Glib::RefPtr<Gst::Pad>& pad), "pad-created")
 
   //gst_pad_template_pad_created emits the "pad-created" signal.  It seems
   //internal to C API (it is not found in API docs) so ignore it.

Modified: gstreamermm/trunk/gstreamer/src/parse.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/parse.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/parse.ccg	Fri Dec 12 03:49:44 2008
@@ -27,13 +27,13 @@
 {
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<Element> Parse::launch(const Glib::ustring& pipeline_description)
+Glib::RefPtr<Gst::Element> Parse::launch(const Glib::ustring& pipeline_description)
 #else
-Glib::RefPtr<Element> Parse::launch(const Glib::ustring& pipeline_description, std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<Gst::Element> Parse::launch(const Glib::ustring& pipeline_description, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<Element> retvalue = Glib::wrap(gst_parse_launch(pipeline_description.c_str(), &(gerror)));
+  Glib::RefPtr<Gst::Element> retvalue = Glib::wrap(gst_parse_launch(pipeline_description.c_str(), &(gerror)));
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
@@ -47,13 +47,13 @@
 }
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<Element> Parse::launchv(const gchar *argv[])
+Glib::RefPtr<Gst::Element> Parse::launchv(const gchar *argv[])
 #else
-Glib::RefPtr<Element> Parse::launchv(const gchar *argv[], std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<Gst::Element> Parse::launchv(const gchar *argv[], std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<Element> retvalue = Glib::wrap(gst_parse_launchv(argv, &(gerror)));
+  Glib::RefPtr<Gst::Element> retvalue = Glib::wrap(gst_parse_launchv(argv, &(gerror)));
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
@@ -67,13 +67,13 @@
 }
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<Element> Parse::create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads)
+Glib::RefPtr<Gst::Element> Parse::create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads)
 #else
-Glib::RefPtr<Element> Parse::create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads, std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<Gst::Element> Parse::create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<Element> retvalue = Glib::wrap(gst_parse_bin_from_description(bin_description.c_str(), ghost_unconnected_pads, &(gerror)));
+  Glib::RefPtr<Gst::Element> retvalue = Glib::wrap(gst_parse_bin_from_description(bin_description.c_str(), ghost_unconnected_pads, &(gerror)));
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)

Modified: gstreamermm/trunk/gstreamer/src/parse.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/parse.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/parse.hg	Fri Dec 12 03:49:44 2008
@@ -65,9 +65,9 @@
    * @throw Gst::ParseError
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  static Glib::RefPtr<Element> launch(const Glib::ustring& pipeline_description);
+  static Glib::RefPtr<Gst::Element> launch(const Glib::ustring& pipeline_description);
 #else
-  static Glib::RefPtr<Element> launch(const Glib::ustring& pipeline_description, std::auto_ptr<Glib::Error>& error);
+  static Glib::RefPtr<Gst::Element> launch(const Glib::ustring& pipeline_description, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   /** Create a new element based on command line syntax. An error does not
@@ -80,9 +80,9 @@
    * @throw Gst::ParseError
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  static Glib::RefPtr<Element> launchv(const gchar *argv[]);
+  static Glib::RefPtr<Gst::Element> launchv(const gchar *argv[]);
 #else
-  static Glib::RefPtr<Element> launchv(const gchar *argv[], std::auto_ptr<Glib::Error>& error);
+  static Glib::RefPtr<Gst::Element> launchv(const gchar *argv[], std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   /** This is a convenience wrapper around launch() to create a Gst::Bin from a
@@ -103,9 +103,9 @@
    * @throw Gst::ParseError
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  static Glib::RefPtr<Element> create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads);
+  static Glib::RefPtr<Gst::Element> create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads);
 #else
-  static Glib::RefPtr<Element> create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads, std::auto_ptr<Glib::Error>& error);
+  static Glib::RefPtr<Gst::Element> create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 };
 

Modified: gstreamermm/trunk/gstreamer/src/pipeline.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pipeline.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/pipeline.hg	Fri Dec 12 03:49:44 2008
@@ -100,12 +100,12 @@
    */
    _WRAP_CREATE()
 
-  _WRAP_METHOD(Glib::RefPtr<Bus> get_bus(), gst_pipeline_get_bus)
-  _WRAP_METHOD(Glib::RefPtr<const Bus> get_bus() const, gst_pipeline_get_bus, constversion)
-  _WRAP_METHOD(bool set_clock(const Glib::RefPtr<Clock>& clock), gst_pipeline_set_clock)
-  _WRAP_METHOD(Glib::RefPtr<Clock> get_clock(), gst_pipeline_get_clock)
-  _WRAP_METHOD(Glib::RefPtr<const Clock> get_clock() const, gst_pipeline_get_clock, constversion)
-  _WRAP_METHOD(void use_clock(const Glib::RefPtr<Clock>& clock), gst_pipeline_use_clock)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Bus> get_bus(), gst_pipeline_get_bus)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Bus> get_bus() const, gst_pipeline_get_bus, constversion)
+  _WRAP_METHOD(bool set_clock(const Glib::RefPtr<Gst::Clock>& clock), gst_pipeline_set_clock)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Clock> get_clock(), gst_pipeline_get_clock)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Clock> get_clock() const, gst_pipeline_get_clock, constversion)
+  _WRAP_METHOD(void use_clock(const Glib::RefPtr<Gst::Clock>& clock), gst_pipeline_use_clock)
   _WRAP_METHOD(void auto_clock(), gst_pipeline_auto_clock)
   _WRAP_METHOD(void set_new_stream_time(ClockTime time), gst_pipeline_set_new_stream_time)
   _WRAP_METHOD(ClockTime get_last_stream_time() const, gst_pipeline_get_last_stream_time)

Modified: gstreamermm/trunk/gstreamer/src/plugin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/plugin.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/plugin.hg	Fri Dec 12 03:49:44 2008
@@ -67,14 +67,14 @@
    * The init function should return true if plugin was initialized
    * successfully, false otherwise.
    */
-  typedef sigc::slot< bool, const Glib::RefPtr<Plugin>& > SlotInit;
+  typedef sigc::slot< bool, const Glib::RefPtr<Gst::Plugin>& > SlotInit;
 
   /** For example,
    * bool on_plugin_filter(const Glib::RefPtr<Gst::Plugin>& plugin);.
    * The filter function should return true if plugin is a match, false
    * otherwise.
    */
-  typedef sigc::slot< bool, const Glib::RefPtr<Plugin>& > SlotFilter;
+  typedef sigc::slot< bool, const Glib::RefPtr<Gst::Plugin>& > SlotFilter;
 
   _WRAP_METHOD(static Glib::QueryQuark error_quark(), gst_plugin_error_quark)
   _WRAP_METHOD(Glib::ustring get_name() const, gst_plugin_get_name)
@@ -92,14 +92,14 @@
 
   /** @throw Gst::PluginError
    */
-  _WRAP_METHOD(static Glib::RefPtr<Plugin> load_file(const Glib::ustring& filename), gst_plugin_load_file, errthrow)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Plugin> load_file(const Glib::ustring& filename), gst_plugin_load_file, errthrow)
 
-  _WRAP_METHOD(Glib::RefPtr<Plugin> load(), gst_plugin_load)
-  _WRAP_METHOD(static Glib::RefPtr<Plugin> load_by_name(const Glib::ustring& name), gst_plugin_load_by_name)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Plugin> load(), gst_plugin_load)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Plugin> load_by_name(const Glib::ustring& name), gst_plugin_load_by_name)
 
 
-#m4 _CONVERSION(`Glib::ListHandle< Glib::RefPtr<Plugin> >',`GList*',`($3).data()')
-  _WRAP_METHOD(static void free(Glib::ListHandle< Glib::RefPtr<Plugin> >), gst_plugin_list_free)
+#m4 _CONVERSION(`Glib::ListHandle< Glib::RefPtr<Gst::Plugin> >',`GList*',`($3).data()')
+  _WRAP_METHOD(static void free(Glib::ListHandle< Glib::RefPtr<Gst::Plugin> >), gst_plugin_list_free)
 
 //TODO: Include if bug #545787 is accepted; remove if not.
 /*

Modified: gstreamermm/trunk/gstreamer/src/pluginfeature.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pluginfeature.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/pluginfeature.hg	Fri Dec 12 03:49:44 2008
@@ -42,16 +42,16 @@
    * The filter function should return true if the feature is a match, false
    * otherwise.
    */
-  typedef sigc::slot< bool, const Glib::RefPtr<PluginFeature>& > SlotFilter;
+  typedef sigc::slot< bool, const Glib::RefPtr<Gst::PluginFeature>& > SlotFilter;
 
   _WRAP_METHOD(void set_rank(guint rank), gst_plugin_feature_set_rank)
   _WRAP_METHOD(void set_name(const Glib::ustring& name), gst_plugin_feature_set_name)
   _WRAP_METHOD(guint get_rank() const, gst_plugin_feature_get_rank)
   _WRAP_METHOD(Glib::ustring get_name() const, gst_plugin_feature_get_name)
-  _WRAP_METHOD(Glib::RefPtr<PluginFeature> load(), gst_plugin_feature_load)
+  _WRAP_METHOD(Glib::RefPtr<Gst::PluginFeature> load(), gst_plugin_feature_load)
 
-#m4 _CONVERSION(`Glib::ListHandle< Glib::RefPtr<PluginFeature> >',`GList*',`($3).data()')
-  _WRAP_METHOD(static void free(Glib::ListHandle< Glib::RefPtr<PluginFeature> >), gst_plugin_feature_list_free)
+#m4 _CONVERSION(`Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> >',`GList*',`($3).data()')
+  _WRAP_METHOD(static void free(Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> >), gst_plugin_feature_list_free)
 
   _WRAP_METHOD(bool check_version(guint min_major, guint min_minor, guint min_micro) const, gst_plugin_feature_check_version)
 

Modified: gstreamermm/trunk/gstreamer/src/query.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.ccg	Fri Dec 12 03:49:44 2008
@@ -59,12 +59,12 @@
 
 } //namespace Enums
 
-Glib::RefPtr<Query> Query::copy() const
+Glib::RefPtr<Gst::Query> Query::copy() const
 {
   return Gst::wrap(gst_query_copy(gobj()));
 }
 
-Glib::RefPtr<Query> Query::create_writable()
+Glib::RefPtr<Gst::Query> Query::create_writable()
 {
   return Gst::wrap(gst_query_make_writable(gobj()));
 }
@@ -88,7 +88,7 @@
 {
 }
 
-Glib::RefPtr<Query> QueryApplication::create(QueryType type, Structure& structure)
+Glib::RefPtr<Gst::Query> QueryApplication::create(QueryType type, Gst::Structure& structure)
 {
   GstQuery* query = gst_query_new_application(GstQueryType(type),
     structure.gobj()); 
@@ -100,7 +100,7 @@
 {
 }
 
-Glib::RefPtr<Query> QueryConvert::create(Format src_format, gint64 value, Format dest_format)
+Glib::RefPtr<Gst::Query> QueryConvert::create(Format src_format, gint64 value, Format dest_format)
 {
   GstQuery* query = gst_query_new_convert(GstFormat(src_format), value,
     GstFormat(dest_format));
@@ -155,7 +155,7 @@
 {
 }
 
-Glib::RefPtr<Query> QueryPosition::create(Format format)
+Glib::RefPtr<Gst::Query> QueryPosition::create(Format format)
 {
   GstQuery* query = gst_query_new_position(GstFormat(format));
   return Gst::Query::wrap(query);
@@ -190,7 +190,7 @@
 {
 }
 
-Glib::RefPtr<Query> QueryDuration::create(Format format)
+Glib::RefPtr<Gst::Query> QueryDuration::create(Format format)
 {
   GstQuery* query = gst_query_new_duration(GstFormat(format));
   return Gst::Query::wrap(query);
@@ -225,7 +225,7 @@
 {
 }
 
-Glib::RefPtr<Query> QueryLatency::create()
+Glib::RefPtr<Gst::Query> QueryLatency::create()
 {
   GstQuery* query = gst_query_new_latency();
   return Gst::Query::wrap(query);
@@ -269,7 +269,7 @@
 {
 }
 
-Glib::RefPtr<Query> QuerySeeking::create(Format format)
+Glib::RefPtr<Gst::Query> QuerySeeking::create(Format format)
 {
   GstQuery* query = gst_query_new_seeking(GstFormat(format));
   return Gst::Query::wrap(query);
@@ -320,7 +320,7 @@
 {
 }
 
-Glib::RefPtr<Query> QueryFormats::create()
+Glib::RefPtr<Gst::Query> QueryFormats::create()
 {
   GstQuery* query = gst_query_new_formats();
   return Gst::Query::wrap(query);
@@ -355,7 +355,7 @@
 {
 }
 
-Glib::RefPtr<Query> QuerySegment::create(Format format)
+Glib::RefPtr<Gst::Query> QuerySegment::create(Format format)
 {
   GstQuery* query = gst_query_new_segment(GstFormat(format));
   return Gst::Query::wrap(query);
@@ -404,7 +404,7 @@
 {
 }
 
-Glib::RefPtr<Query> QueryBuffering::create(Format format)
+Glib::RefPtr<Gst::Query> QueryBuffering::create(Format format)
 {
   GstQuery* query = gst_query_new_buffering(GstFormat(format));
   return Gst::Query::wrap(query);
@@ -518,37 +518,37 @@
   return estimated_total;
 }
 
-Glib::RefPtr<Query> Query::wrap(GstQuery* query, bool take_copy) {
+Glib::RefPtr<Gst::Query> Query::wrap(GstQuery* query, bool take_copy) {
 
-  Glib::RefPtr<Query> result;
+  Glib::RefPtr<Gst::Query> result;
 
   if(!query)
     return result;
 
   switch (GST_QUERY_TYPE(query)) {
     case GST_QUERY_POSITION:
-      result = Glib::RefPtr<Query>( new Gst::QueryPosition(query) );
+      result = Glib::RefPtr<Gst::Query>( new Gst::QueryPosition(query) );
       break;
     case GST_QUERY_DURATION:
-      result = Glib::RefPtr<Query>( new Gst::QueryDuration(query) );
+      result = Glib::RefPtr<Gst::Query>( new Gst::QueryDuration(query) );
       break;
     case GST_QUERY_LATENCY:
-      result = Glib::RefPtr<Query>( new Gst::QueryLatency(query) );
+      result = Glib::RefPtr<Gst::Query>( new Gst::QueryLatency(query) );
       break;
     case GST_QUERY_SEEKING:
-      result = Glib::RefPtr<Query>( new Gst::QuerySeeking(query) );
+      result = Glib::RefPtr<Gst::Query>( new Gst::QuerySeeking(query) );
       break;
     case GST_QUERY_SEGMENT:
-      result = Glib::RefPtr<Query>( new Gst::QuerySegment(query) );
+      result = Glib::RefPtr<Gst::Query>( new Gst::QuerySegment(query) );
       break;
     case GST_QUERY_CONVERT:
-      result = Glib::RefPtr<Query>( new Gst::QueryConvert(query) );
+      result = Glib::RefPtr<Gst::Query>( new Gst::QueryConvert(query) );
       break;
     case GST_QUERY_FORMATS:
-      result = Glib::RefPtr<Query>( new Gst::QueryFormats(query) );
+      result = Glib::RefPtr<Gst::Query>( new Gst::QueryFormats(query) );
       break;
     case GST_QUERY_BUFFERING:
-      result = Glib::RefPtr<Query>( new Gst::QueryBuffering(query) );
+      result = Glib::RefPtr<Gst::Query>( new Gst::QueryBuffering(query) );
       break;
     case GST_QUERY_NONE:
     case GST_QUERY_JITTER:
@@ -556,7 +556,7 @@
       break;
 	/* The rest of the query types are custom ones */
     default:
-      result = Glib::RefPtr<Query>( new Gst::QueryApplication(query) );
+      result = Glib::RefPtr<Gst::Query>( new Gst::QueryApplication(query) );
   }
 
   if(result && take_copy)

Modified: gstreamermm/trunk/gstreamer/src/query.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.hg	Fri Dec 12 03:49:44 2008
@@ -120,20 +120,20 @@
    * derived one) because the derived Gst::Query classes do not correspond
    * to GType types in the GStreamer API.
    */
-  static Glib::RefPtr<Query> wrap(GstQuery* query, bool take_copy=false);
+  static Glib::RefPtr<Gst::Query> wrap(GstQuery* query, bool take_copy=false);
 
   /** Copies the given query using the query copy function.
    * @return The Gst::Query copy.
    */
-   Glib::RefPtr<Query> copy() const;
+   Glib::RefPtr<Gst::Query> copy() const;
 
    /** Makes a writable query from the given query.  Does exactly what
     * Gst::MiniObject::create_writable() does for the Gst::Query.
     * @return A Gst::Query (possibly the same pointer) that is writable.
     */
-   Glib::RefPtr<Query> create_writable();
+   Glib::RefPtr<Gst::Query> create_writable();
 
-  _WRAP_METHOD(const Structure get_structure() const, gst_query_get_structure)
+  _WRAP_METHOD(const Gst::Structure get_structure() const, gst_query_get_structure)
 
   /** Get the Gst::QueryType of the query.
    */
@@ -154,7 +154,7 @@
   bool get_details(QueryType type, QueryTypeDefinition& def);
   _IGNORE(gst_query_type_get_details)
 
-  _WRAP_METHOD(static IteratorBasic<const QueryTypeDefinition> iterate_definitions(), gst_query_type_iterate_definitions)
+  _WRAP_METHOD(static Gst::IteratorBasic<const Gst::QueryTypeDefinition> iterate_definitions(), gst_query_type_iterate_definitions)
 };
 
 //TODO: Modify create methods of derived Query classes to return
@@ -178,7 +178,7 @@
    * @param structure A structure for the query.
    * @return The new Gst::QueryApplication.
    */
-  static Glib::RefPtr<Query> create(QueryType type, Structure& structure);
+  static Glib::RefPtr<Gst::Query> create(QueryType type, Gst::Structure& structure);
 };
 
 /** A convert query object.  See create() for more details.
@@ -195,7 +195,7 @@
    * @param dest_format The target Gst::Format.
    * @return The new Gst::QueryConvert.
    */
-  static Glib::RefPtr<Query> create(Format src_format, gint64 value, Format dest_format);
+  static Glib::RefPtr<Gst::Query> create(Format src_format, gint64 value, Format dest_format);
 
   /** Answer a convert query by setting the requested values.
    * @param src_format The source Gst::Format.
@@ -258,7 +258,7 @@
    * @param format The default Gst::Format for the new query.
    * @return The new Gst::QueryPosition.
    */
-  static Glib::RefPtr<Query> create(Format format);
+  static Glib::RefPtr<Gst::Query> create(Format format);
 
   /** Answer a position query by setting the requested value in the given
    * format.
@@ -298,7 +298,7 @@
    * @param format The Gst::Format for this duration query.
    * @return The new Gst::QueryDuration.
    */
-  static Glib::RefPtr<Query> create(Format format);
+  static Glib::RefPtr<Gst::Query> create(Format format);
 
   /** Answer a duration query by setting the requested value in the given
    * format.
@@ -338,7 +338,7 @@
    * elements in the pipeline.
    * @return The new Gst::QueryLatency.
    */
-  static Glib::RefPtr<Query> create();
+  static Glib::RefPtr<Gst::Query> create();
 
   /** Answer a latency query by setting the requested values in the given
    * format.
@@ -384,7 +384,7 @@
    * @param format The default Gst::Format for the new query.
    * @return The new Gst::QuerySeeking.
    */
-  static Glib::RefPtr<Query> create(Format format);
+  static Glib::RefPtr<Gst::Query> create(Format format);
 
   /** Set the seeking query result fields in query.
    * @param format The format to set for @a the segment_start and
@@ -436,7 +436,7 @@
   /** Constructs a new query object for querying formats of the stream.
    * @return The new Gst::QueryFormats.
    */
-  static Glib::RefPtr<Query> create();
+  static Glib::RefPtr<Gst::Query> create();
 
   /** Set the formats query result fields. All the formats in the array are
    * used.
@@ -479,7 +479,7 @@
    * @param format The Gst::Format for the new query.
    * @return The new Gst::QuerySegment.
    */
-  static Glib::RefPtr<Query> create(Format format);
+  static Glib::RefPtr<Gst::Query> create(Format format);
 
   /** Answer a segment query by setting the requested values. The normal
    * playback segment of a pipeline is 0 to duration at the default rate of
@@ -548,7 +548,7 @@
    * @param format The default Gst::Format for the new query.
    * @return The new Gst::QueryBuffering.
    */
-  static Glib::RefPtr<Query> create(Format format);
+  static Glib::RefPtr<Gst::Query> create(Format format);
 
   /** Set the percentage of buffered data. This is a value between 0 and 100.
    * The @a busy indicator is true when the buffering is in progress.

Modified: gstreamermm/trunk/gstreamer/src/registry.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/registry.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/registry.ccg	Fri Dec 12 03:49:44 2008
@@ -73,20 +73,20 @@
 namespace Gst
 {
 
-Glib::ListHandle< Glib::RefPtr<Plugin> >
+Glib::ListHandle< Glib::RefPtr<Gst::Plugin> >
 Registry::get_plugin_list(const Plugin::SlotFilter& filter, bool first)
 {
   Plugin::SlotFilter* slot_copy = new Plugin::SlotFilter(filter);
   GList* list = gst_registry_plugin_filter(gobj(), &Registry_Plugin_Filter_gstreamermm_callback, first, slot_copy);
-  return Glib::ListHandle< Glib::RefPtr<Plugin> >(list, Glib::OWNERSHIP_DEEP);
+  return Glib::ListHandle< Glib::RefPtr<Gst::Plugin> >(list, Glib::OWNERSHIP_DEEP);
 }
 
-Glib::ListHandle< Glib::RefPtr<PluginFeature> >
+Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> >
 Registry::get_feature_list(const PluginFeature::SlotFilter& filter, bool first)
 {
   PluginFeature::SlotFilter* slot_copy = new PluginFeature::SlotFilter(filter);
   GList* list = gst_registry_feature_filter(gobj(), &Registry_PluginFeature_Filter_gstreamermm_callback, first, slot_copy);
-  return Glib::ListHandle< Glib::RefPtr<PluginFeature> >(list, Glib::OWNERSHIP_DEEP);
+  return Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> >(list, Glib::OWNERSHIP_DEEP);
 }
 
 #ifdef USE_BINARY_REGISTRY

Modified: gstreamermm/trunk/gstreamer/src/registry.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/registry.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/registry.hg	Fri Dec 12 03:49:44 2008
@@ -92,20 +92,20 @@
   _CLASS_GOBJECT(Registry, GstRegistry, GST_REGISTRY, Gst::Object, GstObject)
 
 public:
-  _WRAP_METHOD(static Glib::RefPtr<Registry> get_default(), gst_registry_get_default)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Registry> get_default(), gst_registry_get_default)
 
-#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<PluginFeature> >',`$2($3, Glib::OWNERSHIP_DEEP)')
-  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<PluginFeature> > get_feature_list(GType type), gst_registry_get_feature_list)
-  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<PluginFeature> > get_feature_list(const Glib::ustring& name), gst_registry_get_feature_list_by_plugin)
+#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> >',`$2($3, Glib::OWNERSHIP_DEEP)')
+  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> > get_feature_list(GType type), gst_registry_get_feature_list)
+  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> > get_feature_list(const Glib::ustring& name), gst_registry_get_feature_list_by_plugin)
 
 #m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::ustring >',`$2($3, Glib::OWNERSHIP_DEEP)')
   _WRAP_METHOD(Glib::ListHandle< Glib::ustring > get_path_list(), gst_registry_get_path_list)
 
-#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Plugin> >',`$2($3, Glib::OWNERSHIP_DEEP)')
-  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Plugin> > get_plugin_list(), gst_registry_get_plugin_list)
+#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Gst::Plugin> >',`$2($3, Glib::OWNERSHIP_DEEP)')
+  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Gst::Plugin> > get_plugin_list(), gst_registry_get_plugin_list)
 
-  _WRAP_METHOD(bool add_plugin(const Glib::RefPtr<Plugin>& plugin), gst_registry_add_plugin)
-  _WRAP_METHOD(void remove_plugin(const Glib::RefPtr<Plugin>& plugin), gst_registry_remove_plugin)
+  _WRAP_METHOD(bool add_plugin(const Glib::RefPtr<Gst::Plugin>& plugin), gst_registry_add_plugin)
+  _WRAP_METHOD(void remove_plugin(const Glib::RefPtr<Gst::Plugin>& plugin), gst_registry_remove_plugin)
 
   /** Runs a filter against all plugins in the registry and returns a List with
    * the results. If the first flag is set, only the first match is returned
@@ -116,7 +116,7 @@
    * @return A list of Gst::Plugin. MT safe.
    *
    */
-  Glib::ListHandle< Glib::RefPtr<Plugin> > get_plugin_list(const Plugin::SlotFilter& filter, bool first);
+  Glib::ListHandle< Glib::RefPtr<Gst::Plugin> > get_plugin_list(const Plugin::SlotFilter& filter, bool first);
   _IGNORE(gst_registry_plugin_filter)
           
 
@@ -129,12 +129,12 @@
    * @param first Only return first match.
    * @return A list of Gst::PluginFeature. MT safe.
    */
-  Glib::ListHandle< Glib::RefPtr<PluginFeature> > get_feature_list(const PluginFeature::SlotFilter& filter, bool first);
+  Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> > get_feature_list(const PluginFeature::SlotFilter& filter, bool first);
   _IGNORE(gst_registry_feature_filter)
 
-  _WRAP_METHOD(Glib::RefPtr<Plugin> find_plugin(const Glib::ustring& name), gst_registry_find_plugin)
-  _WRAP_METHOD(Glib::RefPtr<PluginFeature> find_feature(const Glib::ustring& name, GType type), gst_registry_find_feature)
-  _WRAP_METHOD(Glib::RefPtr<PluginFeature> lookup_feature(const Glib::ustring& name), gst_registry_lookup_feature)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Plugin> find_plugin(const Glib::ustring& name), gst_registry_find_plugin)
+  _WRAP_METHOD(Glib::RefPtr<Gst::PluginFeature> find_feature(const Glib::ustring& name, GType type), gst_registry_find_feature)
+  _WRAP_METHOD(Glib::RefPtr<Gst::PluginFeature> lookup_feature(const Glib::ustring& name), gst_registry_lookup_feature)
   _WRAP_METHOD(void add_path(const Glib::ustring& path), gst_registry_add_path)
   _WRAP_METHOD(void scan_path(const Glib::ustring& path), gst_registry_scan_path)
   // binary or xml registry cache depends on USE_BINARY_REGISTRY def in
@@ -174,25 +174,25 @@
   _IGNORE(gst_registry_xml_write_cache)
 #endif
 
-  _WRAP_METHOD(Glib::RefPtr<Plugin> lookup(const Glib::ustring& filename), gst_registry_lookup)
-  _WRAP_METHOD(void remove_feature(const Glib::RefPtr<PluginFeature>& feature), gst_registry_remove_feature)
-  _WRAP_METHOD(void add_feature(const Glib::RefPtr<PluginFeature>& feature), gst_registry_add_feature)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Plugin> lookup(const Glib::ustring& filename), gst_registry_lookup)
+  _WRAP_METHOD(void remove_feature(const Glib::RefPtr<Gst::PluginFeature>& feature), gst_registry_remove_feature)
+  _WRAP_METHOD(void add_feature(const Glib::RefPtr<Gst::PluginFeature>& feature), gst_registry_add_feature)
   _WRAP_METHOD(static bool check_feature_version(const Glib::ustring& feature_name, guint min_major, guint min_minor, guint min_micro), gst_default_registry_check_feature_version)
 
-#m4 _CONVERSION(`GstPluginFeature*',`const Glib::RefPtr<PluginFeature>&',`Glib::wrap($3, true)')
+#m4 _CONVERSION(`GstPluginFeature*',`const Glib::RefPtr<Gst::PluginFeature>&',`Glib::wrap($3, true)')
 
   /** Signals that a feature has been added to the registry (possibly replacing
    * a previously-added one by the same name)
    */
-  _WRAP_SIGNAL(void feature_added(const Glib::RefPtr<PluginFeature>& feature), "feature-added")
+  _WRAP_SIGNAL(void feature_added(const Glib::RefPtr<Gst::PluginFeature>& feature), "feature-added")
 
 
-#m4 _CONVERSION(`GstPlugin*',`const Glib::RefPtr<Plugin>&',`Glib::wrap($3, true)')
+#m4 _CONVERSION(`GstPlugin*',`const Glib::RefPtr<Gst::Plugin>&',`Glib::wrap($3, true)')
 
   /** Signals that a plugin has been added to the registry (possibly replacing
    * a previously-added one by the same name)
    */
-  _WRAP_SIGNAL(void plugin_added(const Glib::RefPtr<Plugin>& plugin), "plugin-added")
+  _WRAP_SIGNAL(void plugin_added(const Glib::RefPtr<Gst::Plugin>& plugin), "plugin-added")
 };
 
 } // namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/systemclock.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/systemclock.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/systemclock.hg	Fri Dec 12 03:49:44 2008
@@ -47,7 +47,7 @@
   _CTOR_DEFAULT
 
 public:
-  _WRAP_METHOD(static Glib::RefPtr<Clock> obtain(), gst_system_clock_obtain)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Clock> obtain(), gst_system_clock_obtain)
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/taglist.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/taglist.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/taglist.hg	Fri Dec 12 03:49:44 2008
@@ -279,8 +279,8 @@
   _WRAP_METHOD(static TagFlag get_flag(const Glib::ustring& tag), gst_tag_get_flag)
   _WRAP_METHOD(static bool is_fixed(const Glib::ustring& tag), gst_tag_is_fixed)
   _WRAP_METHOD(bool is_empty() const, gst_tag_list_is_empty)
-  _WRAP_METHOD(void insert(const TagList& other, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_list_insert)
-  _WRAP_METHOD(TagList merge(const TagList& other, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_list_merge)
+  _WRAP_METHOD(void insert(const Gst::TagList& other, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_list_insert)
+  _WRAP_METHOD(Gst::TagList merge(const Gst::TagList& other, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_list_merge)
   _WRAP_METHOD(guint size(const Glib::ustring& tag) const, gst_tag_list_get_tag_size)
 
   /** Sets a GValue for the given @a tag using the specified mode.

Modified: gstreamermm/trunk/gstreamer/src/tagsetter.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/tagsetter.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/tagsetter.hg	Fri Dec 12 03:49:44 2008
@@ -48,7 +48,7 @@
   _CLASS_INTERFACE(TagSetter, GstTagSetter, GST_TAG_SETTER, GstTagSetterIFace)
 
 public:
-  _WRAP_METHOD(void merge_tags(const TagList& list, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_setter_merge_tags)
+  _WRAP_METHOD(void merge_tags(const Gst::TagList& list, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_setter_merge_tags)
 
   /** Adds the given Glib::ValueBase on the setter using the given merge mode. 
    *
@@ -77,7 +77,7 @@
    */
    void add_tag(const Glib::ustring& tag, const char* data, TagMergeMode mode=TAG_MERGE_PREPEND);
 
-   _WRAP_METHOD(TagList get_tag_list(), gst_tag_setter_get_tag_list)
+   _WRAP_METHOD(Gst::TagList get_tag_list(), gst_tag_setter_get_tag_list)
    _WRAP_METHOD(void set_tag_merge_mode(TagMergeMode mode), gst_tag_setter_set_tag_merge_mode)
    _WRAP_METHOD(TagMergeMode qet_tag_merge_mode(), gst_tag_setter_get_tag_merge_mode)
 

Modified: gstreamermm/trunk/gstreamer/src/urihandler.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/urihandler.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/urihandler.hg	Fri Dec 12 03:49:44 2008
@@ -60,7 +60,7 @@
   _WRAP_METHOD(static Glib::ustring get_protocol(const Glib::ustring& uri), gst_uri_get_protocol)
   _WRAP_METHOD(static Glib::ustring get_location(const Glib::ustring& uri), gst_uri_get_location)
   _WRAP_METHOD(static Glib::ustring construct_uri(const Glib::ustring& protocol, const Glib::ustring& location), gst_uri_construct)
-  _WRAP_METHOD(static Glib::RefPtr<Element> make_element_from_uri(const URIType type, const Glib::ustring& uri, const Glib::ustring& name), gst_element_make_from_uri)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Element> make_element_from_uri(const URIType type, const Glib::ustring& uri, const Glib::ustring& name), gst_element_make_from_uri)
 
   _WRAP_METHOD(guint get_uri_type(), gst_uri_handler_get_uri_type)
 

Modified: gstreamermm/trunk/gstreamer/src/xml.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/xml.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/xml.ccg	Fri Dec 12 03:49:44 2008
@@ -33,12 +33,12 @@
   return gst_xml_parse_memory(this->gobj(),(guchar*)(buffer.c_str()), buffer.size(), root.c_str());
 }
 
-xmlDocPtr XML::write(const Glib::RefPtr<Element>& element)
+xmlDocPtr XML::write(const Glib::RefPtr<Gst::Element>& element)
 {
   return gst_xml_write(element->gobj());
 }
 
-void XML::write_to_stream(const Glib::RefPtr<Element>& element, std::ostream& out)
+void XML::write_to_stream(const Glib::RefPtr<Gst::Element>& element, std::ostream& out)
 {
   xmlDocPtr xmlDoc = write(element);
   xmlpp::Node rootNode(xmlDocGetRootElement(xmlDoc));

Modified: gstreamermm/trunk/gstreamer/src/xml.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/xml.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/xml.hg	Fri Dec 12 03:49:44 2008
@@ -56,7 +56,7 @@
    * @param element The element to write out.
    * @return A pointer to an XML document.
    */
-  static xmlDocPtr write(const Glib::RefPtr<Element>& element);
+  static xmlDocPtr write(const Glib::RefPtr<Gst::Element>& element);
 
   /** Converts the given element into XML and writes the formatted XML to an
    * open output stream.
@@ -64,7 +64,7 @@
    * @param element The element to write out.
    * @param out An open std::ostream, like std::cout.
    */
-  static void write_to_stream(const Glib::RefPtr<Element>& element, std::ostream& out);
+  static void write_to_stream(const Glib::RefPtr<Gst::Element>& element, std::ostream& out);
 
   _WRAP_METHOD(bool parse_doc(xmlpp::Document* doc, Glib::ustring& root), gst_xml_parse_doc)
   _WRAP_METHOD(bool parse_file(const std::string& filename, const Glib::ustring& root), gst_xml_parse_file)
@@ -80,16 +80,16 @@
   _IGNORE(gst_xml_parse_memory)
 
   //Note: gst_xml_get_element() returns a reference (GstElement*).
-  _WRAP_METHOD(Glib::RefPtr<Element> get_element(const Glib::ustring& name), gst_xml_get_element)
-  _WRAP_METHOD(Glib::RefPtr<const Element> get_element(const Glib::ustring& name) const, gst_xml_get_element, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gst::Element> get_element(const Glib::ustring& name), gst_xml_get_element)
+  _WRAP_METHOD(Glib::RefPtr<const Gst::Element> get_element(const Glib::ustring& name) const, gst_xml_get_element, constversion)
 
-#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Element> >',`$2($3, Glib::OWNERSHIP_NONE)')
-  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Element> > get_topelements(), gst_xml_get_topelements)
+#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Gst::Element> >',`$2($3, Glib::OWNERSHIP_NONE)')
+  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Gst::Element> > get_topelements(), gst_xml_get_topelements)
 
-#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<const Element> >',`$2($3, Glib::OWNERSHIP_NONE)')
-  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const Element> > get_topelements() const, gst_xml_get_topelements)
+#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<const Gst::Element> >',`$2($3, Glib::OWNERSHIP_NONE)')
+  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const Gst::Element> > get_topelements() const, gst_xml_get_topelements)
 
-  _WRAP_METHOD(static Glib::RefPtr<Element> make_element(xmlpp::Node* curr, const Glib::RefPtr<Gst::Object>& parent), gst_xml_make_element)
+  _WRAP_METHOD(static Glib::RefPtr<Gst::Element> make_element(xmlpp::Node* curr, const Glib::RefPtr<Gst::Object>& parent), gst_xml_make_element)
 
 #m4 _CONVERSION(`GstObject*',`const Glib::RefPtr<Gst::Object>&',`Glib::wrap($3, true)')
   /** Signals that a new object has been deserialized.

Modified: gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment	(original)
+++ gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment	Fri Dec 12 03:49:44 2008
@@ -4,7 +4,10 @@
 
 files_posix_hg =
 files_win32_hg =
-files_general_hg = audioclock.hg colorbalance.hg colorbalancechannel.hg xoverlay.hg
+
+files_general_hg = audioclock.hg audiosink.hg audiosrc.hg baseaudiosink.hg \
+		   baseaudiosrc.hg \
+		   colorbalance.hg colorbalancechannel.hg xoverlay.hg
 
 files_general_deprecated_hg =
 

Added: gstreamermm/trunk/gstreamerbase/src/audiosink.ccg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/audiosink.ccg	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,23 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gst/audio/gstaudiosink.h>
+_PINCLUDE(gstreamerbasemm/private/baseaudiosink_p.h)

Added: gstreamermm/trunk/gstreamerbase/src/audiosink.hg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/audiosink.hg	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,58 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gstreamerbasemm/baseaudiosink.h>
+
+_DEFS(gstreamerbasemm,gstbase)
+
+namespace GstBase
+{
+
+/** GstBase::AudioSink â Simple base class for audio sinks.
+ * This is the most simple base class for audio sinks that only requires
+ * subclasses to implement a set of simple virtual functions:
+ *
+ * - open_vfunc() - Open the device.
+ * - prepare_vfunc()  - Configure the device with the specified format.
+ * - write_vfunc() - Write samples to the device.
+ * - reset_vfunc() - Unblock writes and flush the device.
+ * - delay_vfunc() - Get the number of samples written but not yet played by
+ * the device.
+ * - unprepare_vfunc() - Undo operations done by prepare.
+ * - close_vfunc() - Close the device.
+ *
+ * All scheduling of samples and timestamps is done in this base class together
+ * with GstBase::BaseAudioSink using a default implementation of a
+ * GstBase::RingBuffer that uses threads.
+ *
+ * Last reviewed on 2006-09-27 (0.10.12)
+ *
+ * @ingroup GstBaseBaseClasses
+ */
+class AudioSink : public GstBase::BaseAudioSink
+{
+  _CLASS_GOBJECT(AudioSink, GstAudioSink, GST_AUDIO_SINK, GstBase::BaseAudioSink, GstBaseAudioSink)
+
+public:
+  //TODO: Wrap vfuncs.
+};
+
+} // namespace GstBase

Added: gstreamermm/trunk/gstreamerbase/src/audiosrc.ccg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/audiosrc.ccg	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,23 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+ #include <gst/audio/gstaudiosrc.h>
+_PINCLUDE(gstreamerbasemm/private/baseaudiosrc_p.h)

Added: gstreamermm/trunk/gstreamerbase/src/audiosrc.hg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/audiosrc.hg	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,58 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+#include <gstreamerbasemm/baseaudiosrc.h>
+
+_DEFS(gstreamerbasemm,gstbase)
+
+namespace GstBase
+{
+
+/** GstBase::AudioSrc â Simple base class for audio sources.
+ * This is the most simple base class for audio sources that only requires
+ * subclasses to implement a set of simple virtual functions:
+ *
+ * - open_vfunc() - Open the device.
+ * - prepare_vfunc()  - Configure the device with the specified format.
+ * - write_vfunc() - Write samples to the device.
+ * - reset_vfunc() - Unblock writes and flush the device.
+ * - delay_vfunc() - Get the number of samples written but not yet played by
+ * the device.
+ * - unprepare_vfunc() - Undo operations done by prepare.
+ * - close_vfunc() - Close the device.
+ *
+ * All scheduling of samples and timestamps is done in this base class together
+ * with GstBase::BaseAudioSrc using a default implementation of a
+ * GstBase::RingBuffer that uses threads.
+ *
+ * Last reviewed on 2006-09-27 (0.10.12)
+ *
+ * @ingroup GstBaseBaseClasses
+ */
+class AudioSrc : public GstBase::BaseAudioSrc
+{
+  _CLASS_GOBJECT(AudioSrc, GstAudioSrc, GST_AUDIO_SRC, GstBase::BaseAudioSrc, GstBaseAudioSrc)
+
+public:
+  //TODO: Wrap vfuncs.
+};
+
+} // namespace GstBase

Added: gstreamermm/trunk/gstreamerbase/src/baseaudiosink.ccg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/baseaudiosink.ccg	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,23 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gst/audio/gstbaseaudiosink.h>
+_PINCLUDE(gstreamermm/private/basesink_p.h)

Added: gstreamermm/trunk/gstreamerbase/src/baseaudiosink.hg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/baseaudiosink.hg	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,63 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gstreamermm/basesink.h>
+
+_DEFS(gstreamerbasemm,gstbase)
+
+namespace GstBase
+{
+
+//TODO: Enum is not registered nor does it have a *_get_type() functions.  See
+//bug #564200.
+//_WRAP_ENUM(BaseAudioSinkSlaveMethod, GstBaseAudioSinkSlaveMethod)
+
+/** GstBase::BaseAudioSink â Base class for audio sinks.
+ * This is the base class for audio sinks. Subclasses need to implement the
+ * create_ringbuffer_vfunc vmethod. This base class will then take care of
+ * writing samples to the ringbuffer, synchronisation, clipping and flushing.
+ *
+ * Last reviewed on 2006-09-27 (0.10.12).
+ *
+ * @ingroup GstBaseBaseClasses
+ */
+class BaseAudioSink : public Gst::BaseSink
+{
+  _CLASS_GOBJECT(BaseAudioSink, GstBaseAudioSink, GST_BASE_AUDIO_SINK, Gst::BaseSink, GstBaseSink)
+
+public:
+  /** Get the Gst::Clock of the GstBase::BaseAudioSink.
+   */
+  _MEMBER_GET(provided_clock, provided_clock, Glib::RefPtr<Gst::Clock>, GstClock*)
+
+  //TODO: _WRAP_METHOD(Glib::RefPtr<GstBase::RingBuffer> create_ring_buffer(), gst_base_audio_sink_create_ringbuffer)
+
+  _WRAP_METHOD(void set_provide_clock(bool provide), gst_base_audio_sink_set_provide_clock)
+  _WRAP_METHOD(bool get_provide_clock(), gst_base_audio_sink_get_provide_clock)
+
+  //TODO: Following methods depend on enum above (see bug #564200)
+  //_WRAP_METHOD(void set_slave_method(GstBaseAudioSinkSlaveMethod method), gst_base_audio_sink_set_slave_method)
+  //WRAP_METHOD(BaseAudioSinkSlaveMethod get_slave_method(),gst_base_audio_sink_get_slave_method)
+
+  //TODO: Wrap vfuncs.
+};
+
+} // namespace GstBase

Added: gstreamermm/trunk/gstreamerbase/src/baseaudiosrc.ccg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/baseaudiosrc.ccg	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,23 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gst/audio/gstbaseaudiosrc.h>
+_PINCLUDE(gstreamermm/private/pushsrc_p.h)

Added: gstreamermm/trunk/gstreamerbase/src/baseaudiosrc.hg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/baseaudiosrc.hg	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,64 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gstreamermm/pushsrc.h>
+
+_DEFS(gstreamerbasemm,gstbase)
+
+namespace GstBase
+{
+
+/** GstBase::BaseAudioSrc â Base class for audio sources.
+ * This is the base class for audio sources. Subclasses need to implement the
+ * create_ringbuffer_vfunc vmethod. This base class will then take care of
+ * reading samples from the ringbuffer, synchronisation and flushing.
+ *
+ * Last reviewed on 2006-09-27 (0.10.12).
+ *
+ * @ingroup GstBaseBaseClasses
+ */
+class BaseAudioSrc : public Gst::PushSrc
+{
+  _CLASS_GOBJECT(BaseAudioSrc, GstBaseAudioSrc, GST_BASE_AUDIO_SRC, Gst::PushSrc, GstPushSrc)
+
+public:
+  /** Get the Gst::Clock of the GstBase::AudioSrc.
+   */
+  _MEMBER_GET(clock, clock, Glib::RefPtr<Gst::Clock>, GstClock*)
+
+  //TODO: _WRAP_METHOD(Glib::RefPtr<GstBase::RingBuffer> create_ring_buffer(), gst_base_audio_src_create_ringbuffer)
+
+  _WRAP_METHOD(void set_provide_clock(bool provide), gst_base_audio_src_set_provide_clock)
+  _WRAP_METHOD(bool get_provide_clock(), gst_base_audio_src_get_provide_clock)
+
+  _WRAP_PROPERTY("actual-buffer-time", gint64)
+  _WRAP_PROPERTY("actual-latency-time", gint64)
+  _WRAP_PROPERTY("buffer-time", gint64)
+  _WRAP_PROPERTY("latency-time", gint64)
+  _WRAP_PROPERTY("provide-clock", bool)
+
+  //TODO: Wrap this property when bug #564206 is resolved.
+  //_WRAP_PROPERTY("slave-method", BaseAudioSrcSlaveMethod)
+
+  //TODO: Wrap vfuncs.
+};
+
+} // namespace GstBase

Modified: gstreamermm/trunk/gstreamerbase/src/generate-enums.sh
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/generate-enums.sh	(original)
+++ gstreamermm/trunk/gstreamerbase/src/generate-enums.sh	Fri Dec 12 03:49:44 2008
@@ -15,4 +15,8 @@
 DIR=`dirname "$0"`
 
 enum.pl "$PREFIX"/gst-libs/gst/{audio,cdda,fft,floatcast,interfaces,netbuffer,\
-riff,rtp,rtsp,sdp,tag,pbutils,video}/*.h > "$DIR/gstbase_enums.defs"
+riff,rtp,rtsp,sdp,tag,pbutils,video}/*.h "$PREFIX"/gst/*/*.h \
+"$PREFIX"/ext/*/*.h > "$DIR/gstbase_enums.defs"
+
+#Patch generated file.
+(cd "$DIR" && patch -p0 < gstbase_enums.defs.patch)

Modified: gstreamermm/trunk/gstreamerbase/src/generate-extra-defs.sh
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/generate-extra-defs.sh	(original)
+++ gstreamermm/trunk/gstreamerbase/src/generate-extra-defs.sh	Fri Dec 12 03:49:44 2008
@@ -6,3 +6,6 @@
 DIR=`dirname "$0"`
 
 "$DIR"/../../tools/extra_defs_gen/generate_defs_gstbase > "$DIR/gstbase_signals.defs"
+
+#Patch generated file.
+(cd "$DIR" && patch -p0 < gstbase_signals.defs.patch)

Modified: gstreamermm/trunk/gstreamerbase/src/generate-methods.sh
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/generate-methods.sh	(original)
+++ gstreamermm/trunk/gstreamerbase/src/generate-methods.sh	Fri Dec 12 03:49:44 2008
@@ -15,4 +15,5 @@
 DIR=`dirname "$0"`
 
 h2def.py "$PREFIX"/gst-libs/gst/{audio,cdda,fft,floatcast,interfaces,netbuffer,\
-riff,rtp,rtsp,sdp,tag,pbutils,video}/*.h > "$DIR/gstbase_methods.defs"
+riff,rtp,rtsp,sdp,tag,pbutils,video}/*.h "$PREFIX"/gst/*/*.h \
+"$PREFIX"/ext/*/*.h > "$DIR/gstbase_methods.defs"

Modified: gstreamermm/trunk/gstreamerbase/src/gstbase_enums.defs
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/gstbase_enums.defs	(original)
+++ gstreamermm/trunk/gstreamerbase/src/gstbase_enums.defs	Fri Dec 12 03:49:44 2008
@@ -689,3 +689,420 @@
   )
 )
 
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/adder/gstadder.h
+
+(define-enum-extended AdderFormat
+  (in-module "Gst")
+  (c-name "GstAdderFormat")
+  (values
+    '("unset" "GST_ADDER_FORMAT_UNSET" "0")
+    '("int" "GST_ADDER_FORMAT_INT" "1")
+    '("float" "GST_ADDER_FORMAT_FLOAT" "2")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/audioconvert/audioconvert.h
+
+(define-enum-extended AudioConvertDithering
+  (in-module "Gst")
+  (c-name "GstAudioConvertDithering")
+  (values
+    '("none" "GST_AUDIO_CONVERT_DITHER_NONE" "0")
+    '("rpdf" "GST_AUDIO_CONVERT_DITHER_RPDF" "1")
+    '("tpdf" "GST_AUDIO_CONVERT_DITHER_TPDF" "2")
+    '("tpdf-hf" "GST_AUDIO_CONVERT_DITHER_TPDF_HF" "3")
+  )
+)
+
+(define-enum-extended AudioConvertNoiseShaping
+  (in-module "Gst")
+  (c-name "GstAudioConvertNoiseShaping")
+  (values
+    '("none" "GST_AUDIO_CONVERT_NOISE_SHAPING_NONE" "0")
+    '("error-feedback" "GST_AUDIO_CONVERT_NOISE_SHAPING_ERROR_FEEDBACK" "1")
+    '("simple" "GST_AUDIO_CONVERT_NOISE_SHAPING_SIMPLE" "2")
+    '("medium" "GST_AUDIO_CONVERT_NOISE_SHAPING_MEDIUM" "3")
+    '("high" "GST_AUDIO_CONVERT_NOISE_SHAPING_HIGH" "4")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/audiotestsrc/gstaudiotestsrc.h
+
+(define-enum-extended AudioTestSrcWave
+  (in-module "Gst")
+  (c-name "GstAudioTestSrcWave")
+  (values
+    '("sine" "GST_AUDIO_TEST_SRC_WAVE_SINE" "0")
+    '("square" "GST_AUDIO_TEST_SRC_WAVE_SQUARE" "1")
+    '("saw" "GST_AUDIO_TEST_SRC_WAVE_SAW" "2")
+    '("triangle" "GST_AUDIO_TEST_SRC_WAVE_TRIANGLE" "3")
+    '("silence" "GST_AUDIO_TEST_SRC_WAVE_SILENCE" "4")
+    '("white-noise" "GST_AUDIO_TEST_SRC_WAVE_WHITE_NOISE" "5")
+    '("pink-noise" "GST_AUDIO_TEST_SRC_WAVE_PINK_NOISE" "6")
+    '("sine-tab" "GST_AUDIO_TEST_SRC_WAVE_SINE_TAB" "7")
+    '("ticks" "GST_AUDIO_TEST_SRC_WAVE_TICKS" "8")
+  )
+)
+
+(define-enum-extended AudioTestSrcFormat
+  (in-module "Gst")
+  (c-name "GstAudioTestSrcFormat")
+  (values
+    '("none" "GST_AUDIO_TEST_SRC_FORMAT_NONE" "-1")
+    '("s16" "GST_AUDIO_TEST_SRC_FORMAT_S16" "0")
+    '("s32" "GST_AUDIO_TEST_SRC_FORMAT_S32" "1")
+    '("f32" "GST_AUDIO_TEST_SRC_FORMAT_F32" "2")
+    '("f64" "GST_AUDIO_TEST_SRC_FORMAT_F64" "3")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/gdp/gstgdpdepay.h
+
+(define-enum-extended GDPDepayState
+  (in-module "Gst")
+  (c-name "GstGDPDepayState")
+  (values
+    '("header" "GST_GDP_DEPAY_STATE_HEADER" "0")
+    '("payload" "GST_GDP_DEPAY_STATE_PAYLOAD" "1")
+    '("buffer" "GST_GDP_DEPAY_STATE_BUFFER" "2")
+    '("caps" "GST_GDP_DEPAY_STATE_CAPS" "3")
+    '("event" "GST_GDP_DEPAY_STATE_EVENT" "4")
+  )
+)
+;; Handwritten for GstGDPPay (gdppay plugin)
+
+(define-enum-extended DPVersion
+  (in-module "Gst")
+  (c-name "GstDPVersion")
+  (values
+    '("0.2" "GST_GDP_VERSION_0_2" "1")
+    '("1.0" "GST_GDP_VERSION_1_0" "2")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstfactorylists.h
+
+(define-flags-extended FactoryListType
+  (in-module "Gst")
+  (c-name "GstFactoryListType")
+  (values
+    '("decoder" "GST_FACTORY_LIST_DECODER" "1 << 0")
+    '("encoder" "GST_FACTORY_LIST_ENCODER" "1 << 1")
+    '("sink" "GST_FACTORY_LIST_SINK" "1 << 2")
+    '("src" "GST_FACTORY_LIST_SRC" "1 << 3")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstplay-enum.h
+
+(define-enum-extended AutoplugSelectResult
+  (in-module "Gst")
+  (c-name "GstAutoplugSelectResult")
+  (values
+    '("try" "GST_AUTOPLUG_SELECT_TRY" "0")
+    '("expose" "GST_AUTOPLUG_SELECT_EXPOSE" "1")
+    '("skip" "GST_AUTOPLUG_SELECT_SKIP" "2")
+  )
+)
+
+(define-flags-extended PlayFlags
+  (in-module "Gst")
+  (c-name "GstPlayFlags")
+  (values
+    '("video" "GST_PLAY_FLAG_VIDEO" "1 << 0")
+    '("audio" "GST_PLAY_FLAG_AUDIO" "1 << 1")
+    '("text" "GST_PLAY_FLAG_TEXT" "1 << 2")
+    '("vis" "GST_PLAY_FLAG_VIS" "1 << 3")
+    '("soft-volume" "GST_PLAY_FLAG_SOFT_VOLUME" "1 << 4")
+    '("native-audio" "GST_PLAY_FLAG_NATIVE_AUDIO" "1 << 5")
+    '("native-video" "GST_PLAY_FLAG_NATIVE_VIDEO" "1 << 6")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstplaysink.h
+
+(define-enum-extended PlaySinkType
+  (in-module "Gst")
+  (c-name "GstPlaySinkType")
+  (values
+    '("audio" "GST_PLAY_SINK_TYPE_AUDIO" "0")
+    '("audio-raw" "GST_PLAY_SINK_TYPE_AUDIO_RAW" "1")
+    '("video" "GST_PLAY_SINK_TYPE_VIDEO" "2")
+    '("video-raw" "GST_PLAY_SINK_TYPE_VIDEO_RAW" "3")
+    '("text" "GST_PLAY_SINK_TYPE_TEXT" "4")
+    '("last" "GST_PLAY_SINK_TYPE_LAST" "5")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gststreaminfo.h
+
+(define-enum-extended StreamType
+  (in-module "Gst")
+  (c-name "GstStreamType")
+  (values
+    '("unknown" "GST_STREAM_TYPE_UNKNOWN" "0")
+    '("audio" "GST_STREAM_TYPE_AUDIO" "1")
+    '("video" "GST_STREAM_TYPE_VIDEO" "2")
+    '("text" "GST_STREAM_TYPE_TEXT" "3")
+    '("subpicture" "GST_STREAM_TYPE_SUBPICTURE" "4")
+    '("element" "GST_STREAM_TYPE_ELEMENT" "5")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/subparse/gstsubparse.h
+
+(define-enum-extended SubParseFormat
+  (in-module "Gst")
+  (c-name "GstSubParseFormat")
+  (values
+    '("unknown" "GST_SUB_PARSE_FORMAT_UNKNOWN" "0")
+    '("mdvdsub" "GST_SUB_PARSE_FORMAT_MDVDSUB" "1")
+    '("subrip" "GST_SUB_PARSE_FORMAT_SUBRIP" "2")
+    '("mpsub" "GST_SUB_PARSE_FORMAT_MPSUB" "3")
+    '("sami" "GST_SUB_PARSE_FORMAT_SAMI" "4")
+    '("tmplayer" "GST_SUB_PARSE_FORMAT_TMPLAYER" "5")
+    '("mpl2" "GST_SUB_PARSE_FORMAT_MPL2" "6")
+    '("subviewer" "GST_SUB_PARSE_FORMAT_SUBVIEWER" "7")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gstmultifdsink.h
+
+(define-enum-extended MultiFdSinkFlags
+  (in-module "Gst")
+  (c-name "GstMultiFdSinkFlags")
+  (values
+  )
+)
+
+(define-enum-extended RecoverPolicy
+  (in-module "Gst")
+  (c-name "GstRecoverPolicy")
+  (values
+    '("none" "GST_RECOVER_POLICY_NONE" "0")
+    '("resync-latest" "GST_RECOVER_POLICY_RESYNC_LATEST" "1")
+    '("resync-soft-limit" "GST_RECOVER_POLICY_RESYNC_SOFT_LIMIT" "2")
+    '("resync-keyframe" "GST_RECOVER_POLICY_RESYNC_KEYFRAME" "3")
+  )
+)
+
+(define-enum-extended SyncMethod
+  (in-module "Gst")
+  (c-name "GstSyncMethod")
+  (values
+    '("latest" "GST_SYNC_METHOD_LATEST" "0")
+    '("next-keyframe" "GST_SYNC_METHOD_NEXT_KEYFRAME" "1")
+    '("latest-keyframe" "GST_SYNC_METHOD_LATEST_KEYFRAME" "2")
+    '("burst" "GST_SYNC_METHOD_BURST" "3")
+    '("burst-keyframe" "GST_SYNC_METHOD_BURST_KEYFRAME" "4")
+    '("burst-with-keyframe" "GST_SYNC_METHOD_BURST_WITH_KEYFRAME" "5")
+  )
+)
+
+(define-enum-extended TCPUnitType
+  (in-module "Gst")
+  (c-name "GstTCPUnitType")
+  (values
+    '("undefined" "GST_TCP_UNIT_TYPE_UNDEFINED" "0")
+    '("buffers" "GST_TCP_UNIT_TYPE_BUFFERS" "1")
+    '("time" "GST_TCP_UNIT_TYPE_TIME" "2")
+    '("bytes" "GST_TCP_UNIT_TYPE_BYTES" "3")
+  )
+)
+
+(define-enum-extended ClientStatus
+  (in-module "Gst")
+  (c-name "GstClientStatus")
+  (values
+    '("ok" "GST_CLIENT_STATUS_OK" "0")
+    '("closed" "GST_CLIENT_STATUS_CLOSED" "1")
+    '("removed" "GST_CLIENT_STATUS_REMOVED" "2")
+    '("slow" "GST_CLIENT_STATUS_SLOW" "3")
+    '("error" "GST_CLIENT_STATUS_ERROR" "4")
+    '("duplicate" "GST_CLIENT_STATUS_DUPLICATE" "5")
+    '("flushing" "GST_CLIENT_STATUS_FLUSHING" "6")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpclientsink.h
+
+(define-enum-extended TCPClientSinkFlags
+  (in-module "Gst")
+  (c-name "GstTCPClientSinkFlags")
+  (values
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpclientsrc.h
+
+(define-enum-extended TCPClientSrcFlags
+  (in-module "Gst")
+  (c-name "GstTCPClientSrcFlags")
+  (values
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcp.h
+
+(define-enum-extended TCPProtocol
+  (in-module "Gst")
+  (c-name "GstTCPProtocol")
+  (values
+    '("none" "GST_TCP_PROTOCOL_NONE" "0")
+    '("gdp" "GST_TCP_PROTOCOL_GDP" "1")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpplugin.h
+
+(define-enum-extended _TCP_Control
+  (in-module "Gst")
+  (c-name "Gst_TCP_Control")
+  (values
+    '("zero" "CONTROL_ZERO" "0")
+    '("none" "CONTROL_NONE" "1")
+    '("tcp" "CONTROL_TCP" "2")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpserversink.h
+
+(define-enum-extended TCPServerSinkFlags
+  (in-module "Gst")
+  (c-name "GstTCPServerSinkFlags")
+  (values
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpserversrc.h
+
+(define-enum-extended TCPServerSrcFlags
+  (in-module "Gst")
+  (c-name "GstTCPServerSrcFlags")
+  (values
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/videoscale/gstvideoscale.h
+
+(define-enum-extended VideoScaleMethod
+  (in-module "Gst")
+  (c-name "GstVideoScaleMethod")
+  (values
+    '("nearest" "GST_VIDEO_SCALE_NEAREST" "0")
+    '("bilinear" "GST_VIDEO_SCALE_BILINEAR" "1")
+    '("4tap" "GST_VIDEO_SCALE_4TAP" "2")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.h
+
+(define-enum-extended VideoTestSrcPattern
+  (in-module "Gst")
+  (c-name "GstVideoTestSrcPattern")
+  (values
+    '("smpte" "GST_VIDEO_TEST_SRC_SMPTE" "0")
+    '("snow" "GST_VIDEO_TEST_SRC_SNOW" "1")
+    '("black" "GST_VIDEO_TEST_SRC_BLACK" "2")
+    '("white" "GST_VIDEO_TEST_SRC_WHITE" "3")
+    '("red" "GST_VIDEO_TEST_SRC_RED" "4")
+    '("green" "GST_VIDEO_TEST_SRC_GREEN" "5")
+    '("blue" "GST_VIDEO_TEST_SRC_BLUE" "6")
+    '("checkers1" "GST_VIDEO_TEST_SRC_CHECKERS1" "7")
+    '("checkers2" "GST_VIDEO_TEST_SRC_CHECKERS2" "8")
+    '("checkers4" "GST_VIDEO_TEST_SRC_CHECKERS4" "9")
+    '("checkers8" "GST_VIDEO_TEST_SRC_CHECKERS8" "10")
+    '("circular" "GST_VIDEO_TEST_SRC_CIRCULAR" "11")
+    '("blink" "GST_VIDEO_TEST_SRC_BLINK" "12")
+    '("smpte75" "GST_VIDEO_TEST_SRC_SMPTE75" "13")
+    '("zone-plate" "GST_VIDEO_TEST_SRC_ZONE_PLATE" "14")
+  )
+)
+
+(define-enum-extended VideoTestSrcColorSpec
+  (in-module "Gst")
+  (c-name "GstVideoTestSrcColorSpec")
+  (values
+    '("bt601" "GST_VIDEO_TEST_SRC_BT601" "0")
+    '("bt709" "GST_VIDEO_TEST_SRC_BT709" "1")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/alsa/gstalsamixer.h
+
+(define-flags-extended AlsaMixerDirection
+  (in-module "Gst")
+  (c-name "GstAlsaMixerDirection")
+  (values
+    '("capture" "GST_ALSA_MIXER_CAPTURE" "1<<0")
+    '("playback" "GST_ALSA_MIXER_PLAYBACK" "1<<1")
+    '("all" "GST_ALSA_MIXER_ALL" "0x1")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/ogg/gstoggdemux.h
+
+(define-enum-extended OggPadMode
+  (in-module "Gst")
+  (c-name "GstOggPadMode")
+  (values
+    '("init" "GST_OGG_PAD_MODE_INIT" "0")
+    '("streaming" "GST_OGG_PAD_MODE_STREAMING" "1")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/pango/gsttextoverlay.h
+
+(define-enum-extended TextOverlayVAlign
+  (in-module "Gst")
+  (c-name "GstTextOverlayVAlign")
+  (values
+    '("baseline" "GST_TEXT_OVERLAY_VALIGN_BASELINE" "0")
+    '("bottom" "GST_TEXT_OVERLAY_VALIGN_BOTTOM" "1")
+    '("top" "GST_TEXT_OVERLAY_VALIGN_TOP" "2")
+  )
+)
+
+(define-enum-extended TextOverlayHAlign
+  (in-module "Gst")
+  (c-name "GstTextOverlayHAlign")
+  (values
+    '("left" "GST_TEXT_OVERLAY_HALIGN_LEFT" "0")
+    '("center" "GST_TEXT_OVERLAY_HALIGN_CENTER" "1")
+    '("right" "GST_TEXT_OVERLAY_HALIGN_RIGHT" "2")
+  )
+)
+
+(define-enum-extended TextOverlayWrapMode
+  (in-module "Gst")
+  (c-name "GstTextOverlayWrapMode")
+  (values
+    '("none" "GST_TEXT_OVERLAY_WRAP_MODE_NONE" "-1")
+    '("word" "GST_TEXT_OVERLAY_WRAP_MODE_WORD" "0")
+    '("char" "GST_TEXT_OVERLAY_WRAP_MODE_CHAR" "1")
+    '("word-char" "GST_TEXT_OVERLAY_WRAP_MODE_WORD_CHAR" "2")
+  )
+)
+
+(define-enum-extended TextOverlayLineAlign
+  (in-module "Gst")
+  (c-name "GstTextOverlayLineAlign")
+  (values
+    '("left" "GST_TEXT_OVERLAY_LINE_ALIGN_LEFT" "0")
+    '("center" "GST_TEXT_OVERLAY_LINE_ALIGN_CENTER" "1")
+    '("right" "GST_TEXT_OVERLAY_LINE_ALIGN_RIGHT" "2")
+  )
+)
+
+;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/theora/gsttheoraenc.h
+
+(define-enum-extended TheoraEncBorderMode
+  (in-module "Gst")
+  (c-name "GstTheoraEncBorderMode")
+  (values
+    '("none" "GST_THEORA_ENC_BORDER_NONE" "0")
+    '("black" "GST_THEORA_ENC_BORDER_BLACK" "1")
+    '("mirror" "GST_THEORA_ENC_BORDER_MIRROR" "2")
+  )
+)
+

Added: gstreamermm/trunk/gstreamerbase/src/gstbase_enums.defs.patch
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/gstbase_enums.defs.patch	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,114 @@
+--- gstbase_enums.defs	2008-12-10 19:42:34.000000000 -0500
++++ gstbase_enums.defs.new	2008-12-10 19:42:09.000000000 -0500
+@@ -707,10 +707,10 @@
+   (in-module "Gst")
+   (c-name "GstAudioConvertDithering")
+   (values
+-    '("none" "DITHER_NONE" "0")
+-    '("rpdf" "DITHER_RPDF" "1")
+-    '("tpdf" "DITHER_TPDF" "2")
+-    '("tpdf-hf" "DITHER_TPDF_HF" "3")
++    '("none" "GST_AUDIO_CONVERT_DITHER_NONE" "0")
++    '("rpdf" "GST_AUDIO_CONVERT_DITHER_RPDF" "1")
++    '("tpdf" "GST_AUDIO_CONVERT_DITHER_TPDF" "2")
++    '("tpdf-hf" "GST_AUDIO_CONVERT_DITHER_TPDF_HF" "3")
+   )
+ )
+ 
+@@ -718,11 +718,11 @@
+   (in-module "Gst")
+   (c-name "GstAudioConvertNoiseShaping")
+   (values
+-    '("none" "NOISE_SHAPING_NONE" "0")
+-    '("error-feedback" "NOISE_SHAPING_ERROR_FEEDBACK" "1")
+-    '("simple" "NOISE_SHAPING_SIMPLE" "2")
+-    '("medium" "NOISE_SHAPING_MEDIUM" "3")
+-    '("high" "NOISE_SHAPING_HIGH" "4")
++    '("none" "GST_AUDIO_CONVERT_NOISE_SHAPING_NONE" "0")
++    '("error-feedback" "GST_AUDIO_CONVERT_NOISE_SHAPING_ERROR_FEEDBACK" "1")
++    '("simple" "GST_AUDIO_CONVERT_NOISE_SHAPING_SIMPLE" "2")
++    '("medium" "GST_AUDIO_CONVERT_NOISE_SHAPING_MEDIUM" "3")
++    '("high" "GST_AUDIO_CONVERT_NOISE_SHAPING_HIGH" "4")
+   )
+ )
+ 
+@@ -769,6 +769,16 @@
+     '("event" "GST_GDP_DEPAY_STATE_EVENT" "4")
+   )
+ )
++;; Handwritten for GstGDPPay (gdppay plugin)
++
++(define-enum-extended DPVersion
++  (in-module "Gst")
++  (c-name "GstDPVersion")
++  (values
++    '("0.2" "GST_GDP_VERSION_0_2" "1")
++    '("1.0" "GST_GDP_VERSION_1_0" "2")
++  )
++)
+ 
+ ;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstfactorylists.h
+ 
+@@ -1041,17 +1051,6 @@
+   )
+ )
+ 
+-;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/ogg/gstoggmux.h
+-
+-(define-enum-extended 
+-  (in-module "")
+-  (c-name "")
+-  (values
+-    '("control" "GST_OGG_PAD_STATE_CONTROL" "0")
+-    '("data" "GST_OGG_PAD_STATE_DATA" "1")
+-  )
+-)
+-
+ ;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/pango/gsttextoverlay.h
+ 
+ (define-enum-extended TextOverlayVAlign
+@@ -1079,9 +1078,9 @@
+   (c-name "GstTextOverlayWrapMode")
+   (values
+     '("none" "GST_TEXT_OVERLAY_WRAP_MODE_NONE" "-1")
+-    '("word" "GST_TEXT_OVERLAY_WRAP_MODE_WORD" "#error")
+-    '("char" "GST_TEXT_OVERLAY_WRAP_MODE_CHAR" "#error")
+-    '("word-char" "GST_TEXT_OVERLAY_WRAP_MODE_WORD_CHAR" "#error")
++    '("word" "GST_TEXT_OVERLAY_WRAP_MODE_WORD" "0")
++    '("char" "GST_TEXT_OVERLAY_WRAP_MODE_CHAR" "1")
++    '("word-char" "GST_TEXT_OVERLAY_WRAP_MODE_WORD_CHAR" "2")
+   )
+ )
+ 
+@@ -1089,21 +1088,21 @@
+   (in-module "Gst")
+   (c-name "GstTextOverlayLineAlign")
+   (values
+-    '("left" "GST_TEXT_OVERLAY_LINE_ALIGN_LEFT" "#error")
+-    '("center" "GST_TEXT_OVERLAY_LINE_ALIGN_CENTER" "#error")
+-    '("right" "GST_TEXT_OVERLAY_LINE_ALIGN_RIGHT" "#error")
++    '("left" "GST_TEXT_OVERLAY_LINE_ALIGN_LEFT" "0")
++    '("center" "GST_TEXT_OVERLAY_LINE_ALIGN_CENTER" "1")
++    '("right" "GST_TEXT_OVERLAY_LINE_ALIGN_RIGHT" "2")
+   )
+ )
+ 
+ ;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/theora/gsttheoraenc.h
+ 
+-(define-enum-extended 
+-  (in-module "")
+-  (c-name "")
+-  (values
+-    '("none" "BORDER_NONE" "0")
+-    '("black" "BORDER_BLACK" "1")
+-    '("mirror" "BORDER_MIRROR" "2")
++(define-enum-extended TheoraEncBorderMode
++  (in-module "Gst")
++  (c-name "GstTheoraEncBorderMode")
++  (values
++    '("none" "GST_THEORA_ENC_BORDER_NONE" "0")
++    '("black" "GST_THEORA_ENC_BORDER_BLACK" "1")
++    '("mirror" "GST_THEORA_ENC_BORDER_MIRROR" "2")
+   )
+ )
+ 

Modified: gstreamermm/trunk/gstreamerbase/src/gstbase_methods.defs
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/gstbase_methods.defs	(original)
+++ gstreamermm/trunk/gstreamerbase/src/gstbase_methods.defs	Fri Dec 12 03:49:44 2008
@@ -1,5 +1,19 @@
 ;; -*- scheme -*-
 ; object definitions ...
+(define-object Adder
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstAdder")
+  (gtype-id "GST_TYPE_ADDER")
+)
+
+(define-object AlsaMixerElement
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstAlsaMixerElement")
+  (gtype-id "GST_TYPE_ALSA_MIXER_ELEMENT")
+)
+
 (define-object AudioClock
   (in-module "Gst")
   (parent "GstSystemClock")
@@ -7,6 +21,13 @@
   (gtype-id "GST_TYPE_AUDIO_CLOCK")
 )
 
+(define-object AudioConvert
+  (in-module "Gst")
+  (parent "GstBaseTransform")
+  (c-name "GstAudioConvert")
+  (gtype-id "GST_TYPE_AUDIO_CONVERT")
+)
+
 (define-object AudioFilter
   (in-module "Gst")
   (parent "GstBaseTransform")
@@ -14,6 +35,13 @@
   (gtype-id "GST_TYPE_AUDIO_FILTER")
 )
 
+(define-object AudioTestSrc
+  (in-module "Gst")
+  (parent "GstBaseSrc")
+  (c-name "GstAudioTestSrc")
+  (gtype-id "GST_TYPE_AUDIO_TEST_SRC")
+)
+
 (define-object BaseAudioSink
   (in-module "Gst")
   (parent "GstBaseSink")
@@ -28,6 +56,13 @@
   (gtype-id "GST_TYPE_AUDIO_SINK")
 )
 
+(define-object AlsaSink
+  (in-module "Gst")
+  (parent "GstAudioSink")
+  (c-name "GstAlsaSink")
+  (gtype-id "GST_TYPE_ALSA_SINK")
+)
+
 (define-object BaseAudioSrc
   (in-module "Gst")
   (parent "GstPushSrc")
@@ -42,6 +77,13 @@
   (gtype-id "GST_TYPE_AUDIO_SRC")
 )
 
+(define-object AlsaSrc
+  (in-module "Gst")
+  (parent "GstAudioSrc")
+  (c-name "GstAlsaSrc")
+  (gtype-id "GST_TYPE_ALSA_SRC")
+)
+
 (define-object BaseRTPDepayload
   (in-module "Gst")
   (parent "GstElement")
@@ -70,6 +112,13 @@
   (gtype-id "GST_TYPE_CDDA_BASE_SRC")
 )
 
+(define-object CdParanoiaSrc
+  (in-module "Gst")
+  (parent "GstCddaBaseSrc")
+  (c-name "GstCdParanoiaSrc")
+  (gtype-id "GST_TYPE_CD_PARANOIA_SRC")
+)
+
 (define-object ColorBalance
   (in-module "Gst")
   (c-name "GstColorBalance")
@@ -90,6 +139,83 @@
   (gtype-id "GST_TYPE_COLOR_BALANCE_CHANNEL")
 )
 
+(define-object FFMpegCsp
+  (in-module "Gst")
+  (parent "GstBaseTransform")
+  (c-name "GstFFMpegCsp")
+  (gtype-id "GST_TYPE_FF_MPEG_CSP")
+)
+
+(define-object GDPDepay
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstGDPDepay")
+  (gtype-id "GST_TYPE_GDP_DEPAY")
+)
+
+(define-object GDPPay
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstGDPPay")
+  (gtype-id "GST_TYPE_GDP_PAY")
+)
+
+(define-object GioBaseSink
+  (in-module "Gst")
+  (parent "GstBaseSink")
+  (c-name "GstGioBaseSink")
+  (gtype-id "GST_TYPE_GIO_BASE_SINK")
+)
+
+(define-object GioBaseSrc
+  (in-module "Gst")
+  (parent "GstBaseSrc")
+  (c-name "GstGioBaseSrc")
+  (gtype-id "GST_TYPE_GIO_BASE_SRC")
+)
+
+(define-object GioSink
+  (in-module "Gst")
+  (parent "GstGioBaseSink")
+  (c-name "GstGioSink")
+  (gtype-id "GST_TYPE_GIO_SINK")
+)
+
+(define-object GioSrc
+  (in-module "Gst")
+  (parent "GstGioBaseSrc")
+  (c-name "GstGioSrc")
+  (gtype-id "GST_TYPE_GIO_SRC")
+)
+
+(define-object GioStreamSink
+  (in-module "Gst")
+  (parent "GstGioBaseSink")
+  (c-name "GstGioStreamSink")
+  (gtype-id "GST_TYPE_GIO_STREAM_SINK")
+)
+
+(define-object GioStreamSrc
+  (in-module "Gst")
+  (parent "GstGioBaseSrc")
+  (c-name "GstGioStreamSrc")
+  (gtype-id "GST_TYPE_GIO_STREAM_SRC")
+)
+
+(define-object GnomeVFSSink
+  (in-module "Gst")
+  (parent "GstBaseSink")
+  (c-name "GstGnomeVFSSink")
+  (gtype-id "GST_TYPE_GNOME_VFS_SINK")
+)
+
+(define-object GnomeVFSSrc
+  (in-module "Gst")
+  (parent "GstBaseSrc")
+  (c-name "GstGnomeVFSSrc")
+  (gtype-id "GST_TYPE_GNOME_VFS_SRC")
+)
+
 (define-object Mixer
   (in-module "Gst")
   (c-name "GstMixer")
@@ -110,6 +236,27 @@
   (gtype-id "GST_TYPE_MIXER_OPTIONS")
 )
 
+(define-object AlsaMixerOptions
+  (in-module "Gst")
+  (parent "GstMixerOptions")
+  (c-name "GstAlsaMixerOptions")
+  (gtype-id "GST_TYPE_ALSA_MIXER_OPTIONS")
+)
+
+(define-object AlsaMixerTrack
+  (in-module "Gst")
+  (parent "GstMixerTrack")
+  (c-name "GstAlsaMixerTrack")
+  (gtype-id "GST_TYPE_ALSA_MIXER_TRACK")
+)
+
+(define-object MultiFdSink
+  (in-module "Gst")
+  (parent "GstBaseSink")
+  (c-name "GstMultiFdSink")
+  (gtype-id "GST_TYPE_MULTI_FD_SINK")
+)
+
 (define-object NetBuffer
   (in-module "Gst")
   (parent "GstBuffer")
@@ -117,6 +264,34 @@
   (gtype-id "GST_TYPE_NET_BUFFER")
 )
 
+(define-object OggDemux
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstOggDemux")
+  (gtype-id "GST_TYPE_OGG_DEMUX")
+)
+
+(define-object OggMux
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstOggMux")
+  (gtype-id "GST_TYPE_OGG_MUX")
+)
+
+(define-object OggPad
+  (in-module "Gst")
+  (parent "GstPad")
+  (c-name "GstOggPad")
+  (gtype-id "GST_TYPE_OGG_PAD")
+)
+
+(define-object PlayBaseBin
+  (in-module "Gst")
+  (parent "GstPipeline")
+  (c-name "GstPlayBaseBin")
+  (gtype-id "GST_TYPE_PLAY_BASE_BIN")
+)
+
 (define-object RingBuffer
   (in-module "Gst")
   (parent "GstObject")
@@ -124,6 +299,69 @@
   (gtype-id "GST_TYPE_RING_BUFFER")
 )
 
+(define-object SpeexResample
+  (in-module "Gst")
+  (parent "GstBaseTransform")
+  (c-name "GstSpeexResample")
+  (gtype-id "GST_TYPE_SPEEX_RESAMPLE")
+)
+
+(define-object SsaParse
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstSsaParse")
+  (gtype-id "GST_TYPE_SSA_PARSE")
+)
+
+(define-object StreamInfo
+  (in-module "Gst")
+  (parent "GObject")
+  (c-name "GstStreamInfo")
+  (gtype-id "GST_TYPE_STREAM_INFO")
+)
+
+(define-object StreamSelector
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstStreamSelector")
+  (gtype-id "GST_TYPE_STREAM_SELECTOR")
+)
+
+(define-object SubParse
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstSubParse")
+  (gtype-id "GST_TYPE_SUB_PARSE")
+)
+
+(define-object TCPClientSink
+  (in-module "Gst")
+  (parent "GstBaseSink")
+  (c-name "GstTCPClientSink")
+  (gtype-id "GST_TYPE_TCP_CLIENT_SINK")
+)
+
+(define-object TCPClientSrc
+  (in-module "Gst")
+  (parent "GstPushSrc")
+  (c-name "GstTCPClientSrc")
+  (gtype-id "GST_TYPE_TCP_CLIENT_SRC")
+)
+
+(define-object TCPServerSink
+  (in-module "Gst")
+  (parent "GstMultiFdSink")
+  (c-name "GstTCPServerSink")
+  (gtype-id "GST_TYPE_TCP_SERVER_SINK")
+)
+
+(define-object TCPServerSrc
+  (in-module "Gst")
+  (parent "GstPushSrc")
+  (c-name "GstTCPServerSrc")
+  (gtype-id "GST_TYPE_TCP_SERVER_SRC")
+)
+
 (define-object TagDemux
   (in-module "Gst")
   (parent "GstElement")
@@ -131,6 +369,55 @@
   (gtype-id "GST_TYPE_TAG_DEMUX")
 )
 
+(define-object TextOverlay
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstTextOverlay")
+  (gtype-id "GST_TYPE_TEXT_OVERLAY")
+)
+
+(define-object ClockOverlay
+  (in-module "Gst")
+  (parent "GstTextOverlay")
+  (c-name "GstClockOverlay")
+  (gtype-id "GST_TYPE_CLOCK_OVERLAY")
+)
+
+(define-object TextRender
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstTextRender")
+  (gtype-id "GST_TYPE_TEXT_RENDER")
+)
+
+(define-object TheoraDec
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstTheoraDec")
+  (gtype-id "GST_TYPE_THEORA_DEC")
+)
+
+(define-object TheoraEnc
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstTheoraEnc")
+  (gtype-id "GST_TYPE_THEORA_ENC")
+)
+
+(define-object TheoraParse
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstTheoraParse")
+  (gtype-id "GST_TYPE_THEORA_PARSE")
+)
+
+(define-object TimeOverlay
+  (in-module "Gst")
+  (parent "GstTextOverlay")
+  (c-name "GstTimeOverlay")
+  (gtype-id "GST_TYPE_TIME_OVERLAY")
+)
+
 (define-object Tuner
   (in-module "Gst")
   (c-name "GstTuner")
@@ -172,6 +459,20 @@
   (gtype-id "GST_TYPE_VIDEO_FILTER")
 )
 
+(define-object VideoRate
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstVideoRate")
+  (gtype-id "GST_TYPE_VIDEO_RATE")
+)
+
+(define-object VideoScale
+  (in-module "Gst")
+  (parent "GstBaseTransform")
+  (c-name "GstVideoScale")
+  (gtype-id "GST_TYPE_VIDEO_SCALE")
+)
+
 (define-object VideoSink
   (in-module "Gst")
   (parent "GstBaseSink")
@@ -179,6 +480,48 @@
   (gtype-id "GST_TYPE_VIDEO_SINK")
 )
 
+(define-object VideoTestSrc
+  (in-module "Gst")
+  (parent "GstPushSrc")
+  (c-name "GstVideoTestSrc")
+  (gtype-id "GST_TYPE_VIDEO_TEST_SRC")
+)
+
+(define-object Volume
+  (in-module "Gst")
+  (parent "GstAudioFilter")
+  (c-name "GstVolume")
+  (gtype-id "GST_TYPE_VOLUME")
+)
+
+(define-object VorbisDec
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstVorbisDec")
+  (gtype-id "GST_TYPE_VORBIS_DEC")
+)
+
+(define-object VorbisEnc
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstVorbisEnc")
+  (gtype-id "GST_TYPE_VORBIS_ENC")
+)
+
+(define-object VorbisParse
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstVorbisParse")
+  (gtype-id "GST_TYPE_VORBIS_PARSE")
+)
+
+(define-object VorbisTag
+  (in-module "Gst")
+  (parent "GstVorbisParse")
+  (c-name "GstVorbisTag")
+  (gtype-id "GST_TYPE_VORBIS_TAG")
+)
+
 (define-object XOverlay
   (in-module "Gst")
   (c-name "GstXOverlay")
@@ -887,81 +1230,486 @@
   )
 )
 
-
-;; From audio.h
-
-(define-function gst_audio_frame_byte_size
-  (c-name "gst_audio_frame_byte_size")
-  (return-type "int")
-  (parameters
-    '("GstPad*" "pad")
+(define-enum AdderFormat
+  (in-module "Gst")
+  (c-name "GstAdderFormat")
+  (gtype-id "GST_TYPE_ADDER_FORMAT")
+  (values
+    '("unset" "GST_ADDER_FORMAT_UNSET")
+    '("int" "GST_ADDER_FORMAT_INT")
+    '("float" "GST_ADDER_FORMAT_FLOAT")
   )
 )
 
-(define-function gst_audio_frame_length
-  (c-name "gst_audio_frame_length")
-  (return-type "long")
-  (parameters
-    '("GstPad*" "pad")
-    '("GstBuffer*" "buf")
+(define-enum AudioConvertDithering
+  (in-module "Gst")
+  (c-name "GstAudioConvertDithering")
+  (gtype-id "GST_TYPE_AUDIO_CONVERT_DITHERING")
+  (values
+    '("none" "DITHER_NONE")
+    '("rpdf" "DITHER_RPDF")
+    '("tpdf" "DITHER_TPDF")
+    '("tpdf-hf" "DITHER_TPDF_HF")
   )
 )
 
-(define-function gst_audio_duration_from_pad_buffer
-  (c-name "gst_audio_duration_from_pad_buffer")
-  (return-type "GstClockTime")
-  (parameters
-    '("GstPad*" "pad")
-    '("GstBuffer*" "buf")
+(define-enum AudioConvertNoiseShaping
+  (in-module "Gst")
+  (c-name "GstAudioConvertNoiseShaping")
+  (gtype-id "GST_TYPE_AUDIO_CONVERT_NOISE_SHAPING")
+  (values
+    '("none" "NOISE_SHAPING_NONE")
+    '("error-feedback" "NOISE_SHAPING_ERROR_FEEDBACK")
+    '("simple" "NOISE_SHAPING_SIMPLE")
+    '("medium" "NOISE_SHAPING_MEDIUM")
+    '("high" "NOISE_SHAPING_HIGH")
   )
 )
 
-(define-function gst_audio_is_buffer_framed
-  (c-name "gst_audio_is_buffer_framed")
-  (return-type "gboolean")
-  (parameters
-    '("GstPad*" "pad")
-    '("GstBuffer*" "buf")
+(define-enum AudioTestSrcWave
+  (in-module "Gst")
+  (c-name "GstAudioTestSrcWave")
+  (gtype-id "GST_TYPE_AUDIO_TEST_SRC_WAVE")
+  (values
+    '("sine" "GST_AUDIO_TEST_SRC_WAVE_SINE")
+    '("square" "GST_AUDIO_TEST_SRC_WAVE_SQUARE")
+    '("saw" "GST_AUDIO_TEST_SRC_WAVE_SAW")
+    '("triangle" "GST_AUDIO_TEST_SRC_WAVE_TRIANGLE")
+    '("silence" "GST_AUDIO_TEST_SRC_WAVE_SILENCE")
+    '("white-noise" "GST_AUDIO_TEST_SRC_WAVE_WHITE_NOISE")
+    '("pink-noise" "GST_AUDIO_TEST_SRC_WAVE_PINK_NOISE")
+    '("sine-tab" "GST_AUDIO_TEST_SRC_WAVE_SINE_TAB")
+    '("ticks" "GST_AUDIO_TEST_SRC_WAVE_TICKS")
   )
 )
 
-(define-function gst_audio_structure_set_int
-  (c-name "gst_audio_structure_set_int")
-  (return-type "none")
-  (parameters
-    '("GstStructure*" "structure")
-    '("GstAudioFieldFlag" "flag")
+(define-enum AudioTestSrcFormat
+  (in-module "Gst")
+  (c-name "GstAudioTestSrcFormat")
+  (gtype-id "GST_TYPE_AUDIO_TEST_SRC_FORMAT")
+  (values
+    '("none" "GST_AUDIO_TEST_SRC_FORMAT_NONE")
+    '("s16" "GST_AUDIO_TEST_SRC_FORMAT_S16")
+    '("s32" "GST_AUDIO_TEST_SRC_FORMAT_S32")
+    '("f32" "GST_AUDIO_TEST_SRC_FORMAT_F32")
+    '("f64" "GST_AUDIO_TEST_SRC_FORMAT_F64")
   )
 )
 
-(define-function gst_audio_buffer_clip
-  (c-name "gst_audio_buffer_clip")
-  (return-type "GstBuffer*")
-  (parameters
-    '("GstBuffer*" "buffer")
-    '("GstSegment*" "segment")
-    '("gint" "rate")
-    '("gint" "frame_size")
+(define-enum GDPDepayState
+  (in-module "Gst")
+  (c-name "GstGDPDepayState")
+  (gtype-id "GST_TYPE_GDP_DEPAY_STATE")
+  (values
+    '("header" "GST_GDP_DEPAY_STATE_HEADER")
+    '("payload" "GST_GDP_DEPAY_STATE_PAYLOAD")
+    '("buffer" "GST_GDP_DEPAY_STATE_BUFFER")
+    '("caps" "GST_GDP_DEPAY_STATE_CAPS")
+    '("event" "GST_GDP_DEPAY_STATE_EVENT")
   )
 )
 
+(define-flags FactoryListType
+  (in-module "Gst")
+  (c-name "GstFactoryListType")
+  (gtype-id "GST_TYPE_FACTORY_LIST_TYPE")
+  (values
+    '("decoder" "GST_FACTORY_LIST_DECODER")
+    '("encoder" "GST_FACTORY_LIST_ENCODER")
+    '("sink" "GST_FACTORY_LIST_SINK")
+    '("src" "GST_FACTORY_LIST_SRC")
+  )
+)
 
+(define-enum AutoplugSelectResult
+  (in-module "Gst")
+  (c-name "GstAutoplugSelectResult")
+  (gtype-id "GST_TYPE_AUTOPLUG_SELECT_RESULT")
+  (values
+    '("try" "GST_AUTOPLUG_SELECT_TRY")
+    '("expose" "GST_AUTOPLUG_SELECT_EXPOSE")
+    '("skip" "GST_AUTOPLUG_SELECT_SKIP")
+  )
+)
 
-;; From gstaudioclock.h
-
-(define-function gst_audio_clock_get_type
-  (c-name "gst_audio_clock_get_type")
-  (return-type "GType")
+(define-flags PlayFlags
+  (in-module "Gst")
+  (c-name "GstPlayFlags")
+  (gtype-id "GST_TYPE_PLAY_FLAGS")
+  (values
+    '("video" "GST_PLAY_FLAG_VIDEO")
+    '("audio" "GST_PLAY_FLAG_AUDIO")
+    '("text" "GST_PLAY_FLAG_TEXT")
+    '("vis" "GST_PLAY_FLAG_VIS")
+    '("soft-volume" "GST_PLAY_FLAG_SOFT_VOLUME")
+    '("native-audio" "GST_PLAY_FLAG_NATIVE_AUDIO")
+    '("native-video" "GST_PLAY_FLAG_NATIVE_VIDEO")
+  )
 )
 
-(define-function gst_audio_clock_new
-  (c-name "gst_audio_clock_new")
-  (is-constructor-of "GstAudioClock")
-  (return-type "GstClock*")
-  (parameters
-    '("gchar*" "name")
-    '("GstAudioClockGetTimeFunc" "func")
-    '("gpointer" "user_data")
+(define-enum PlaySinkType
+  (in-module "Gst")
+  (c-name "GstPlaySinkType")
+  (gtype-id "GST_TYPE_PLAY_SINK_TYPE")
+  (values
+    '("audio" "GST_PLAY_SINK_TYPE_AUDIO")
+    '("audio-raw" "GST_PLAY_SINK_TYPE_AUDIO_RAW")
+    '("video" "GST_PLAY_SINK_TYPE_VIDEO")
+    '("video-raw" "GST_PLAY_SINK_TYPE_VIDEO_RAW")
+    '("text" "GST_PLAY_SINK_TYPE_TEXT")
+    '("last" "GST_PLAY_SINK_TYPE_LAST")
+  )
+)
+
+(define-enum StreamType
+  (in-module "Gst")
+  (c-name "GstStreamType")
+  (gtype-id "GST_TYPE_STREAM_TYPE")
+  (values
+    '("unknown" "GST_STREAM_TYPE_UNKNOWN")
+    '("audio" "GST_STREAM_TYPE_AUDIO")
+    '("video" "GST_STREAM_TYPE_VIDEO")
+    '("text" "GST_STREAM_TYPE_TEXT")
+    '("subpicture" "GST_STREAM_TYPE_SUBPICTURE")
+    '("element" "GST_STREAM_TYPE_ELEMENT")
+  )
+)
+
+(define-enum SubParseFormat
+  (in-module "Gst")
+  (c-name "GstSubParseFormat")
+  (gtype-id "GST_TYPE_SUB_PARSE_FORMAT")
+  (values
+    '("unknown" "GST_SUB_PARSE_FORMAT_UNKNOWN")
+    '("mdvdsub" "GST_SUB_PARSE_FORMAT_MDVDSUB")
+    '("subrip" "GST_SUB_PARSE_FORMAT_SUBRIP")
+    '("mpsub" "GST_SUB_PARSE_FORMAT_MPSUB")
+    '("sami" "GST_SUB_PARSE_FORMAT_SAMI")
+    '("tmplayer" "GST_SUB_PARSE_FORMAT_TMPLAYER")
+    '("mpl2" "GST_SUB_PARSE_FORMAT_MPL2")
+    '("subviewer" "GST_SUB_PARSE_FORMAT_SUBVIEWER")
+  )
+)
+
+(define-flags MultiFdSinkFlags
+  (in-module "Gst")
+  (c-name "GstMultiFdSinkFlags")
+  (gtype-id "GST_TYPE_MULTI_FD_SINK_FLAGS")
+  (values
+    '("open" "GST_MULTI_FD_SINK_OPEN")
+    '("flag-last" "GST_MULTI_FD_SINK_FLAG_LAST")
+  )
+)
+
+(define-enum RecoverPolicy
+  (in-module "Gst")
+  (c-name "GstRecoverPolicy")
+  (gtype-id "GST_TYPE_RECOVER_POLICY")
+  (values
+    '("none" "GST_RECOVER_POLICY_NONE")
+    '("resync-latest" "GST_RECOVER_POLICY_RESYNC_LATEST")
+    '("resync-soft-limit" "GST_RECOVER_POLICY_RESYNC_SOFT_LIMIT")
+    '("resync-keyframe" "GST_RECOVER_POLICY_RESYNC_KEYFRAME")
+  )
+)
+
+(define-enum SyncMethod
+  (in-module "Gst")
+  (c-name "GstSyncMethod")
+  (gtype-id "GST_TYPE_SYNC_METHOD")
+  (values
+    '("latest" "GST_SYNC_METHOD_LATEST")
+    '("next-keyframe" "GST_SYNC_METHOD_NEXT_KEYFRAME")
+    '("latest-keyframe" "GST_SYNC_METHOD_LATEST_KEYFRAME")
+    '("burst" "GST_SYNC_METHOD_BURST")
+    '("burst-keyframe" "GST_SYNC_METHOD_BURST_KEYFRAME")
+    '("burst-with-keyframe" "GST_SYNC_METHOD_BURST_WITH_KEYFRAME")
+  )
+)
+
+(define-enum TCPUnitType
+  (in-module "Gst")
+  (c-name "GstTCPUnitType")
+  (gtype-id "GST_TYPE_TCP_UNIT_TYPE")
+  (values
+    '("undefined" "GST_TCP_UNIT_TYPE_UNDEFINED")
+    '("buffers" "GST_TCP_UNIT_TYPE_BUFFERS")
+    '("time" "GST_TCP_UNIT_TYPE_TIME")
+    '("bytes" "GST_TCP_UNIT_TYPE_BYTES")
+  )
+)
+
+(define-enum ClientStatus
+  (in-module "Gst")
+  (c-name "GstClientStatus")
+  (gtype-id "GST_TYPE_CLIENT_STATUS")
+  (values
+    '("ok" "GST_CLIENT_STATUS_OK")
+    '("closed" "GST_CLIENT_STATUS_CLOSED")
+    '("removed" "GST_CLIENT_STATUS_REMOVED")
+    '("slow" "GST_CLIENT_STATUS_SLOW")
+    '("error" "GST_CLIENT_STATUS_ERROR")
+    '("duplicate" "GST_CLIENT_STATUS_DUPLICATE")
+    '("flushing" "GST_CLIENT_STATUS_FLUSHING")
+  )
+)
+
+(define-flags TCPClientSinkFlags
+  (in-module "Gst")
+  (c-name "GstTCPClientSinkFlags")
+  (gtype-id "GST_TYPE_TCP_CLIENT_SINK_FLAGS")
+  (values
+    '("open" "GST_TCP_CLIENT_SINK_OPEN")
+    '("flag-last" "GST_TCP_CLIENT_SINK_FLAG_LAST")
+  )
+)
+
+(define-flags TCPClientSrcFlags
+  (in-module "Gst")
+  (c-name "GstTCPClientSrcFlags")
+  (gtype-id "GST_TYPE_TCP_CLIENT_SRC_FLAGS")
+  (values
+    '("open" "GST_TCP_CLIENT_SRC_OPEN")
+    '("flag-last" "GST_TCP_CLIENT_SRC_FLAG_LAST")
+  )
+)
+
+(define-enum TCPProtocol
+  (in-module "Gst")
+  (c-name "GstTCPProtocol")
+  (gtype-id "GST_TYPE_TCP_PROTOCOL")
+  (values
+    '("none" "GST_TCP_PROTOCOL_NONE")
+    '("gdp" "GST_TCP_PROTOCOL_GDP")
+  )
+)
+
+(define-flags TCPServerSinkFlags
+  (in-module "Gst")
+  (c-name "GstTCPServerSinkFlags")
+  (gtype-id "GST_TYPE_TCP_SERVER_SINK_FLAGS")
+  (values
+    '("open" "GST_TCP_SERVER_SINK_OPEN")
+    '("flag-last" "GST_TCP_SERVER_SINK_FLAG_LAST")
+  )
+)
+
+(define-flags TCPServerSrcFlags
+  (in-module "Gst")
+  (c-name "GstTCPServerSrcFlags")
+  (gtype-id "GST_TYPE_TCP_SERVER_SRC_FLAGS")
+  (values
+    '("open" "GST_TCP_SERVER_SRC_OPEN")
+    '("flag-last" "GST_TCP_SERVER_SRC_FLAG_LAST")
+  )
+)
+
+(define-enum VideoScaleMethod
+  (in-module "Gst")
+  (c-name "GstVideoScaleMethod")
+  (gtype-id "GST_TYPE_VIDEO_SCALE_METHOD")
+  (values
+    '("nearest" "GST_VIDEO_SCALE_NEAREST")
+    '("bilinear" "GST_VIDEO_SCALE_BILINEAR")
+    '("4tap" "GST_VIDEO_SCALE_4TAP")
+  )
+)
+
+(define-enum VideoTestSrcPattern
+  (in-module "Gst")
+  (c-name "GstVideoTestSrcPattern")
+  (gtype-id "GST_TYPE_VIDEO_TEST_SRC_PATTERN")
+  (values
+    '("smpte" "GST_VIDEO_TEST_SRC_SMPTE")
+    '("snow" "GST_VIDEO_TEST_SRC_SNOW")
+    '("black" "GST_VIDEO_TEST_SRC_BLACK")
+    '("white" "GST_VIDEO_TEST_SRC_WHITE")
+    '("red" "GST_VIDEO_TEST_SRC_RED")
+    '("green" "GST_VIDEO_TEST_SRC_GREEN")
+    '("blue" "GST_VIDEO_TEST_SRC_BLUE")
+    '("checkers1" "GST_VIDEO_TEST_SRC_CHECKERS1")
+    '("checkers2" "GST_VIDEO_TEST_SRC_CHECKERS2")
+    '("checkers4" "GST_VIDEO_TEST_SRC_CHECKERS4")
+    '("checkers8" "GST_VIDEO_TEST_SRC_CHECKERS8")
+    '("circular" "GST_VIDEO_TEST_SRC_CIRCULAR")
+    '("blink" "GST_VIDEO_TEST_SRC_BLINK")
+    '("smpte75" "GST_VIDEO_TEST_SRC_SMPTE75")
+    '("zone-plate" "GST_VIDEO_TEST_SRC_ZONE_PLATE")
+  )
+)
+
+(define-enum VideoTestSrcColorSpec
+  (in-module "Gst")
+  (c-name "GstVideoTestSrcColorSpec")
+  (gtype-id "GST_TYPE_VIDEO_TEST_SRC_COLOR_SPEC")
+  (values
+    '("bt601" "GST_VIDEO_TEST_SRC_BT601")
+    '("bt709" "GST_VIDEO_TEST_SRC_BT709")
+  )
+)
+
+(define-flags AlsaMixerDirection
+  (in-module "Gst")
+  (c-name "GstAlsaMixerDirection")
+  (gtype-id "GST_TYPE_ALSA_MIXER_DIRECTION")
+  (values
+    '("capture" "GST_ALSA_MIXER_CAPTURE")
+    '("playback" "GST_ALSA_MIXER_PLAYBACK")
+    '("all" "GST_ALSA_MIXER_ALL")
+  )
+)
+
+(define-enum OggPadMode
+  (in-module "Gst")
+  (c-name "GstOggPadMode")
+  (gtype-id "GST_TYPE_OGG_PAD_MODE")
+  (values
+    '("init" "GST_OGG_PAD_MODE_INIT")
+    '("streaming" "GST_OGG_PAD_MODE_STREAMING")
+  )
+)
+
+(define-enum OggPadState
+  (in-module "Gst")
+  (c-name "GstOggPadState")
+  (gtype-id "GST_TYPE_OGG_PAD_STATE")
+  (values
+    '("control" "GST_OGG_PAD_STATE_CONTROL")
+    '("data" "GST_OGG_PAD_STATE_DATA")
+  )
+)
+
+(define-enum TextOverlayVAlign
+  (in-module "Gst")
+  (c-name "GstTextOverlayVAlign")
+  (gtype-id "GST_TYPE_TEXT_OVERLAY_VALIGN")
+  (values
+    '("baseline" "GST_TEXT_OVERLAY_VALIGN_BASELINE")
+    '("bottom" "GST_TEXT_OVERLAY_VALIGN_BOTTOM")
+    '("top" "GST_TEXT_OVERLAY_VALIGN_TOP")
+  )
+)
+
+(define-enum TextOverlayHAlign
+  (in-module "Gst")
+  (c-name "GstTextOverlayHAlign")
+  (gtype-id "GST_TYPE_TEXT_OVERLAY_HALIGN")
+  (values
+    '("left" "GST_TEXT_OVERLAY_HALIGN_LEFT")
+    '("center" "GST_TEXT_OVERLAY_HALIGN_CENTER")
+    '("right" "GST_TEXT_OVERLAY_HALIGN_RIGHT")
+  )
+)
+
+(define-enum TextOverlayWrapMode
+  (in-module "Gst")
+  (c-name "GstTextOverlayWrapMode")
+  (gtype-id "GST_TYPE_TEXT_OVERLAY_WRAP_MODE")
+  (values
+    '("none" "GST_TEXT_OVERLAY_WRAP_MODE_NONE")
+    '("word" "GST_TEXT_OVERLAY_WRAP_MODE_WORD")
+    '("char" "GST_TEXT_OVERLAY_WRAP_MODE_CHAR")
+    '("word-char" "GST_TEXT_OVERLAY_WRAP_MODE_WORD_CHAR")
+  )
+)
+
+(define-enum TextOverlayLineAlign
+  (in-module "Gst")
+  (c-name "GstTextOverlayLineAlign")
+  (gtype-id "GST_TYPE_TEXT_OVERLAY_LINE_ALIGN")
+  (values
+    '("left" "GST_TEXT_OVERLAY_LINE_ALIGN_LEFT")
+    '("center" "GST_TEXT_OVERLAY_LINE_ALIGN_CENTER")
+    '("right" "GST_TEXT_OVERLAY_LINE_ALIGN_RIGHT")
+  )
+)
+
+(define-enum TheoraEncBorderMode
+  (in-module "Gst")
+  (c-name "GstTheoraEncBorderMode")
+  (gtype-id "GST_TYPE_THEORA_ENC_BORDER_MODE")
+  (values
+    '("none" "BORDER_NONE")
+    '("black" "BORDER_BLACK")
+    '("mirror" "BORDER_MIRROR")
+  )
+)
+
+
+;; From audio.h
+
+(define-function gst_audio_frame_byte_size
+  (c-name "gst_audio_frame_byte_size")
+  (return-type "int")
+  (parameters
+    '("GstPad*" "pad")
+  )
+)
+
+(define-function gst_audio_frame_length
+  (c-name "gst_audio_frame_length")
+  (return-type "long")
+  (parameters
+    '("GstPad*" "pad")
+    '("GstBuffer*" "buf")
+  )
+)
+
+(define-function gst_audio_duration_from_pad_buffer
+  (c-name "gst_audio_duration_from_pad_buffer")
+  (return-type "GstClockTime")
+  (parameters
+    '("GstPad*" "pad")
+    '("GstBuffer*" "buf")
+  )
+)
+
+(define-function gst_audio_is_buffer_framed
+  (c-name "gst_audio_is_buffer_framed")
+  (return-type "gboolean")
+  (parameters
+    '("GstPad*" "pad")
+    '("GstBuffer*" "buf")
+  )
+)
+
+(define-function gst_audio_structure_set_int
+  (c-name "gst_audio_structure_set_int")
+  (return-type "none")
+  (parameters
+    '("GstStructure*" "structure")
+    '("GstAudioFieldFlag" "flag")
+  )
+)
+
+(define-function gst_audio_buffer_clip
+  (c-name "gst_audio_buffer_clip")
+  (return-type "GstBuffer*")
+  (parameters
+    '("GstBuffer*" "buffer")
+    '("GstSegment*" "segment")
+    '("gint" "rate")
+    '("gint" "frame_size")
+  )
+)
+
+
+
+;; From gstaudioclock.h
+
+(define-function gst_audio_clock_get_type
+  (c-name "gst_audio_clock_get_type")
+  (return-type "GType")
+)
+
+(define-function gst_audio_clock_new
+  (c-name "gst_audio_clock_new")
+  (is-constructor-of "GstAudioClock")
+  (return-type "GstClock*")
+  (parameters
+    '("gchar*" "name")
+    '("GstAudioClockGetTimeFunc" "func")
+    '("gpointer" "user_data")
   )
 )
 
@@ -5870,3 +6618,2811 @@
 )
 
 
+
+;; From gstadder.h
+
+(define-function gst_adder_get_type
+  (c-name "gst_adder_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From audioconvert.h
+
+(define-function audio_convert_clean_fmt
+  (c-name "audio_convert_clean_fmt")
+  (return-type "gboolean")
+  (parameters
+    '("AudioConvertFmt*" "fmt")
+  )
+)
+
+(define-function audio_convert_prepare_context
+  (c-name "audio_convert_prepare_context")
+  (return-type "gboolean")
+  (parameters
+    '("AudioConvertCtx*" "ctx")
+    '("AudioConvertFmt*" "in")
+    '("AudioConvertFmt*" "out")
+    '("GstAudioConvertDithering" "dither")
+    '("GstAudioConvertNoiseShaping" "ns")
+  )
+)
+
+(define-function audio_convert_get_sizes
+  (c-name "audio_convert_get_sizes")
+  (return-type "gboolean")
+  (parameters
+    '("AudioConvertCtx*" "ctx")
+    '("gint" "samples")
+    '("gint*" "srcsize")
+    '("gint*" "dstsize")
+  )
+)
+
+(define-function audio_convert_clean_context
+  (c-name "audio_convert_clean_context")
+  (return-type "gboolean")
+  (parameters
+    '("AudioConvertCtx*" "ctx")
+  )
+)
+
+(define-function audio_convert_convert
+  (c-name "audio_convert_convert")
+  (return-type "gboolean")
+  (parameters
+    '("AudioConvertCtx*" "ctx")
+    '("gpointer" "src")
+    '("gpointer" "dst")
+    '("gint" "samples")
+    '("gboolean" "src_writable")
+  )
+)
+
+
+
+;; From gstaudioconvert.h
+
+
+
+;; From gstaudioquantize.h
+
+(define-function gst_audio_quantize_setup
+  (c-name "gst_audio_quantize_setup")
+  (return-type "gboolean")
+  (parameters
+    '("AudioConvertCtx*" "ctx")
+  )
+)
+
+(define-function gst_audio_quantize_reset
+  (c-name "gst_audio_quantize_reset")
+  (return-type "none")
+  (parameters
+    '("AudioConvertCtx*" "ctx")
+  )
+)
+
+(define-function gst_audio_quantize_free
+  (c-name "gst_audio_quantize_free")
+  (return-type "none")
+  (parameters
+    '("AudioConvertCtx*" "ctx")
+  )
+)
+
+
+
+;; From gstchannelmix.h
+
+(define-function gst_channel_mix_unset_matrix
+  (c-name "gst_channel_mix_unset_matrix")
+  (return-type "none")
+  (parameters
+    '("AudioConvertCtx*" "this")
+  )
+)
+
+(define-function gst_channel_mix_setup_matrix
+  (c-name "gst_channel_mix_setup_matrix")
+  (return-type "none")
+  (parameters
+    '("AudioConvertCtx*" "this")
+  )
+)
+
+(define-function gst_channel_mix_passthrough
+  (c-name "gst_channel_mix_passthrough")
+  (return-type "gboolean")
+  (parameters
+    '("AudioConvertCtx*" "this")
+  )
+)
+
+(define-function gst_channel_mix_mix_int
+  (c-name "gst_channel_mix_mix_int")
+  (return-type "none")
+  (parameters
+    '("AudioConvertCtx*" "this")
+    '("gint32*" "in_data")
+    '("gint32*" "out_data")
+    '("gint" "samples")
+  )
+)
+
+(define-function gst_channel_mix_mix_float
+  (c-name "gst_channel_mix_mix_float")
+  (return-type "none")
+  (parameters
+    '("AudioConvertCtx*" "this")
+    '("gdouble*" "in_data")
+    '("gdouble*" "out_data")
+    '("gint" "samples")
+  )
+)
+
+
+
+;; From gstfastrandom.h
+
+
+
+;; From plugin.h
+
+(define-function gst_audio_convert_get_type
+  (c-name "gst_audio_convert_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstaudiotestsrc.h
+
+(define-function gst_audio_test_src_get_type
+  (c-name "gst_audio_test_src_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From avcodec.h
+
+(define-function get_pix_fmt_info
+  (c-name "get_pix_fmt_info")
+  (return-type "PixFmtInfo*")
+  (parameters
+    '("enum-PixelFormat" "format")
+  )
+)
+
+(define-function avpicture_get_size
+  (c-name "avpicture_get_size")
+  (return-type "int")
+  (parameters
+    '("int" "pix_fmt")
+    '("int" "width")
+    '("int" "height")
+  )
+)
+
+(define-function avcodec_get_chroma_sub_sample
+  (c-name "avcodec_get_chroma_sub_sample")
+  (return-type "none")
+  (parameters
+    '("int" "pix_fmt")
+    '("int*" "h_shift")
+    '("int*" "v_shift")
+  )
+)
+
+(define-function avcodec_get_pix_fmt_name
+  (c-name "avcodec_get_pix_fmt_name")
+  (return-type "const-char*")
+  (parameters
+    '("int" "pix_fmt")
+  )
+)
+
+(define-function avcodec_set_dimensions
+  (c-name "avcodec_set_dimensions")
+  (return-type "none")
+  (parameters
+    '("AVCodecContext*" "s")
+    '("int" "width")
+    '("int" "height")
+  )
+)
+
+(define-function avcodec_get_pix_fmt_loss
+  (c-name "avcodec_get_pix_fmt_loss")
+  (return-type "int")
+  (parameters
+    '("int" "dst_pix_fmt")
+    '("int" "src_pix_fmt")
+    '("int" "has_alpha")
+  )
+)
+
+(define-function avcodec_find_best_pix_fmt
+  (c-name "avcodec_find_best_pix_fmt")
+  (return-type "int")
+  (parameters
+    '("int" "pix_fmt_mask")
+    '("int" "src_pix_fmt")
+    '("int" "has_alpha")
+    '("int*" "loss_ptr")
+  )
+)
+
+(define-function img_get_alpha_info
+  (c-name "img_get_alpha_info")
+  (return-type "int")
+  (parameters
+    '("const-AVPicture*" "src")
+    '("int" "pix_fmt")
+    '("int" "width")
+    '("int" "height")
+  )
+)
+
+(define-function img_convert
+  (c-name "img_convert")
+  (return-type "int")
+  (parameters
+    '("AVPicture*" "dst")
+    '("int" "dst_pix_fmt")
+    '("const-AVPicture*" "src")
+    '("int" "pix_fmt")
+    '("int" "width")
+    '("int" "height")
+  )
+)
+
+(define-function avcodec_init
+  (c-name "avcodec_init")
+  (return-type "none")
+)
+
+(define-function avcodec_get_context_defaults
+  (c-name "avcodec_get_context_defaults")
+  (return-type "none")
+  (parameters
+    '("AVCodecContext*" "s")
+  )
+)
+
+(define-function avcodec_alloc_context
+  (c-name "avcodec_alloc_context")
+  (return-type "AVCodecContext*")
+)
+
+(define-function av_malloc
+  (c-name "av_malloc")
+  (return-type "void*")
+  (parameters
+    '("unsigned-int" "size")
+  )
+)
+
+(define-function av_mallocz
+  (c-name "av_mallocz")
+  (return-type "void*")
+  (parameters
+    '("unsigned-int" "size")
+  )
+)
+
+(define-function av_realloc
+  (c-name "av_realloc")
+  (return-type "void*")
+  (parameters
+    '("void*" "ptr")
+    '("unsigned-int" "size")
+  )
+)
+
+(define-function av_free
+  (c-name "av_free")
+  (return-type "none")
+  (parameters
+    '("void*" "ptr")
+  )
+)
+
+(define-function av_strdup
+  (c-name "av_strdup")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "s")
+  )
+)
+
+(define-function av_freep
+  (c-name "av_freep")
+  (return-type "none")
+  (parameters
+    '("void*" "ptr")
+  )
+)
+
+(define-function av_fast_realloc
+  (c-name "av_fast_realloc")
+  (return-type "void*")
+  (parameters
+    '("void*" "ptr")
+    '("unsigned-int*" "size")
+    '("unsigned-int" "min_size")
+  )
+)
+
+(define-function av_free_static
+  (c-name "av_free_static")
+  (return-type "none")
+)
+
+(define-function av_mallocz_static
+  (c-name "av_mallocz_static")
+  (return-type "void*")
+  (parameters
+    '("unsigned-int" "size")
+  )
+)
+
+
+
+;; From dsputil.h
+
+(define-function dsputil_static_init
+  (c-name "dsputil_static_init")
+  (return-type "none")
+)
+
+
+
+;; From gstffmpegcodecmap.h
+
+(define-function gst_ffmpegcsp_codectype_to_caps
+  (c-name "gst_ffmpegcsp_codectype_to_caps")
+  (return-type "GstCaps*")
+  (parameters
+    '("enum-CodecType" "codec_type")
+    '("AVCodecContext*" "context")
+  )
+)
+
+(define-function gst_ffmpegcsp_caps_with_codectype
+  (c-name "gst_ffmpegcsp_caps_with_codectype")
+  (return-type "none")
+  (parameters
+    '("enum-CodecType" "type")
+    '("const-GstCaps*" "caps")
+    '("AVCodecContext*" "context")
+  )
+)
+
+(define-function gst_ffmpegcsp_avpicture_fill
+  (c-name "gst_ffmpegcsp_avpicture_fill")
+  (return-type "int")
+  (parameters
+    '("AVPicture*" "picture")
+    '("uint8_t*" "ptr")
+    '("enum-PixelFormat" "pix_fmt")
+    '("int" "width")
+    '("int" "height")
+  )
+)
+
+
+
+;; From gstffmpegcolorspace.h
+
+
+
+;; From imgconvert_template.h
+
+
+
+;; From gstgdpdepay.h
+
+(define-function gst_gdp_depay_plugin_init
+  (c-name "gst_gdp_depay_plugin_init")
+  (return-type "gboolean")
+  (parameters
+    '("GstPlugin*" "plugin")
+  )
+)
+
+
+
+;; From gstgdppay.h
+
+(define-function gst_gdp_pay_plugin_init
+  (c-name "gst_gdp_pay_plugin_init")
+  (return-type "gboolean")
+  (parameters
+    '("GstPlugin*" "plugin")
+  )
+)
+
+
+
+;; From gstfactorylists.h
+
+(define-function gst_factory_list_is_type
+  (c-name "gst_factory_list_is_type")
+  (return-type "gboolean")
+  (parameters
+    '("GstElementFactory*" "factory")
+    '("GstFactoryListType" "type")
+  )
+)
+
+(define-function gst_factory_list_get_elements
+  (c-name "gst_factory_list_get_elements")
+  (return-type "GValueArray*")
+  (parameters
+    '("GstFactoryListType" "type")
+  )
+)
+
+(define-function gst_factory_list_debug
+  (c-name "gst_factory_list_debug")
+  (return-type "none")
+  (parameters
+    '("GValueArray*" "array")
+  )
+)
+
+(define-function gst_factory_list_filter
+  (c-name "gst_factory_list_filter")
+  (return-type "GValueArray*")
+  (parameters
+    '("GValueArray*" "array")
+    '("const-GstCaps*" "caps")
+  )
+)
+
+
+
+;; From gstplaybasebin.h
+
+(define-function gst_play_base_bin_get_type
+  (c-name "gst_play_base_bin_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstplay-enum.h
+
+(define-function gst_autoplug_select_result_get_type
+  (c-name "gst_autoplug_select_result_get_type")
+  (return-type "GType")
+)
+
+(define-function gst_play_flags_get_type
+  (c-name "gst_play_flags_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstplay-marshal.h
+
+
+
+;; From gstplaysink.h
+
+(define-function gst_play_sink_get_type
+  (c-name "gst_play_sink_get_type")
+  (return-type "GType")
+)
+
+(define-method request_pad
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_request_pad")
+  (return-type "GstPad*")
+  (parameters
+    '("GstPlaySinkType" "type")
+  )
+)
+
+(define-method release_pad
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_release_pad")
+  (return-type "none")
+  (parameters
+    '("GstPad*" "pad")
+  )
+)
+
+(define-method set_video_sink
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_set_video_sink")
+  (return-type "none")
+  (parameters
+    '("GstElement*" "sink")
+  )
+)
+
+(define-method get_video_sink
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_get_video_sink")
+  (return-type "GstElement*")
+)
+
+(define-method set_audio_sink
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_set_audio_sink")
+  (return-type "none")
+  (parameters
+    '("GstElement*" "sink")
+  )
+)
+
+(define-method get_audio_sink
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_get_audio_sink")
+  (return-type "GstElement*")
+)
+
+(define-method set_vis_plugin
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_set_vis_plugin")
+  (return-type "none")
+  (parameters
+    '("GstElement*" "vis")
+  )
+)
+
+(define-method get_vis_plugin
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_get_vis_plugin")
+  (return-type "GstElement*")
+)
+
+(define-method set_volume
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_set_volume")
+  (return-type "none")
+  (parameters
+    '("gdouble" "volume")
+  )
+)
+
+(define-method get_volume
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_get_volume")
+  (return-type "gdouble")
+)
+
+(define-method set_mute
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_set_mute")
+  (return-type "none")
+  (parameters
+    '("gboolean" "mute")
+  )
+)
+
+(define-method get_mute
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_get_mute")
+  (return-type "gboolean")
+)
+
+(define-method set_flags
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_set_flags")
+  (return-type "gboolean")
+  (parameters
+    '("GstPlayFlags" "flags")
+  )
+)
+
+(define-method get_flags
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_get_flags")
+  (return-type "GstPlayFlags")
+)
+
+(define-method set_font_desc
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_set_font_desc")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "desc")
+  )
+)
+
+(define-method get_font_desc
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_get_font_desc")
+  (return-type "gchar*")
+)
+
+(define-method get_last_frame
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_get_last_frame")
+  (return-type "GstBuffer*")
+)
+
+(define-method reconfigure
+  (of-object "GstPlaySink")
+  (c-name "gst_play_sink_reconfigure")
+  (return-type "gboolean")
+)
+
+
+
+;; From gstscreenshot.h
+
+(define-function gst_play_frame_conv_convert
+  (c-name "gst_play_frame_conv_convert")
+  (return-type "GstBuffer*")
+  (parameters
+    '("GstBuffer*" "buf")
+    '("GstCaps*" "to")
+  )
+)
+
+
+
+;; From gststreaminfo.h
+
+(define-function gst_stream_info_get_type
+  (c-name "gst_stream_info_get_type")
+  (return-type "GType")
+)
+
+(define-function gst_stream_info_new
+  (c-name "gst_stream_info_new")
+  (is-constructor-of "GstStreamInfo")
+  (return-type "GstStreamInfo*")
+  (parameters
+    '("GstObject*" "object")
+    '("GstStreamType" "type")
+    '("const-gchar*" "decoder")
+    '("const-GstCaps*" "caps")
+  )
+)
+
+(define-method set_mute
+  (of-object "GstStreamInfo")
+  (c-name "gst_stream_info_set_mute")
+  (return-type "gboolean")
+  (parameters
+    '("gboolean" "mute")
+  )
+)
+
+(define-method is_mute
+  (of-object "GstStreamInfo")
+  (c-name "gst_stream_info_is_mute")
+  (return-type "gboolean")
+)
+
+
+
+;; From gststreamselector.h
+
+(define-function gst_stream_selector_get_type
+  (c-name "gst_stream_selector_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From arch.h
+
+
+
+;; From fixed_arm4.h
+
+
+
+;; From fixed_arm5e.h
+
+
+
+;; From fixed_bfin.h
+
+
+
+;; From fixed_debug.h
+
+
+
+;; From fixed_generic.h
+
+
+
+;; From gstspeexresample.h
+
+(define-function gst_speex_resample_get_type
+  (c-name "gst_speex_resample_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From resample_sse.h
+
+
+
+;; From speex_resampler.h
+
+(define-function speex_resampler_init
+  (c-name "speex_resampler_init")
+  (return-type "SpeexResamplerState*")
+  (parameters
+    '("spx_uint32_t" "nb_channels")
+    '("spx_uint32_t" "in_rate")
+    '("spx_uint32_t" "out_rate")
+    '("int" "quality")
+    '("int*" "err")
+  )
+)
+
+(define-function speex_resampler_init_frac
+  (c-name "speex_resampler_init_frac")
+  (return-type "SpeexResamplerState*")
+  (parameters
+    '("spx_uint32_t" "nb_channels")
+    '("spx_uint32_t" "ratio_num")
+    '("spx_uint32_t" "ratio_den")
+    '("spx_uint32_t" "in_rate")
+    '("spx_uint32_t" "out_rate")
+    '("int" "quality")
+    '("int*" "err")
+  )
+)
+
+(define-function speex_resampler_destroy
+  (c-name "speex_resampler_destroy")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function speex_resampler_process_float
+  (c-name "speex_resampler_process_float")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t" "channel_index")
+    '("const-double*" "in")
+    '("spx_uint32_t*" "in_len")
+    '("double*" "out")
+    '("spx_uint32_t*" "out_len")
+  )
+)
+
+(define-function speex_resampler_process_float
+  (c-name "speex_resampler_process_float")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t" "channel_index")
+    '("const-float*" "in")
+    '("spx_uint32_t*" "in_len")
+    '("float*" "out")
+    '("spx_uint32_t*" "out_len")
+  )
+)
+
+(define-function speex_resampler_process_int
+  (c-name "speex_resampler_process_int")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t" "channel_index")
+    '("const-spx_int16_t*" "in")
+    '("spx_uint32_t*" "in_len")
+    '("spx_int16_t*" "out")
+    '("spx_uint32_t*" "out_len")
+  )
+)
+
+(define-function speex_resampler_process_interleaved_float
+  (c-name "speex_resampler_process_interleaved_float")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("const-double*" "in")
+    '("spx_uint32_t*" "in_len")
+    '("double*" "out")
+    '("spx_uint32_t*" "out_len")
+  )
+)
+
+(define-function speex_resampler_process_interleaved_float
+  (c-name "speex_resampler_process_interleaved_float")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("const-float*" "in")
+    '("spx_uint32_t*" "in_len")
+    '("float*" "out")
+    '("spx_uint32_t*" "out_len")
+  )
+)
+
+(define-function speex_resampler_process_interleaved_int
+  (c-name "speex_resampler_process_interleaved_int")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("const-spx_int16_t*" "in")
+    '("spx_uint32_t*" "in_len")
+    '("spx_int16_t*" "out")
+    '("spx_uint32_t*" "out_len")
+  )
+)
+
+(define-function speex_resampler_set_rate
+  (c-name "speex_resampler_set_rate")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t" "in_rate")
+    '("spx_uint32_t" "out_rate")
+  )
+)
+
+(define-function speex_resampler_get_rate
+  (c-name "speex_resampler_get_rate")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t*" "in_rate")
+    '("spx_uint32_t*" "out_rate")
+  )
+)
+
+(define-function speex_resampler_set_rate_frac
+  (c-name "speex_resampler_set_rate_frac")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t" "ratio_num")
+    '("spx_uint32_t" "ratio_den")
+    '("spx_uint32_t" "in_rate")
+    '("spx_uint32_t" "out_rate")
+  )
+)
+
+(define-function speex_resampler_get_ratio
+  (c-name "speex_resampler_get_ratio")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t*" "ratio_num")
+    '("spx_uint32_t*" "ratio_den")
+  )
+)
+
+(define-function speex_resampler_set_quality
+  (c-name "speex_resampler_set_quality")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("int" "quality")
+  )
+)
+
+(define-function speex_resampler_get_quality
+  (c-name "speex_resampler_get_quality")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("int*" "quality")
+  )
+)
+
+(define-function speex_resampler_set_input_stride
+  (c-name "speex_resampler_set_input_stride")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t" "stride")
+  )
+)
+
+(define-function speex_resampler_get_input_stride
+  (c-name "speex_resampler_get_input_stride")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t*" "stride")
+  )
+)
+
+(define-function speex_resampler_set_output_stride
+  (c-name "speex_resampler_set_output_stride")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t" "stride")
+  )
+)
+
+(define-function speex_resampler_get_output_stride
+  (c-name "speex_resampler_get_output_stride")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("spx_uint32_t*" "stride")
+  )
+)
+
+(define-function speex_resampler_get_input_latency
+  (c-name "speex_resampler_get_input_latency")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function speex_resampler_get_output_latency
+  (c-name "speex_resampler_get_output_latency")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function speex_resampler_skip_zeros
+  (c-name "speex_resampler_skip_zeros")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function speex_resampler_reset_mem
+  (c-name "speex_resampler_reset_mem")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function speex_resampler_strerror
+  (c-name "speex_resampler_strerror")
+  (return-type "const-char*")
+  (parameters
+    '("int" "err")
+  )
+)
+
+
+
+;; From speex_resampler_wrapper.h
+
+(define-function resample_float_resampler_init
+  (c-name "resample_float_resampler_init")
+  (return-type "SpeexResamplerState*")
+  (parameters
+    '("guint32" "nb_channels")
+    '("guint32" "in_rate")
+    '("guint32" "out_rate")
+    '("gint" "quality")
+    '("gint*" "err")
+  )
+)
+
+(define-function resample_float_resampler_destroy
+  (c-name "resample_float_resampler_destroy")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_float_resampler_process_interleaved_float
+  (c-name "resample_float_resampler_process_interleaved_float")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("const-guint8*" "in")
+    '("guint32*" "in_len")
+    '("guint8*" "out")
+    '("guint32*" "out_len")
+  )
+)
+
+(define-function resample_float_resampler_set_rate
+  (c-name "resample_float_resampler_set_rate")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("guint32" "in_rate")
+    '("guint32" "out_rate")
+  )
+)
+
+(define-function resample_float_resampler_get_rate
+  (c-name "resample_float_resampler_get_rate")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("guint32*" "in_rate")
+    '("guint32*" "out_rate")
+  )
+)
+
+(define-function resample_float_resampler_get_ratio
+  (c-name "resample_float_resampler_get_ratio")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("guint32*" "ratio_num")
+    '("guint32*" "ratio_den")
+  )
+)
+
+(define-function resample_float_resampler_get_input_latency
+  (c-name "resample_float_resampler_get_input_latency")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_float_resampler_set_quality
+  (c-name "resample_float_resampler_set_quality")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("gint" "quality")
+  )
+)
+
+(define-function resample_float_resampler_reset_mem
+  (c-name "resample_float_resampler_reset_mem")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_float_resampler_skip_zeros
+  (c-name "resample_float_resampler_skip_zeros")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_float_resampler_strerror
+  (c-name "resample_float_resampler_strerror")
+  (return-type "const-char*")
+  (parameters
+    '("gint" "err")
+  )
+)
+
+(define-function resample_double_resampler_init
+  (c-name "resample_double_resampler_init")
+  (return-type "SpeexResamplerState*")
+  (parameters
+    '("guint32" "nb_channels")
+    '("guint32" "in_rate")
+    '("guint32" "out_rate")
+    '("gint" "quality")
+    '("gint*" "err")
+  )
+)
+
+(define-function resample_double_resampler_destroy
+  (c-name "resample_double_resampler_destroy")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_double_resampler_process_interleaved_float
+  (c-name "resample_double_resampler_process_interleaved_float")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("const-guint8*" "in")
+    '("guint32*" "in_len")
+    '("guint8*" "out")
+    '("guint32*" "out_len")
+  )
+)
+
+(define-function resample_double_resampler_set_rate
+  (c-name "resample_double_resampler_set_rate")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("guint32" "in_rate")
+    '("guint32" "out_rate")
+  )
+)
+
+(define-function resample_double_resampler_get_rate
+  (c-name "resample_double_resampler_get_rate")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("guint32*" "in_rate")
+    '("guint32*" "out_rate")
+  )
+)
+
+(define-function resample_double_resampler_get_ratio
+  (c-name "resample_double_resampler_get_ratio")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("guint32*" "ratio_num")
+    '("guint32*" "ratio_den")
+  )
+)
+
+(define-function resample_double_resampler_get_input_latency
+  (c-name "resample_double_resampler_get_input_latency")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_double_resampler_set_quality
+  (c-name "resample_double_resampler_set_quality")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("gint" "quality")
+  )
+)
+
+(define-function resample_double_resampler_reset_mem
+  (c-name "resample_double_resampler_reset_mem")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_double_resampler_skip_zeros
+  (c-name "resample_double_resampler_skip_zeros")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_double_resampler_strerror
+  (c-name "resample_double_resampler_strerror")
+  (return-type "const-char*")
+  (parameters
+    '("gint" "err")
+  )
+)
+
+(define-function resample_int_resampler_init
+  (c-name "resample_int_resampler_init")
+  (return-type "SpeexResamplerState*")
+  (parameters
+    '("guint32" "nb_channels")
+    '("guint32" "in_rate")
+    '("guint32" "out_rate")
+    '("gint" "quality")
+    '("gint*" "err")
+  )
+)
+
+(define-function resample_int_resampler_destroy
+  (c-name "resample_int_resampler_destroy")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_int_resampler_process_interleaved_int
+  (c-name "resample_int_resampler_process_interleaved_int")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("const-guint8*" "in")
+    '("guint32*" "in_len")
+    '("guint8*" "out")
+    '("guint32*" "out_len")
+  )
+)
+
+(define-function resample_int_resampler_set_rate
+  (c-name "resample_int_resampler_set_rate")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("guint32" "in_rate")
+    '("guint32" "out_rate")
+  )
+)
+
+(define-function resample_int_resampler_get_rate
+  (c-name "resample_int_resampler_get_rate")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("guint32*" "in_rate")
+    '("guint32*" "out_rate")
+  )
+)
+
+(define-function resample_int_resampler_get_ratio
+  (c-name "resample_int_resampler_get_ratio")
+  (return-type "none")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("guint32*" "ratio_num")
+    '("guint32*" "ratio_den")
+  )
+)
+
+(define-function resample_int_resampler_get_input_latency
+  (c-name "resample_int_resampler_get_input_latency")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_int_resampler_set_quality
+  (c-name "resample_int_resampler_set_quality")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+    '("gint" "quality")
+  )
+)
+
+(define-function resample_int_resampler_reset_mem
+  (c-name "resample_int_resampler_reset_mem")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_int_resampler_skip_zeros
+  (c-name "resample_int_resampler_skip_zeros")
+  (return-type "int")
+  (parameters
+    '("SpeexResamplerState*" "st")
+  )
+)
+
+(define-function resample_int_resampler_strerror
+  (c-name "resample_int_resampler_strerror")
+  (return-type "const-char*")
+  (parameters
+    '("gint" "err")
+  )
+)
+
+
+
+;; From gstssaparse.h
+
+(define-function gst_ssa_parse_get_type
+  (c-name "gst_ssa_parse_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstsubparse.h
+
+(define-function gst_sub_parse_get_type
+  (c-name "gst_sub_parse_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From mpl2parse.h
+
+(define-function parse_mpl2
+  (c-name "parse_mpl2")
+  (return-type "gchar*")
+  (parameters
+    '("ParserState*" "state")
+    '("const-gchar*" "line")
+  )
+)
+
+
+
+;; From samiparse.h
+
+(define-function parse_sami
+  (c-name "parse_sami")
+  (return-type "gchar*")
+  (parameters
+    '("ParserState*" "state")
+    '("const-gchar*" "line")
+  )
+)
+
+(define-function sami_context_init
+  (c-name "sami_context_init")
+  (return-type "none")
+  (parameters
+    '("ParserState*" "state")
+  )
+)
+
+(define-function sami_context_deinit
+  (c-name "sami_context_deinit")
+  (return-type "none")
+  (parameters
+    '("ParserState*" "state")
+  )
+)
+
+(define-function sami_context_reset
+  (c-name "sami_context_reset")
+  (return-type "none")
+  (parameters
+    '("ParserState*" "state")
+  )
+)
+
+
+
+;; From tmplayerparse.h
+
+(define-function parse_tmplayer
+  (c-name "parse_tmplayer")
+  (return-type "gchar*")
+  (parameters
+    '("ParserState*" "state")
+    '("const-gchar*" "line")
+  )
+)
+
+
+
+;; From gstmultifdsink.h
+
+(define-function gst_multi_fd_sink_get_type
+  (c-name "gst_multi_fd_sink_get_type")
+  (return-type "GType")
+)
+
+(define-method add
+  (of-object "GstMultiFdSink")
+  (c-name "gst_multi_fd_sink_add")
+  (return-type "none")
+  (parameters
+    '("int" "fd")
+  )
+)
+
+(define-method add_full
+  (of-object "GstMultiFdSink")
+  (c-name "gst_multi_fd_sink_add_full")
+  (return-type "none")
+  (parameters
+    '("int" "fd")
+    '("GstSyncMethod" "sync")
+    '("GstTCPUnitType" "min_unit")
+    '("guint64" "min_value")
+    '("GstTCPUnitType" "max_unit")
+    '("guint64" "max_value")
+  )
+)
+
+(define-method remove
+  (of-object "GstMultiFdSink")
+  (c-name "gst_multi_fd_sink_remove")
+  (return-type "none")
+  (parameters
+    '("int" "fd")
+  )
+)
+
+(define-method remove_flush
+  (of-object "GstMultiFdSink")
+  (c-name "gst_multi_fd_sink_remove_flush")
+  (return-type "none")
+  (parameters
+    '("int" "fd")
+  )
+)
+
+(define-method clear
+  (of-object "GstMultiFdSink")
+  (c-name "gst_multi_fd_sink_clear")
+  (return-type "none")
+)
+
+(define-method get_stats
+  (of-object "GstMultiFdSink")
+  (c-name "gst_multi_fd_sink_get_stats")
+  (return-type "GValueArray*")
+  (parameters
+    '("int" "fd")
+  )
+)
+
+
+
+;; From gsttcpclientsink.h
+
+(define-function gst_tcp_client_sink_get_type
+  (c-name "gst_tcp_client_sink_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gsttcpclientsrc.h
+
+(define-function gst_tcp_client_src_get_type
+  (c-name "gst_tcp_client_src_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gsttcp-enumtypes.h
+
+(define-function gst_tcp_protocol_get_type
+  (c-name "gst_tcp_protocol_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gsttcp.h
+
+(define-function gst_tcp_host_to_ip
+  (c-name "gst_tcp_host_to_ip")
+  (return-type "gchar*")
+  (parameters
+    '("GstElement*" "element")
+    '("const-gchar*" "host")
+  )
+)
+
+(define-function gst_tcp_socket_write
+  (c-name "gst_tcp_socket_write")
+  (return-type "gint")
+  (parameters
+    '("int" "socket")
+    '("const-void*" "buf")
+    '("size_t" "count")
+  )
+)
+
+(define-function gst_tcp_socket_close
+  (c-name "gst_tcp_socket_close")
+  (return-type "none")
+  (parameters
+    '("GstPollFD*" "socket")
+  )
+)
+
+(define-function gst_tcp_read_buffer
+  (c-name "gst_tcp_read_buffer")
+  (return-type "GstFlowReturn")
+  (parameters
+    '("GstElement*" "this")
+    '("int" "socket")
+    '("GstPoll*" "fdset")
+    '("GstBuffer**" "buf")
+  )
+)
+
+(define-function gst_tcp_gdp_read_buffer
+  (c-name "gst_tcp_gdp_read_buffer")
+  (return-type "GstFlowReturn")
+  (parameters
+    '("GstElement*" "this")
+    '("int" "socket")
+    '("GstPoll*" "fdset")
+    '("GstBuffer**" "buf")
+  )
+)
+
+(define-function gst_tcp_gdp_read_caps
+  (c-name "gst_tcp_gdp_read_caps")
+  (return-type "GstFlowReturn")
+  (parameters
+    '("GstElement*" "this")
+    '("int" "socket")
+    '("GstPoll*" "fdset")
+    '("GstCaps**" "caps")
+  )
+)
+
+(define-function gst_tcp_gdp_read_event
+  (c-name "gst_tcp_gdp_read_event")
+  (return-type "GstEvent*")
+  (parameters
+    '("GstElement*" "elem")
+    '("int" "socket")
+    '("GstPoll*" "fdset")
+  )
+)
+
+(define-function gst_tcp_gdp_write_buffer
+  (c-name "gst_tcp_gdp_write_buffer")
+  (return-type "gboolean")
+  (parameters
+    '("GstElement*" "elem")
+    '("int" "socket")
+    '("GstBuffer*" "buffer")
+    '("gboolean" "fatal")
+    '("const-gchar*" "host")
+    '("int" "port")
+  )
+)
+
+(define-function gst_tcp_gdp_write_event
+  (c-name "gst_tcp_gdp_write_event")
+  (return-type "gboolean")
+  (parameters
+    '("GstElement*" "elem")
+    '("int" "socket")
+    '("GstEvent*" "event")
+    '("gboolean" "fatal")
+    '("const-gchar*" "host")
+    '("int" "port")
+  )
+)
+
+(define-function gst_tcp_gdp_write_caps
+  (c-name "gst_tcp_gdp_write_caps")
+  (return-type "gboolean")
+  (parameters
+    '("GstElement*" "elem")
+    '("int" "socket")
+    '("const-GstCaps*" "caps")
+    '("gboolean" "fatal")
+    '("const-gchar*" "host")
+    '("int" "port")
+  )
+)
+
+
+
+;; From gsttcp-marshal.h
+
+
+
+;; From gsttcpplugin.h
+
+
+
+;; From gsttcpserversink.h
+
+(define-function gst_tcp_server_sink_get_type
+  (c-name "gst_tcp_server_sink_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gsttcpserversrc.h
+
+(define-function gst_tcp_server_src_get_type
+  (c-name "gst_tcp_server_src_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstvideorate.h
+
+
+
+;; From gstvideoscale.h
+
+(define-function gst_video_scale_get_type
+  (c-name "gst_video_scale_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From vs_4tap.h
+
+(define-function vs_4tap_init
+  (c-name "vs_4tap_init")
+  (return-type "none")
+)
+
+(define-function vs_scanline_resample_4tap_Y
+  (c-name "vs_scanline_resample_4tap_Y")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int" "src_width")
+    '("int*" "xacc")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_merge_4tap_Y
+  (c-name "vs_scanline_merge_4tap_Y")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src1")
+    '("uint8_t*" "src2")
+    '("uint8_t*" "src3")
+    '("uint8_t*" "src4")
+    '("int" "n")
+    '("int" "acc")
+  )
+)
+
+(define-method scale_4tap_Y
+  (of-object "VSImage")
+  (c-name "vs_image_scale_4tap_Y")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+
+
+;; From vs_image.h
+
+(define-method scale_nearest_RGBA
+  (of-object "VSImage")
+  (c-name "vs_image_scale_nearest_RGBA")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_linear_RGBA
+  (of-object "VSImage")
+  (c-name "vs_image_scale_linear_RGBA")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_nearest_RGB
+  (of-object "VSImage")
+  (c-name "vs_image_scale_nearest_RGB")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_linear_RGB
+  (of-object "VSImage")
+  (c-name "vs_image_scale_linear_RGB")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_nearest_YUYV
+  (of-object "VSImage")
+  (c-name "vs_image_scale_nearest_YUYV")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_linear_YUYV
+  (of-object "VSImage")
+  (c-name "vs_image_scale_linear_YUYV")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_nearest_UYVY
+  (of-object "VSImage")
+  (c-name "vs_image_scale_nearest_UYVY")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_linear_UYVY
+  (of-object "VSImage")
+  (c-name "vs_image_scale_linear_UYVY")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_nearest_Y
+  (of-object "VSImage")
+  (c-name "vs_image_scale_nearest_Y")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_linear_Y
+  (of-object "VSImage")
+  (c-name "vs_image_scale_linear_Y")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_nearest_RGB565
+  (of-object "VSImage")
+  (c-name "vs_image_scale_nearest_RGB565")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_linear_RGB565
+  (of-object "VSImage")
+  (c-name "vs_image_scale_linear_RGB565")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_nearest_RGB555
+  (of-object "VSImage")
+  (c-name "vs_image_scale_nearest_RGB555")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+(define-method scale_linear_RGB555
+  (of-object "VSImage")
+  (c-name "vs_image_scale_linear_RGB555")
+  (return-type "none")
+  (parameters
+    '("const-VSImage*" "src")
+    '("uint8_t*" "tmpbuf")
+  )
+)
+
+
+
+;; From vs_scanline.h
+
+(define-function vs_scanline_downsample_Y
+  (c-name "vs_scanline_downsample_Y")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+  )
+)
+
+(define-function vs_scanline_resample_nearest_Y
+  (c-name "vs_scanline_resample_nearest_Y")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_resample_linear_Y
+  (c-name "vs_scanline_resample_linear_Y")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_merge_linear_Y
+  (c-name "vs_scanline_merge_linear_Y")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src1")
+    '("uint8_t*" "src2")
+    '("int" "n")
+    '("int" "x")
+  )
+)
+
+(define-function vs_scanline_downsample_RGBA
+  (c-name "vs_scanline_downsample_RGBA")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+  )
+)
+
+(define-function vs_scanline_resample_nearest_RGBA
+  (c-name "vs_scanline_resample_nearest_RGBA")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_resample_linear_RGBA
+  (c-name "vs_scanline_resample_linear_RGBA")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_merge_linear_RGBA
+  (c-name "vs_scanline_merge_linear_RGBA")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src1")
+    '("uint8_t*" "src2")
+    '("int" "n")
+    '("int" "x")
+  )
+)
+
+(define-function vs_scanline_downsample_RGB
+  (c-name "vs_scanline_downsample_RGB")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+  )
+)
+
+(define-function vs_scanline_resample_nearest_RGB
+  (c-name "vs_scanline_resample_nearest_RGB")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_resample_linear_RGB
+  (c-name "vs_scanline_resample_linear_RGB")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_merge_linear_RGB
+  (c-name "vs_scanline_merge_linear_RGB")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src1")
+    '("uint8_t*" "src2")
+    '("int" "n")
+    '("int" "x")
+  )
+)
+
+(define-function vs_scanline_downsample_YUYV
+  (c-name "vs_scanline_downsample_YUYV")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+  )
+)
+
+(define-function vs_scanline_resample_nearest_YUYV
+  (c-name "vs_scanline_resample_nearest_YUYV")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_resample_linear_YUYV
+  (c-name "vs_scanline_resample_linear_YUYV")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_merge_linear_YUYV
+  (c-name "vs_scanline_merge_linear_YUYV")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src1")
+    '("uint8_t*" "src2")
+    '("int" "n")
+    '("int" "x")
+  )
+)
+
+(define-function vs_scanline_downsample_UYVY
+  (c-name "vs_scanline_downsample_UYVY")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+  )
+)
+
+(define-function vs_scanline_resample_nearest_UYVY
+  (c-name "vs_scanline_resample_nearest_UYVY")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_resample_linear_UYVY
+  (c-name "vs_scanline_resample_linear_UYVY")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_merge_linear_UYVY
+  (c-name "vs_scanline_merge_linear_UYVY")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src1")
+    '("uint8_t*" "src2")
+    '("int" "n")
+    '("int" "x")
+  )
+)
+
+(define-function vs_scanline_downsample_RGB565
+  (c-name "vs_scanline_downsample_RGB565")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+  )
+)
+
+(define-function vs_scanline_resample_nearest_RGB565
+  (c-name "vs_scanline_resample_nearest_RGB565")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_resample_linear_RGB565
+  (c-name "vs_scanline_resample_linear_RGB565")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_merge_linear_RGB565
+  (c-name "vs_scanline_merge_linear_RGB565")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src1")
+    '("uint8_t*" "src2")
+    '("int" "n")
+    '("int" "x")
+  )
+)
+
+(define-function vs_scanline_downsample_RGB555
+  (c-name "vs_scanline_downsample_RGB555")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+  )
+)
+
+(define-function vs_scanline_resample_nearest_RGB555
+  (c-name "vs_scanline_resample_nearest_RGB555")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_resample_linear_RGB555
+  (c-name "vs_scanline_resample_linear_RGB555")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src")
+    '("int" "n")
+    '("int*" "accumulator")
+    '("int" "increment")
+  )
+)
+
+(define-function vs_scanline_merge_linear_RGB555
+  (c-name "vs_scanline_merge_linear_RGB555")
+  (return-type "none")
+  (parameters
+    '("uint8_t*" "dest")
+    '("uint8_t*" "src1")
+    '("uint8_t*" "src2")
+    '("int" "n")
+    '("int" "x")
+  )
+)
+
+
+
+;; From gstvideotestsrc.h
+
+(define-function gst_video_test_src_get_type
+  (c-name "gst_video_test_src_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From videotestsrc.h
+
+(define-function paint_get_structure
+  (c-name "paint_get_structure")
+  (return-type "GstStructure*")
+  (parameters
+    '("struct-fourcc_list_struct*" "format")
+  )
+)
+
+(define-method get_size
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_get_size")
+  (return-type "int")
+  (parameters
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method smpte
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_smpte")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method smpte75
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_smpte75")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method snow
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_snow")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method black
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_black")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method white
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_white")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method red
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_red")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method green
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_green")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method blue
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_blue")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method checkers1
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_checkers1")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method checkers2
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_checkers2")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method checkers4
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_checkers4")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method checkers8
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_checkers8")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method circular
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_circular")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+(define-method zoneplate
+  (of-object "GstVideoTestSrc")
+  (c-name "gst_video_test_src_zoneplate")
+  (return-type "none")
+  (parameters
+    '("unsigned-char*" "dest")
+    '("int" "w")
+    '("int" "h")
+  )
+)
+
+
+
+;; From gstvolume.h
+
+(define-function gst_volume_get_type
+  (c-name "gst_volume_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstalsadeviceprobe.h
+
+(define-function gst_alsa_type_add_device_property_probe_interface
+  (c-name "gst_alsa_type_add_device_property_probe_interface")
+  (return-type "none")
+  (parameters
+    '("GType" "type")
+  )
+)
+
+
+
+;; From gstalsa.h
+
+(define-function gst_alsa_open_iec958_pcm
+  (c-name "gst_alsa_open_iec958_pcm")
+  (return-type "snd_pcm_t*")
+  (parameters
+    '("GstObject*" "obj")
+  )
+)
+
+(define-function gst_alsa_probe_supported_formats
+  (c-name "gst_alsa_probe_supported_formats")
+  (return-type "GstCaps*")
+  (parameters
+    '("GstObject*" "obj")
+    '("snd_pcm_t*" "handle")
+    '("const-GstCaps*" "template_caps")
+  )
+)
+
+(define-function gst_alsa_find_device_name
+  (c-name "gst_alsa_find_device_name")
+  (return-type "gchar*")
+  (parameters
+    '("GstObject*" "obj")
+    '("const-gchar*" "device")
+    '("snd_pcm_t*" "handle")
+    '("snd_pcm_stream_t" "stream")
+  )
+)
+
+
+
+;; From gstalsamixerelement.h
+
+(define-function gst_alsa_mixer_element_get_type
+  (c-name "gst_alsa_mixer_element_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstalsamixer.h
+
+(define-function gst_alsa_mixer_new
+  (c-name "gst_alsa_mixer_new")
+  (is-constructor-of "GstAlsaMixer")
+  (return-type "GstAlsaMixer*")
+  (parameters
+    '("const-gchar*" "device")
+    '("GstAlsaMixerDirection" "dir")
+  )
+)
+
+(define-method free
+  (of-object "GstAlsaMixer")
+  (c-name "gst_alsa_mixer_free")
+  (return-type "none")
+)
+
+(define-method list_tracks
+  (of-object "GstAlsaMixer")
+  (c-name "gst_alsa_mixer_list_tracks")
+  (return-type "const-GList*")
+)
+
+(define-method set_volume
+  (of-object "GstAlsaMixer")
+  (c-name "gst_alsa_mixer_set_volume")
+  (return-type "none")
+  (parameters
+    '("GstMixerTrack*" "track")
+    '("gint*" "volumes")
+  )
+)
+
+(define-method get_volume
+  (of-object "GstAlsaMixer")
+  (c-name "gst_alsa_mixer_get_volume")
+  (return-type "none")
+  (parameters
+    '("GstMixerTrack*" "track")
+    '("gint*" "volumes")
+  )
+)
+
+(define-method set_record
+  (of-object "GstAlsaMixer")
+  (c-name "gst_alsa_mixer_set_record")
+  (return-type "none")
+  (parameters
+    '("GstMixerTrack*" "track")
+    '("gboolean" "record")
+  )
+)
+
+(define-method set_mute
+  (of-object "GstAlsaMixer")
+  (c-name "gst_alsa_mixer_set_mute")
+  (return-type "none")
+  (parameters
+    '("GstMixerTrack*" "track")
+    '("gboolean" "mute")
+  )
+)
+
+(define-method set_option
+  (of-object "GstAlsaMixer")
+  (c-name "gst_alsa_mixer_set_option")
+  (return-type "none")
+  (parameters
+    '("GstMixerOptions*" "opts")
+    '("gchar*" "value")
+  )
+)
+
+(define-method get_option
+  (of-object "GstAlsaMixer")
+  (c-name "gst_alsa_mixer_get_option")
+  (return-type "const-gchar*")
+  (parameters
+    '("GstMixerOptions*" "opts")
+  )
+)
+
+(define-method get_mixer_flags
+  (of-object "GstAlsaMixer")
+  (c-name "gst_alsa_mixer_get_mixer_flags")
+  (return-type "GstMixerFlags")
+)
+
+
+
+;; From gstalsamixeroptions.h
+
+(define-function gst_alsa_mixer_options_get_type
+  (c-name "gst_alsa_mixer_options_get_type")
+  (return-type "GType")
+)
+
+(define-function gst_alsa_mixer_options_new
+  (c-name "gst_alsa_mixer_options_new")
+  (is-constructor-of "GstAlsaMixerOptions")
+  (return-type "GstMixerOptions*")
+  (parameters
+    '("snd_mixer_elem_t*" "element")
+    '("gint" "track_num")
+  )
+)
+
+
+
+;; From gstalsamixertrack.h
+
+(define-function gst_alsa_mixer_track_get_type
+  (c-name "gst_alsa_mixer_track_get_type")
+  (return-type "GType")
+)
+
+(define-function gst_alsa_mixer_track_new
+  (c-name "gst_alsa_mixer_track_new")
+  (is-constructor-of "GstAlsaMixerTrack")
+  (return-type "GstMixerTrack*")
+  (parameters
+    '("snd_mixer_elem_t*" "element")
+    '("gint" "num")
+    '("gint" "track_num")
+    '("gint" "flags")
+    '("gboolean" "sw")
+    '("GstAlsaMixerTrack*" "shared_mute_track")
+    '("gboolean" "label_append_capture")
+  )
+)
+
+(define-method update
+  (of-object "GstAlsaMixerTrack")
+  (c-name "gst_alsa_mixer_track_update")
+  (return-type "none")
+)
+
+
+
+;; From gstalsasink.h
+
+(define-function gst_alsasink_get_type
+  (c-name "gst_alsasink_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstalsasrc.h
+
+(define-function gst_alsasrc_get_type
+  (c-name "gst_alsasrc_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstcdparanoiasrc.h
+
+(define-function gst_cd_paranoia_src_get_type
+  (c-name "gst_cd_paranoia_src_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstgiobasesink.h
+
+(define-function gst_gio_base_sink_get_type
+  (c-name "gst_gio_base_sink_get_type")
+  (return-type "GType")
+)
+
+(define-method set_stream
+  (of-object "GstGioBaseSink")
+  (c-name "gst_gio_base_sink_set_stream")
+  (return-type "none")
+  (parameters
+    '("GOutputStream*" "stream")
+  )
+)
+
+
+
+;; From gstgiobasesrc.h
+
+(define-function gst_gio_base_src_get_type
+  (c-name "gst_gio_base_src_get_type")
+  (return-type "GType")
+)
+
+(define-method set_stream
+  (of-object "GstGioBaseSrc")
+  (c-name "gst_gio_base_src_set_stream")
+  (return-type "none")
+  (parameters
+    '("GInputStream*" "stream")
+  )
+)
+
+
+
+;; From gstgio.h
+
+(define-function gst_gio_error
+  (c-name "gst_gio_error")
+  (return-type "gboolean")
+  (parameters
+    '("gpointer" "element")
+    '("const-gchar*" "func_name")
+    '("GError**" "err")
+    '("GstFlowReturn*" "ret")
+  )
+)
+
+(define-function gst_gio_seek
+  (c-name "gst_gio_seek")
+  (return-type "GstFlowReturn")
+  (parameters
+    '("gpointer" "element")
+    '("GSeekable*" "stream")
+    '("guint64" "offset")
+    '("GCancellable*" "cancel")
+  )
+)
+
+(define-function gst_gio_uri_handler_do_init
+  (c-name "gst_gio_uri_handler_do_init")
+  (return-type "none")
+  (parameters
+    '("GType" "type")
+  )
+)
+
+
+
+;; From gstgiosink.h
+
+(define-function gst_gio_sink_get_type
+  (c-name "gst_gio_sink_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstgiosrc.h
+
+(define-function gst_gio_src_get_type
+  (c-name "gst_gio_src_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstgiostreamsink.h
+
+(define-function gst_gio_stream_sink_get_type
+  (c-name "gst_gio_stream_sink_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstgiostreamsrc.h
+
+(define-function gst_gio_stream_src_get_type
+  (c-name "gst_gio_stream_src_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstgnomevfs.h
+
+(define-function gst_gnome_vfs_uri_get_type
+  (c-name "gst_gnome_vfs_uri_get_type")
+  (return-type "GType")
+)
+
+(define-function gst_gnome_vfs_handle_get_type
+  (c-name "gst_gnome_vfs_handle_get_type")
+  (return-type "GType")
+)
+
+(define-function gst_gnome_vfs_location_to_uri_string
+  (c-name "gst_gnome_vfs_location_to_uri_string")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "location")
+  )
+)
+
+
+
+;; From gstgnomevfssink.h
+
+(define-function gst_gnome_vfs_sink_get_type
+  (c-name "gst_gnome_vfs_sink_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstgnomevfssrc.h
+
+(define-function gst_gnome_vfs_src_get_type
+  (c-name "gst_gnome_vfs_src_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstgnomevfsuri.h
+
+(define-function gst_gnomevfs_get_supported_uris
+  (c-name "gst_gnomevfs_get_supported_uris")
+  (return-type "gchar**")
+)
+
+
+
+;; From gstoggdemux.h
+
+
+
+;; From gstoggmux.h
+
+(define-function gst_ogg_mux_get_type
+  (c-name "gst_ogg_mux_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gstclockoverlay.h
+
+(define-function gst_clock_overlay_get_type
+  (c-name "gst_clock_overlay_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gsttextoverlay.h
+
+(define-function gst_text_overlay_get_type
+  (c-name "gst_text_overlay_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gsttextrender.h
+
+(define-function gst_text_render_get_type
+  (c-name "gst_text_render_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gsttimeoverlay.h
+
+(define-function gst_time_overlay_get_type
+  (c-name "gst_time_overlay_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gsttheoradec.h
+
+
+
+;; From gsttheoraenc.h
+
+
+
+;; From gsttheoraparse.h
+
+(define-function gst_theora_parse_get_type
+  (c-name "gst_theora_parse_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From vorbisdec.h
+
+(define-function gst_vorbis_dec_get_type
+  (c-name "gst_vorbis_dec_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From vorbisenc.h
+
+(define-function gst_vorbis_enc_get_type
+  (c-name "gst_vorbis_enc_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From vorbisparse.h
+
+(define-function gst_vorbis_parse_get_type
+  (c-name "gst_vorbis_parse_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From vorbistag.h
+
+(define-function gst_vorbis_tag_get_type
+  (c-name "gst_vorbis_tag_get_type")
+  (return-type "GType")
+)
+
+

Modified: gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs	(original)
+++ gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs	Fri Dec 12 03:49:44 2008
@@ -1,32 +1,54 @@
-;; From GstColorBalance
+;; From GstAudioClock
 
-(define-signal value-changed
-  (of-object "GstColorBalance")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GstColorBalanceChannel*" "p0")
-    '("gint" "p1")
-  )
+(define-property name
+  (of-object "GstAudioClock")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-;; From GstColorBalanceChannel
+(define-property stats
+  (of-object "GstAudioClock")
+  (prop-type "GParamBoolean")
+  (docs "Enable clock stats (unimplemented)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
-(define-signal value-changed
-  (of-object "GstColorBalanceChannel")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-  )
+(define-property window-size
+  (of-object "GstAudioClock")
+  (prop-type "GParamInt")
+  (docs "The size of the window used to calculate rate and offset")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-;; From GstXOverlay
+(define-property window-threshold
+  (of-object "GstAudioClock")
+  (prop-type "GParamInt")
+  (docs "The threshold to start calculating rate and offset")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
-;; From GstAudioConvert
+(define-property timeout
+  (of-object "GstAudioClock")
+  (prop-type "GParamUInt64")
+  (docs "The amount of time, in nanoseconds, to sample master and slave clocks")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstAudioFilter
 
 (define-property name
-  (of-object "GstAudioConvert")
+  (of-object "GstAudioFilter")
   (prop-type "GParamString")
   (docs "The name of the object")
   (readable #t)
@@ -35,7 +57,7 @@
 )
 
 (define-property qos
-  (of-object "GstAudioConvert")
+  (of-object "GstAudioFilter")
   (prop-type "GParamBoolean")
   (docs "Handle Quality-of-Service events")
   (readable #t)
@@ -43,57 +65,129 @@
   (construct-only #f)
 )
 
-(define-property dithering
-  (of-object "GstAudioConvert")
-  (prop-type "GParamEnum")
-  (docs "Selects between different dithering methods.")
+;; From GstBaseAudioSink
+
+(define-property name
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamString")
+  (docs "The name of the object")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property noise-shaping
-  (of-object "GstAudioConvert")
-  (prop-type "GParamEnum")
-  (docs "Selects between different noise shaping methods.")
+(define-property preroll-queue-len
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamUInt")
+  (docs "Number of buffers to queue during preroll")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GstDecodeBin
+(define-property sync
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamBoolean")
+  (docs "Sync on the clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
-(define-signal new-decoded-pad
-  (of-object "GstDecodeBin")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GstPad*" "p0")
-    '("gboolean" "p1")
-  )
+(define-property max-lateness
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamInt64")
+  (docs "Maximum number of nanoseconds that a buffer can be late before it is dropped (-1 unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal removed-decoded-pad
-  (of-object "GstDecodeBin")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GstPad*" "p0")
-  )
+(define-property qos
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamBoolean")
+  (docs "Generate Quality-of-Service events upstream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal unknown-type
-  (of-object "GstDecodeBin")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GstPad*" "p0")
-    '("GstCaps*" "p1")
-  )
+(define-property async
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamBoolean")
+  (docs "Go asynchronously to PAUSED")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ts-offset
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamInt64")
+  (docs "Timestamp offset in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property last-buffer
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamSpecMiniObject")
+  (docs "The last buffer received in the sink")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamUInt")
+  (docs "Size in bytes to pull per buffer (0 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-time
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamInt64")
+  (docs "Size of audio buffer in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property latency-time
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamInt64")
+  (docs "Audio latency in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property provide-clock
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamBoolean")
+  (docs "Provide a clock to be used as the global pipeline clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
+(define-property slave-method
+  (of-object "GstBaseAudioSink")
+  (prop-type "GParamEnum")
+  (docs "Algorithm to use to match the rate of the masterclock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstBaseAudioSrc
+
 (define-property name
-  (of-object "GstDecodeBin")
+  (of-object "GstBaseAudioSrc")
   (prop-type "GParamString")
   (docs "The name of the object")
   (readable #t)
@@ -101,28 +195,100 @@
   (construct-only #f)
 )
 
-(define-property async-handling
-  (of-object "GstDecodeBin")
+(define-property blocksize
+  (of-object "GstBaseAudioSrc")
+  (prop-type "GParamULong")
+  (docs "Size in bytes to read per buffer (-1 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property num-buffers
+  (of-object "GstBaseAudioSrc")
+  (prop-type "GParamInt")
+  (docs "Number of buffers to output before sending EOS (-1 = unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property typefind
+  (of-object "GstBaseAudioSrc")
   (prop-type "GParamBoolean")
-  (docs "The bin will handle Asynchronous state changes")
+  (docs "Run typefind before negotiating")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sink-caps
-  (of-object "GstDecodeBin")
-  (prop-type "GParamBoxed")
-  (docs "The caps of the input data. (NULL = use typefind element)")
+(define-property do-timestamp
+  (of-object "GstBaseAudioSrc")
+  (prop-type "GParamBoolean")
+  (docs "Apply current stream time to buffers")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GstOggMux
+(define-property buffer-time
+  (of-object "GstBaseAudioSrc")
+  (prop-type "GParamInt64")
+  (docs "Size of audio buffer in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property latency-time
+  (of-object "GstBaseAudioSrc")
+  (prop-type "GParamInt64")
+  (docs "Audio latency in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property actual-buffer-time
+  (of-object "GstBaseAudioSrc")
+  (prop-type "GParamInt64")
+  (docs "Actual configured size of audio buffer in microseconds")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property actual-latency-time
+  (of-object "GstBaseAudioSrc")
+  (prop-type "GParamInt64")
+  (docs "Actual configured audio latency in microseconds")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property provide-clock
+  (of-object "GstBaseAudioSrc")
+  (prop-type "GParamBoolean")
+  (docs "Provide a clock to be used as the global pipeline clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property slave-method
+  (of-object "GstBaseAudioSrc")
+  (prop-type "GParamEnum")
+  (docs "Algorithm to use to match the rate of the masterclock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstAudioSink
 
 (define-property name
-  (of-object "GstOggMux")
+  (of-object "GstAudioSink")
   (prop-type "GParamString")
   (docs "The name of the object")
   (readable #t)
@@ -130,19 +296,3704 @@
   (construct-only #f)
 )
 
-(define-property max-delay
-  (of-object "GstOggMux")
-  (prop-type "GParamUInt64")
-  (docs "Maximum delay in multiplexing streams")
+(define-property preroll-queue-len
+  (of-object "GstAudioSink")
+  (prop-type "GParamUInt")
+  (docs "Number of buffers to queue during preroll")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property max-page-delay
-  (of-object "GstOggMux")
-  (prop-type "GParamUInt64")
-  (docs "Maximum delay for sending out a page")
+(define-property sync
+  (of-object "GstAudioSink")
+  (prop-type "GParamBoolean")
+  (docs "Sync on the clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-lateness
+  (of-object "GstAudioSink")
+  (prop-type "GParamInt64")
+  (docs "Maximum number of nanoseconds that a buffer can be late before it is dropped (-1 unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstAudioSink")
+  (prop-type "GParamBoolean")
+  (docs "Generate Quality-of-Service events upstream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async
+  (of-object "GstAudioSink")
+  (prop-type "GParamBoolean")
+  (docs "Go asynchronously to PAUSED")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ts-offset
+  (of-object "GstAudioSink")
+  (prop-type "GParamInt64")
+  (docs "Timestamp offset in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property last-buffer
+  (of-object "GstAudioSink")
+  (prop-type "GParamSpecMiniObject")
+  (docs "The last buffer received in the sink")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstAudioSink")
+  (prop-type "GParamUInt")
+  (docs "Size in bytes to pull per buffer (0 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-time
+  (of-object "GstAudioSink")
+  (prop-type "GParamInt64")
+  (docs "Size of audio buffer in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property latency-time
+  (of-object "GstAudioSink")
+  (prop-type "GParamInt64")
+  (docs "Audio latency in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property provide-clock
+  (of-object "GstAudioSink")
+  (prop-type "GParamBoolean")
+  (docs "Provide a clock to be used as the global pipeline clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property slave-method
+  (of-object "GstAudioSink")
+  (prop-type "GParamEnum")
+  (docs "Algorithm to use to match the rate of the masterclock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstAudioSrc
+
+(define-property name
+  (of-object "GstAudioSrc")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstAudioSrc")
+  (prop-type "GParamULong")
+  (docs "Size in bytes to read per buffer (-1 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property num-buffers
+  (of-object "GstAudioSrc")
+  (prop-type "GParamInt")
+  (docs "Number of buffers to output before sending EOS (-1 = unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property typefind
+  (of-object "GstAudioSrc")
+  (prop-type "GParamBoolean")
+  (docs "Run typefind before negotiating")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property do-timestamp
+  (of-object "GstAudioSrc")
+  (prop-type "GParamBoolean")
+  (docs "Apply current stream time to buffers")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-time
+  (of-object "GstAudioSrc")
+  (prop-type "GParamInt64")
+  (docs "Size of audio buffer in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property latency-time
+  (of-object "GstAudioSrc")
+  (prop-type "GParamInt64")
+  (docs "Audio latency in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property actual-buffer-time
+  (of-object "GstAudioSrc")
+  (prop-type "GParamInt64")
+  (docs "Actual configured size of audio buffer in microseconds")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property actual-latency-time
+  (of-object "GstAudioSrc")
+  (prop-type "GParamInt64")
+  (docs "Actual configured audio latency in microseconds")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property provide-clock
+  (of-object "GstAudioSrc")
+  (prop-type "GParamBoolean")
+  (docs "Provide a clock to be used as the global pipeline clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property slave-method
+  (of-object "GstAudioSrc")
+  (prop-type "GParamEnum")
+  (docs "Algorithm to use to match the rate of the masterclock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstRingBuffer
+
+(define-property name
+  (of-object "GstRingBuffer")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstColorBalance
+
+(define-signal value-changed
+  (of-object "GstColorBalance")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstColorBalanceChannel*" "p0")
+    '("gint" "p1")
+  )
+)
+
+;; From GstColorBalanceChannel
+
+(define-signal value-changed
+  (of-object "GstColorBalanceChannel")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+;; From GstXOverlay
+
+;; From GstAdder
+
+(define-property name
+  (of-object "GstAdder")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstAlsaMixerElement
+
+(define-property name
+  (of-object "GstAlsaMixerElement")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property device
+  (of-object "GstAlsaMixerElement")
+  (prop-type "GParamString")
+  (docs "ALSA device, as defined in an asound configuration file")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property device-name
+  (of-object "GstAlsaMixerElement")
+  (prop-type "GParamString")
+  (docs "Human-readable name of the sound device")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+;; From GstAlsaSink
+
+(define-property name
+  (of-object "GstAlsaSink")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property preroll-queue-len
+  (of-object "GstAlsaSink")
+  (prop-type "GParamUInt")
+  (docs "Number of buffers to queue during preroll")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sync
+  (of-object "GstAlsaSink")
+  (prop-type "GParamBoolean")
+  (docs "Sync on the clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-lateness
+  (of-object "GstAlsaSink")
+  (prop-type "GParamInt64")
+  (docs "Maximum number of nanoseconds that a buffer can be late before it is dropped (-1 unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstAlsaSink")
+  (prop-type "GParamBoolean")
+  (docs "Generate Quality-of-Service events upstream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async
+  (of-object "GstAlsaSink")
+  (prop-type "GParamBoolean")
+  (docs "Go asynchronously to PAUSED")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ts-offset
+  (of-object "GstAlsaSink")
+  (prop-type "GParamInt64")
+  (docs "Timestamp offset in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property last-buffer
+  (of-object "GstAlsaSink")
+  (prop-type "GParamSpecMiniObject")
+  (docs "The last buffer received in the sink")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstAlsaSink")
+  (prop-type "GParamUInt")
+  (docs "Size in bytes to pull per buffer (0 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-time
+  (of-object "GstAlsaSink")
+  (prop-type "GParamInt64")
+  (docs "Size of audio buffer in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property latency-time
+  (of-object "GstAlsaSink")
+  (prop-type "GParamInt64")
+  (docs "Audio latency in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property provide-clock
+  (of-object "GstAlsaSink")
+  (prop-type "GParamBoolean")
+  (docs "Provide a clock to be used as the global pipeline clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property slave-method
+  (of-object "GstAlsaSink")
+  (prop-type "GParamEnum")
+  (docs "Algorithm to use to match the rate of the masterclock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property device
+  (of-object "GstAlsaSink")
+  (prop-type "GParamString")
+  (docs "ALSA device, as defined in an asound configuration file")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property device-name
+  (of-object "GstAlsaSink")
+  (prop-type "GParamString")
+  (docs "Human-readable name of the sound device")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+;; From GstAlsaSrc
+
+(define-property name
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamULong")
+  (docs "Size in bytes to read per buffer (-1 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property num-buffers
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamInt")
+  (docs "Number of buffers to output before sending EOS (-1 = unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property typefind
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamBoolean")
+  (docs "Run typefind before negotiating")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property do-timestamp
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamBoolean")
+  (docs "Apply current stream time to buffers")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-time
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamInt64")
+  (docs "Size of audio buffer in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property latency-time
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamInt64")
+  (docs "Audio latency in microseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property actual-buffer-time
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamInt64")
+  (docs "Actual configured size of audio buffer in microseconds")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property actual-latency-time
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamInt64")
+  (docs "Actual configured audio latency in microseconds")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property provide-clock
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamBoolean")
+  (docs "Provide a clock to be used as the global pipeline clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property slave-method
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamEnum")
+  (docs "Algorithm to use to match the rate of the masterclock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property device
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamString")
+  (docs "ALSA device, as defined in an asound configuration file")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property device-name
+  (of-object "GstAlsaSrc")
+  (prop-type "GParamString")
+  (docs "Human-readable name of the sound device")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+;; From GstAudioConvert
+
+(define-property name
+  (of-object "GstAudioConvert")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstAudioConvert")
+  (prop-type "GParamBoolean")
+  (docs "Handle Quality-of-Service events")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property dithering
+  (of-object "GstAudioConvert")
+  (prop-type "GParamEnum")
+  (docs "Selects between different dithering methods.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property noise-shaping
+  (of-object "GstAudioConvert")
+  (prop-type "GParamEnum")
+  (docs "Selects between different noise shaping methods.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstSpeexResample
+
+(define-property name
+  (of-object "GstSpeexResample")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstSpeexResample")
+  (prop-type "GParamBoolean")
+  (docs "Handle Quality-of-Service events")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property quality
+  (of-object "GstSpeexResample")
+  (prop-type "GParamInt")
+  (docs "Resample quality with 0 being the lowest and 10 being the best")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property filter-length
+  (of-object "GstSpeexResample")
+  (prop-type "GParamInt")
+  (docs "DEPRECATED, DON'T USE THIS! Length of the resample filter")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstAudioTestSrc
+
+(define-property name
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamULong")
+  (docs "Size in bytes to read per buffer (-1 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property num-buffers
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamInt")
+  (docs "Number of buffers to output before sending EOS (-1 = unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property typefind
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamBoolean")
+  (docs "Run typefind before negotiating")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property do-timestamp
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamBoolean")
+  (docs "Apply current stream time to buffers")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property samplesperbuffer
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamInt")
+  (docs "Number of samples in each outgoing buffer")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property wave
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamEnum")
+  (docs "Oscillator waveform")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property freq
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamDouble")
+  (docs "Frequency of test signal")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property volume
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamDouble")
+  (docs "Volume of test signal")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property is-live
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamBoolean")
+  (docs "Whether to act as a live source")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property timestamp-offset
+  (of-object "GstAudioTestSrc")
+  (prop-type "GParamInt64")
+  (docs "An offset added to timestamps set on buffers (in ns)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstClockOverlay
+
+(define-property name
+  (of-object "GstClockOverlay")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property text
+  (of-object "GstClockOverlay")
+  (prop-type "GParamString")
+  (docs "Text to be display.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property shaded-background
+  (of-object "GstClockOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to shade the background under the text area")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GstClockOverlay")
+  (prop-type "GParamString")
+  (docs "Vertical alignment of the text (deprecated; use valignment)")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GstClockOverlay")
+  (prop-type "GParamString")
+  (docs "Horizontal alignment of the text (deprecated; use halignment)")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halignment
+  (of-object "GstClockOverlay")
+  (prop-type "GParamEnum")
+  (docs "Horizontal alignment of the text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valignment
+  (of-object "GstClockOverlay")
+  (prop-type "GParamEnum")
+  (docs "Vertical alignment of the text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property xpad
+  (of-object "GstClockOverlay")
+  (prop-type "GParamInt")
+  (docs "Horizontal paddding when using left/right alignment")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ypad
+  (of-object "GstClockOverlay")
+  (prop-type "GParamInt")
+  (docs "Vertical padding when using top/bottom alignment")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property deltax
+  (of-object "GstClockOverlay")
+  (prop-type "GParamInt")
+  (docs "Shift X position to the left or to the right. Unit is pixels.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property deltay
+  (of-object "GstClockOverlay")
+  (prop-type "GParamInt")
+  (docs "Shift Y position up or down. Unit is pixels.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property wrap-mode
+  (of-object "GstClockOverlay")
+  (prop-type "GParamEnum")
+  (docs "Whether to wrap the text and if so how.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property font-desc
+  (of-object "GstClockOverlay")
+  (prop-type "GParamString")
+  (docs "Pango font description of font to be used for rendering. See documentation of pango_font_description_from_string for syntax.")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property silent
+  (of-object "GstClockOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to render the text string")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property line-alignment
+  (of-object "GstClockOverlay")
+  (prop-type "GParamEnum")
+  (docs "Alignment of text lines relative to each other.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property wait-text
+  (of-object "GstClockOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to wait for subtitles")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property time-format
+  (of-object "GstClockOverlay")
+  (prop-type "GParamString")
+  (docs "Format to use for time and date value, as in strftime.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstDecodeBin
+
+(define-signal new-decoded-pad
+  (of-object "GstDecodeBin")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("gboolean" "p1")
+  )
+)
+
+(define-signal removed-decoded-pad
+  (of-object "GstDecodeBin")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+  )
+)
+
+(define-signal unknown-type
+  (of-object "GstDecodeBin")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+  )
+)
+
+(define-property name
+  (of-object "GstDecodeBin")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async-handling
+  (of-object "GstDecodeBin")
+  (prop-type "GParamBoolean")
+  (docs "The bin will handle Asynchronous state changes")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sink-caps
+  (of-object "GstDecodeBin")
+  (prop-type "GParamBoxed")
+  (docs "The caps of the input data. (NULL = use typefind element)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstDecodeBin2
+
+(define-signal new-decoded-pad
+  (of-object "GstDecodeBin2")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("gboolean" "p1")
+  )
+)
+
+(define-signal removed-decoded-pad
+  (of-object "GstDecodeBin2")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+  )
+)
+
+(define-signal unknown-type
+  (of-object "GstDecodeBin2")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+  )
+)
+
+(define-signal autoplug-continue
+  (of-object "GstDecodeBin2")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+  )
+)
+
+(define-signal autoplug-factories
+  (of-object "GstDecodeBin2")
+  (return-type "GValueArray*")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+  )
+)
+
+(define-signal autoplug-sort
+  (of-object "GstDecodeBin2")
+  (return-type "GValueArray*")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+    '("GValueArray*" "p2")
+  )
+)
+
+(define-signal autoplug-select
+  (of-object "GstDecodeBin2")
+  (return-type "GstAutoplugSelectResult")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+    '("GstElementFactory*" "p2")
+  )
+)
+
+(define-signal drained
+  (of-object "GstDecodeBin2")
+  (return-type "void")
+  (when "last")
+)
+
+(define-property name
+  (of-object "GstDecodeBin2")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async-handling
+  (of-object "GstDecodeBin2")
+  (prop-type "GParamBoolean")
+  (docs "The bin will handle Asynchronous state changes")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property caps
+  (of-object "GstDecodeBin2")
+  (prop-type "GParamBoxed")
+  (docs "The caps on which to stop decoding.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property subtitle-encoding
+  (of-object "GstDecodeBin2")
+  (prop-type "GParamString")
+  (docs "Encoding to assume if input subtitles are not in UTF-8 encoding. If not set, the GST_SUBTITLE_ENCODING environment variable will be checked for an encoding to use. If that is not set either, ISO-8859-15 will be assumed.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sink-caps
+  (of-object "GstDecodeBin2")
+  (prop-type "GParamBoxed")
+  (docs "The caps of the input data. (NULL = use typefind element)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstFFMpegCsp
+
+(define-property name
+  (of-object "GstFFMpegCsp")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstFFMpegCsp")
+  (prop-type "GParamBoolean")
+  (docs "Handle Quality-of-Service events")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstGDPDepay
+
+(define-property name
+  (of-object "GstGDPDepay")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstGDPPay
+
+(define-property name
+  (of-object "GstGDPPay")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property crc-header
+  (of-object "GstGDPPay")
+  (prop-type "GParamBoolean")
+  (docs "Calculate and store a CRC checksum on the header")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property crc-payload
+  (of-object "GstGDPPay")
+  (prop-type "GParamBoolean")
+  (docs "Calculate and store a CRC checksum on the payload")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property version
+  (of-object "GstGDPPay")
+  (prop-type "GParamEnum")
+  (docs "Version of the GStreamer Data Protocol")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstGnomeVFSSink
+
+(define-signal allow-overwrite
+  (of-object "GstGnomeVFSSink")
+  (return-type "gboolean")
+  (when "unknown")
+  (parameters
+    '("GnomeVFSURI*" "p0")
+  )
+)
+
+(define-property name
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property preroll-queue-len
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamUInt")
+  (docs "Number of buffers to queue during preroll")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sync
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamBoolean")
+  (docs "Sync on the clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-lateness
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamInt64")
+  (docs "Maximum number of nanoseconds that a buffer can be late before it is dropped (-1 unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamBoolean")
+  (docs "Generate Quality-of-Service events upstream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamBoolean")
+  (docs "Go asynchronously to PAUSED")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ts-offset
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamInt64")
+  (docs "Timestamp offset in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property last-buffer
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamSpecMiniObject")
+  (docs "The last buffer received in the sink")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamUInt")
+  (docs "Size in bytes to pull per buffer (0 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property location
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamString")
+  (docs "Location of the file to write")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property uri
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamBoxed")
+  (docs "URI for GnomeVFS")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property handle
+  (of-object "GstGnomeVFSSink")
+  (prop-type "GParamBoxed")
+  (docs "Handle for GnomeVFS")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstGnomeVFSSrc
+
+(define-property name
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamULong")
+  (docs "Size in bytes to read per buffer (-1 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property num-buffers
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamInt")
+  (docs "Number of buffers to output before sending EOS (-1 = unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property typefind
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamBoolean")
+  (docs "Run typefind before negotiating")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property do-timestamp
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamBoolean")
+  (docs "Apply current stream time to buffers")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property handle
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamBoxed")
+  (docs "Handle for GnomeVFS")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property location
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamString")
+  (docs "Location of the file to read")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property iradio-mode
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamBoolean")
+  (docs "Enable internet radio mode (extraction of shoutcast/icecast metadata)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property iradio-name
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamString")
+  (docs "Name of the stream")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property iradio-genre
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamString")
+  (docs "Genre of the stream")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property iradio-url
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamString")
+  (docs "Homepage URL for radio stream")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property iradio-title
+  (of-object "GstGnomeVFSSrc")
+  (prop-type "GParamString")
+  (docs "Name of currently playing song")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+;; From GstMultiFdSink
+
+(define-signal add
+  (of-object "GstMultiFdSink")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal add-full
+  (of-object "GstMultiFdSink")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+    '("gboolean" "p1")
+    '("GstTCPUnitType" "p2")
+    '("guint64" "p3")
+    '("GstTCPUnitType" "p4")
+    '("guint64" "p5")
+  )
+)
+
+(define-signal remove
+  (of-object "GstMultiFdSink")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal remove-flush
+  (of-object "GstMultiFdSink")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal clear
+  (of-object "GstMultiFdSink")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal get-stats
+  (of-object "GstMultiFdSink")
+  (return-type "GValueArray*")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal client-added
+  (of-object "GstMultiFdSink")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal client-removed
+  (of-object "GstMultiFdSink")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+    '("GstClientStatus" "p1")
+  )
+)
+
+(define-signal client-fd-removed
+  (of-object "GstMultiFdSink")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-property name
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property preroll-queue-len
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamUInt")
+  (docs "Number of buffers to queue during preroll")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sync
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamBoolean")
+  (docs "Sync on the clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-lateness
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt64")
+  (docs "Maximum number of nanoseconds that a buffer can be late before it is dropped (-1 unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamBoolean")
+  (docs "Generate Quality-of-Service events upstream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamBoolean")
+  (docs "Go asynchronously to PAUSED")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ts-offset
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt64")
+  (docs "Timestamp offset in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property last-buffer
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamSpecMiniObject")
+  (docs "The last buffer received in the sink")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamUInt")
+  (docs "Size in bytes to pull per buffer (0 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property protocol
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamEnum")
+  (docs "The protocol to wrap data in")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property mode
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamEnum")
+  (docs "The mode for selecting activity on the fds (deprecated)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffers-queued
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamUInt")
+  (docs "Number of buffers currently queued")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property unit-type
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamEnum")
+  (docs "The unit to measure the max/soft-max/queued properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property units-max
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt64")
+  (docs "max number of units to queue (-1 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property units-soft-max
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt64")
+  (docs "Recover client when going over this limit (-1 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffers-max
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt")
+  (docs "max number of buffers to queue for a client (-1 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffers-soft-max
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt")
+  (docs "Recover client when going over this limit (-1 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property time-min
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt64")
+  (docs "min number of time to queue (-1 = as little as possible)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property bytes-min
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt")
+  (docs "min number of bytes to queue (-1 = as little as possible)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffers-min
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt")
+  (docs "min number of buffers to queue (-1 = as few as possible)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property recover-policy
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamEnum")
+  (docs "How to recover when client reaches the soft max")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property timeout
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamUInt64")
+  (docs "Maximum inactivity timeout in nanoseconds for a client (0 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sync-method
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamEnum")
+  (docs "How to sync new clients to the stream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property bytes-to-serve
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamUInt64")
+  (docs "Number of bytes received to serve to clients")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property bytes-served
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamUInt64")
+  (docs "Total number of bytes send to all clients")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property burst-unit
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamEnum")
+  (docs "The format of the burst units (when sync-method is burst[[-with]-keyframe])")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property burst-value
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamUInt64")
+  (docs "The amount of burst expressed in burst-unit")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos-dscp
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamInt")
+  (docs "Quality of Service, differentiated services code point (-1 default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstOggDemux
+
+(define-property name
+  (of-object "GstOggDemux")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstOggMux
+
+(define-property name
+  (of-object "GstOggMux")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-delay
+  (of-object "GstOggMux")
+  (prop-type "GParamUInt64")
+  (docs "Maximum delay in multiplexing streams")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-page-delay
+  (of-object "GstOggMux")
+  (prop-type "GParamUInt64")
+  (docs "Maximum delay for sending out a page")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstPlayBin
+
+(define-property name
+  (of-object "GstPlayBin")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async-handling
+  (of-object "GstPlayBin")
+  (prop-type "GParamBoolean")
+  (docs "The bin will handle Asynchronous state changes")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property delay
+  (of-object "GstPlayBin")
+  (prop-type "GParamUInt64")
+  (docs "Expected delay needed for elements to spin up to PLAYING in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property auto-flush-bus
+  (of-object "GstPlayBin")
+  (prop-type "GParamBoolean")
+  (docs "Whether to automatically flush the pipeline's bus when going from READY into NULL state")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property uri
+  (of-object "GstPlayBin")
+  (prop-type "GParamString")
+  (docs "URI of the media to play")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property suburi
+  (of-object "GstPlayBin")
+  (prop-type "GParamString")
+  (docs "Optional URI of a subtitle")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property queue-size
+  (of-object "GstPlayBin")
+  (prop-type "GParamUInt64")
+  (docs "Size of internal queues in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property queue-threshold
+  (of-object "GstPlayBin")
+  (prop-type "GParamUInt64")
+  (docs "Buffering threshold of internal queues in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property queue-min-threshold
+  (of-object "GstPlayBin")
+  (prop-type "GParamUInt64")
+  (docs "Buffering low threshold of internal queues in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property nstreams
+  (of-object "GstPlayBin")
+  (prop-type "GParamInt")
+  (docs "number of streams")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property stream-info
+  (of-object "GstPlayBin")
+  (prop-type "GParamPointer")
+  (docs "List of streaminfo")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property stream-info-value-array
+  (of-object "GstPlayBin")
+  (prop-type "GParamValueArray")
+  (docs "value array of streaminfo")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property source
+  (of-object "GstPlayBin")
+  (prop-type "GParamObject")
+  (docs "Source element")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property current-video
+  (of-object "GstPlayBin")
+  (prop-type "GParamInt")
+  (docs "Currently playing video stream (-1 = none)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property current-audio
+  (of-object "GstPlayBin")
+  (prop-type "GParamInt")
+  (docs "Currently playing audio stream (-1 = none)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property current-text
+  (of-object "GstPlayBin")
+  (prop-type "GParamInt")
+  (docs "Currently playing text stream (-1 = none)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property subtitle-encoding
+  (of-object "GstPlayBin")
+  (prop-type "GParamString")
+  (docs "Encoding to assume if input subtitles are not in UTF-8 encoding. If not set, the GST_SUBTITLE_ENCODING environment variable will be checked for an encoding to use. If that is not set either, ISO-8859-15 will be assumed.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property connection-speed
+  (of-object "GstPlayBin")
+  (prop-type "GParamUInt")
+  (docs "Network connection speed in kbps (0 = unknown)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property audio-sink
+  (of-object "GstPlayBin")
+  (prop-type "GParamObject")
+  (docs "the audio output element to use (NULL = default sink)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property video-sink
+  (of-object "GstPlayBin")
+  (prop-type "GParamObject")
+  (docs "the video output element to use (NULL = default sink)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property vis-plugin
+  (of-object "GstPlayBin")
+  (prop-type "GParamObject")
+  (docs "the visualization element to use (NULL = none)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property volume
+  (of-object "GstPlayBin")
+  (prop-type "GParamDouble")
+  (docs "volume")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property frame
+  (of-object "GstPlayBin")
+  (prop-type "GParamSpecMiniObject")
+  (docs "The last frame (NULL = no video available)")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property subtitle-font-desc
+  (of-object "GstPlayBin")
+  (prop-type "GParamString")
+  (docs "Pango font description of font to be used for subtitle rendering")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstPlayBin2
+
+(define-signal about-to-finish
+  (of-object "GstPlayBin2")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal video-changed
+  (of-object "GstPlayBin2")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal audio-changed
+  (of-object "GstPlayBin2")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal text-changed
+  (of-object "GstPlayBin2")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal get-video-tags
+  (of-object "GstPlayBin2")
+  (return-type "GstTagList*")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal get-audio-tags
+  (of-object "GstPlayBin2")
+  (return-type "GstTagList*")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal get-text-tags
+  (of-object "GstPlayBin2")
+  (return-type "GstTagList*")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal convert-frame
+  (of-object "GstPlayBin2")
+  (return-type "GstBuffer*")
+  (when "last")
+  (parameters
+    '("GstCaps*" "p0")
+  )
+)
+
+(define-signal get-video-pad
+  (of-object "GstPlayBin2")
+  (return-type "GstPad*")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal get-audio-pad
+  (of-object "GstPlayBin2")
+  (return-type "GstPad*")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-signal get-text-pad
+  (of-object "GstPlayBin2")
+  (return-type "GstPad*")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+(define-property name
+  (of-object "GstPlayBin2")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async-handling
+  (of-object "GstPlayBin2")
+  (prop-type "GParamBoolean")
+  (docs "The bin will handle Asynchronous state changes")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property delay
+  (of-object "GstPlayBin2")
+  (prop-type "GParamUInt64")
+  (docs "Expected delay needed for elements to spin up to PLAYING in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property auto-flush-bus
+  (of-object "GstPlayBin2")
+  (prop-type "GParamBoolean")
+  (docs "Whether to automatically flush the pipeline's bus when going from READY into NULL state")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property uri
+  (of-object "GstPlayBin2")
+  (prop-type "GParamString")
+  (docs "URI of the media to play")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property suburi
+  (of-object "GstPlayBin2")
+  (prop-type "GParamString")
+  (docs "Optional URI of a subtitle")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property source
+  (of-object "GstPlayBin2")
+  (prop-type "GParamObject")
+  (docs "Source element")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property flags
+  (of-object "GstPlayBin2")
+  (prop-type "GParamFlags")
+  (docs "Flags to control behaviour")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property n-video
+  (of-object "GstPlayBin2")
+  (prop-type "GParamInt")
+  (docs "Total number of video streams")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property current-video
+  (of-object "GstPlayBin2")
+  (prop-type "GParamInt")
+  (docs "Currently playing video stream (-1 = auto)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property n-audio
+  (of-object "GstPlayBin2")
+  (prop-type "GParamInt")
+  (docs "Total number of audio streams")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property current-audio
+  (of-object "GstPlayBin2")
+  (prop-type "GParamInt")
+  (docs "Currently playing audio stream (-1 = auto)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property n-text
+  (of-object "GstPlayBin2")
+  (prop-type "GParamInt")
+  (docs "Total number of text streams")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property current-text
+  (of-object "GstPlayBin2")
+  (prop-type "GParamInt")
+  (docs "Currently playing text stream (-1 = auto)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property subtitle-encoding
+  (of-object "GstPlayBin2")
+  (prop-type "GParamString")
+  (docs "Encoding to assume if input subtitles are not in UTF-8 encoding. If not set, the GST_SUBTITLE_ENCODING environment variable will be checked for an encoding to use. If that is not set either, ISO-8859-15 will be assumed.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property audio-sink
+  (of-object "GstPlayBin2")
+  (prop-type "GParamObject")
+  (docs "the audio output element to use (NULL = default sink)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property video-sink
+  (of-object "GstPlayBin2")
+  (prop-type "GParamObject")
+  (docs "the video output element to use (NULL = default sink)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property vis-plugin
+  (of-object "GstPlayBin2")
+  (prop-type "GParamObject")
+  (docs "the visualization element to use (NULL = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property volume
+  (of-object "GstPlayBin2")
+  (prop-type "GParamDouble")
+  (docs "The audio volume")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property mute
+  (of-object "GstPlayBin2")
+  (prop-type "GParamBoolean")
+  (docs "Mute the audio channel without changing the volume")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property frame
+  (of-object "GstPlayBin2")
+  (prop-type "GParamSpecMiniObject")
+  (docs "The last frame (NULL = no video available)")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property subtitle-font-desc
+  (of-object "GstPlayBin2")
+  (prop-type "GParamString")
+  (docs "Pango font description of font to be used for subtitle rendering")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property connection-speed
+  (of-object "GstPlayBin2")
+  (prop-type "GParamUInt")
+  (docs "Network connection speed in kbps (0 = unknown)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-size
+  (of-object "GstPlayBin2")
+  (prop-type "GParamInt")
+  (docs "Buffer size when buffering network streams")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-duration
+  (of-object "GstPlayBin2")
+  (prop-type "GParamInt64")
+  (docs "Buffer duration when buffering network streams")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstTCPServerSink
+
+(define-property name
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property preroll-queue-len
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamUInt")
+  (docs "Number of buffers to queue during preroll")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sync
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamBoolean")
+  (docs "Sync on the clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-lateness
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt64")
+  (docs "Maximum number of nanoseconds that a buffer can be late before it is dropped (-1 unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamBoolean")
+  (docs "Generate Quality-of-Service events upstream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamBoolean")
+  (docs "Go asynchronously to PAUSED")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ts-offset
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt64")
+  (docs "Timestamp offset in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property last-buffer
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamSpecMiniObject")
+  (docs "The last buffer received in the sink")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamUInt")
+  (docs "Size in bytes to pull per buffer (0 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property protocol
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamEnum")
+  (docs "The protocol to wrap data in")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property mode
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamEnum")
+  (docs "The mode for selecting activity on the fds (deprecated)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffers-queued
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamUInt")
+  (docs "Number of buffers currently queued")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property unit-type
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamEnum")
+  (docs "The unit to measure the max/soft-max/queued properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property units-max
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt64")
+  (docs "max number of units to queue (-1 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property units-soft-max
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt64")
+  (docs "Recover client when going over this limit (-1 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffers-max
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt")
+  (docs "max number of buffers to queue for a client (-1 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffers-soft-max
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt")
+  (docs "Recover client when going over this limit (-1 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property time-min
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt64")
+  (docs "min number of time to queue (-1 = as little as possible)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property bytes-min
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt")
+  (docs "min number of bytes to queue (-1 = as little as possible)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffers-min
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt")
+  (docs "min number of buffers to queue (-1 = as few as possible)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property recover-policy
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamEnum")
+  (docs "How to recover when client reaches the soft max")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property timeout
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamUInt64")
+  (docs "Maximum inactivity timeout in nanoseconds for a client (0 = no limit)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sync-method
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamEnum")
+  (docs "How to sync new clients to the stream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property bytes-to-serve
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamUInt64")
+  (docs "Number of bytes received to serve to clients")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property bytes-served
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamUInt64")
+  (docs "Total number of bytes send to all clients")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property burst-unit
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamEnum")
+  (docs "The format of the burst units (when sync-method is burst[[-with]-keyframe])")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property burst-value
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamUInt64")
+  (docs "The amount of burst expressed in burst-unit")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos-dscp
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt")
+  (docs "Quality of Service, differentiated services code point (-1 default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property host
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamString")
+  (docs "The host/IP to send the packets to")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property port
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamInt")
+  (docs "The port to send the packets to")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstTextOverlay
+
+(define-property name
+  (of-object "GstTextOverlay")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property text
+  (of-object "GstTextOverlay")
+  (prop-type "GParamString")
+  (docs "Text to be display.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property shaded-background
+  (of-object "GstTextOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to shade the background under the text area")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GstTextOverlay")
+  (prop-type "GParamString")
+  (docs "Vertical alignment of the text (deprecated; use valignment)")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GstTextOverlay")
+  (prop-type "GParamString")
+  (docs "Horizontal alignment of the text (deprecated; use halignment)")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halignment
+  (of-object "GstTextOverlay")
+  (prop-type "GParamEnum")
+  (docs "Horizontal alignment of the text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valignment
+  (of-object "GstTextOverlay")
+  (prop-type "GParamEnum")
+  (docs "Vertical alignment of the text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property xpad
+  (of-object "GstTextOverlay")
+  (prop-type "GParamInt")
+  (docs "Horizontal paddding when using left/right alignment")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ypad
+  (of-object "GstTextOverlay")
+  (prop-type "GParamInt")
+  (docs "Vertical padding when using top/bottom alignment")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property deltax
+  (of-object "GstTextOverlay")
+  (prop-type "GParamInt")
+  (docs "Shift X position to the left or to the right. Unit is pixels.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property deltay
+  (of-object "GstTextOverlay")
+  (prop-type "GParamInt")
+  (docs "Shift Y position up or down. Unit is pixels.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property wrap-mode
+  (of-object "GstTextOverlay")
+  (prop-type "GParamEnum")
+  (docs "Whether to wrap the text and if so how.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property font-desc
+  (of-object "GstTextOverlay")
+  (prop-type "GParamString")
+  (docs "Pango font description of font to be used for rendering. See documentation of pango_font_description_from_string for syntax.")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property silent
+  (of-object "GstTextOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to render the text string")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property line-alignment
+  (of-object "GstTextOverlay")
+  (prop-type "GParamEnum")
+  (docs "Alignment of text lines relative to each other.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property wait-text
+  (of-object "GstTextOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to wait for subtitles")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstTextRender
+
+(define-property name
+  (of-object "GstTextRender")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property font-desc
+  (of-object "GstTextRender")
+  (prop-type "GParamString")
+  (docs "Pango font description of font to be used for rendering. See documentation of pango_font_description_from_string for syntax.")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstTheoraDec
+
+(define-property name
+  (of-object "GstTheoraDec")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property crop
+  (of-object "GstTheoraDec")
+  (prop-type "GParamBoolean")
+  (docs "Crop the image to the visible region")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstTheoraEnc
+
+(define-property name
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property center
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamBoolean")
+  (docs "Center image when sizes not multiple of 16")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property border
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamEnum")
+  (docs "Border color to add when sizes not multiple of 16")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property bitrate
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamInt")
+  (docs "Compressed video bitrate (kbps)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property quality
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamInt")
+  (docs "Video quality")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property quick
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamBoolean")
+  (docs "Quick encoding")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property keyframe-auto
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamBoolean")
+  (docs "Automatic keyframe detection")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property keyframe-freq
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamInt")
+  (docs "Keyframe frequency")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property keyframe-force
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamInt")
+  (docs "Force keyframe every N frames")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property keyframe-threshold
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamInt")
+  (docs "Keyframe threshold")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property keyframe-mindistance
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamInt")
+  (docs "Keyframe mindistance")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property noise-sensitivity
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamInt")
+  (docs "Noise sensitivity")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sharpness
+  (of-object "GstTheoraEnc")
+  (prop-type "GParamInt")
+  (docs "Sharpness")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstTheoraParse
+
+(define-property name
+  (of-object "GstTheoraParse")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property synchronization-points
+  (of-object "GstTheoraParse")
+  (prop-type "GParamValueArray")
+  (docs "An array of (granuletime, buffertime) pairs")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstTimeOverlay
+
+(define-property name
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property text
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamString")
+  (docs "Text to be display.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property shaded-background
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to shade the background under the text area")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamString")
+  (docs "Vertical alignment of the text (deprecated; use valignment)")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamString")
+  (docs "Horizontal alignment of the text (deprecated; use halignment)")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halignment
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamEnum")
+  (docs "Horizontal alignment of the text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valignment
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamEnum")
+  (docs "Vertical alignment of the text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property xpad
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamInt")
+  (docs "Horizontal paddding when using left/right alignment")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ypad
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamInt")
+  (docs "Vertical padding when using top/bottom alignment")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property deltax
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamInt")
+  (docs "Shift X position to the left or to the right. Unit is pixels.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property deltay
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamInt")
+  (docs "Shift Y position up or down. Unit is pixels.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property wrap-mode
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamEnum")
+  (docs "Whether to wrap the text and if so how.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property font-desc
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamString")
+  (docs "Pango font description of font to be used for rendering. See documentation of pango_font_description_from_string for syntax.")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property silent
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to render the text string")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property line-alignment
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamEnum")
+  (docs "Alignment of text lines relative to each other.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property wait-text
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to wait for subtitles")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstURIDecodeBin
+
+(define-signal unknown-type
+  (of-object "GstURIDecodeBin")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+  )
+)
+
+(define-signal autoplug-continue
+  (of-object "GstURIDecodeBin")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+  )
+)
+
+(define-signal autoplug-factories
+  (of-object "GstURIDecodeBin")
+  (return-type "GValueArray*")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+  )
+)
+
+(define-signal autoplug-select
+  (of-object "GstURIDecodeBin")
+  (return-type "GstAutoplugSelectResult")
+  (when "last")
+  (parameters
+    '("GstPad*" "p0")
+    '("GstCaps*" "p1")
+    '("GstElementFactory*" "p2")
+  )
+)
+
+(define-signal drained
+  (of-object "GstURIDecodeBin")
+  (return-type "void")
+  (when "last")
+)
+
+(define-property name
+  (of-object "GstURIDecodeBin")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async-handling
+  (of-object "GstURIDecodeBin")
+  (prop-type "GParamBoolean")
+  (docs "The bin will handle Asynchronous state changes")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property uri
+  (of-object "GstURIDecodeBin")
+  (prop-type "GParamString")
+  (docs "URI to decode")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property source
+  (of-object "GstURIDecodeBin")
+  (prop-type "GParamObject")
+  (docs "Source object used")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property connection-speed
+  (of-object "GstURIDecodeBin")
+  (prop-type "GParamUInt")
+  (docs "Network connection speed in kbps (0 = unknown)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property caps
+  (of-object "GstURIDecodeBin")
+  (prop-type "GParamBoxed")
+  (docs "The caps on which to stop decoding. (NULL = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property subtitle-encoding
+  (of-object "GstURIDecodeBin")
+  (prop-type "GParamString")
+  (docs "Encoding to assume if input subtitles are not in UTF-8 encoding. If not set, the GST_SUBTITLE_ENCODING environment variable will be checked for an encoding to use. If that is not set either, ISO-8859-15 will be assumed.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-size
+  (of-object "GstURIDecodeBin")
+  (prop-type "GParamInt")
+  (docs "Buffer size when buffering network streams")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-duration
+  (of-object "GstURIDecodeBin")
+  (prop-type "GParamInt64")
+  (docs "Buffer duration when buffering network streams")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstVideoRate
+
+(define-property name
+  (of-object "GstVideoRate")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property in
+  (of-object "GstVideoRate")
+  (prop-type "GParamUInt64")
+  (docs "Number of input frames")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property out
+  (of-object "GstVideoRate")
+  (prop-type "GParamUInt64")
+  (docs "Number of output frames")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property duplicate
+  (of-object "GstVideoRate")
+  (prop-type "GParamUInt64")
+  (docs "Number of duplicated frames")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property drop
+  (of-object "GstVideoRate")
+  (prop-type "GParamUInt64")
+  (docs "Number of dropped frames")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property silent
+  (of-object "GstVideoRate")
+  (prop-type "GParamBoolean")
+  (docs "Don't emit notify for dropped and duplicated frames")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property new-pref
+  (of-object "GstVideoRate")
+  (prop-type "GParamDouble")
+  (docs "Value indicating how much to prefer new frames (unused)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstVideoScale
+
+(define-property name
+  (of-object "GstVideoScale")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstVideoScale")
+  (prop-type "GParamBoolean")
+  (docs "Handle Quality-of-Service events")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property method
+  (of-object "GstVideoScale")
+  (prop-type "GParamEnum")
+  (docs "method")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstVideoTestSrc
+
+(define-property name
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamULong")
+  (docs "Size in bytes to read per buffer (-1 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property num-buffers
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Number of buffers to output before sending EOS (-1 = unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property typefind
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamBoolean")
+  (docs "Run typefind before negotiating")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property do-timestamp
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamBoolean")
+  (docs "Apply current stream time to buffers")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property pattern
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamEnum")
+  (docs "Type of test pattern to generate")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property timestamp-offset
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt64")
+  (docs "An offset added to timestamps set on buffers (in ns)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property is-live
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamBoolean")
+  (docs "Whether to act as a live source")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property peer-alloc
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamBoolean")
+  (docs "Ask the peer to allocate an output buffer")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property colorspec
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamEnum")
+  (docs "Generate video in the given color specification")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property k0
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate zero order phase, for generating plain fields or phase offsets")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property kx
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate 1st order x phase, for generating constant horizontal frequencies")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ky
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate 1st order y phase, for generating contant vertical frequencies")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property kt
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate 1st order t phase, for generating phase rotation as a function of time")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property kxt
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate x*t product phase, normalised to kxy/256 cycles per vertical pixel at width/2 from origin")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property kyt
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate y*t product phase")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property kxy
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate x*t product phase")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property kx2
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate 2nd order x phase, normalised to kx2/256 cycles per horizontal pixel at width/2 from origin")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ky2
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate 2nd order y phase, normailsed to ky2/256 cycles per vertical pixel at height/2 from origin")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property kt2
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate 2nd order t phase, t*t/256 cycles per picture")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property xoffset
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate 2nd order products x offset")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property yoffset
+  (of-object "GstVideoTestSrc")
+  (prop-type "GParamInt")
+  (docs "Zoneplate 2nd order products y offset")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstVolume
+
+(define-property name
+  (of-object "GstVolume")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstVolume")
+  (prop-type "GParamBoolean")
+  (docs "Handle Quality-of-Service events")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property mute
+  (of-object "GstVolume")
+  (prop-type "GParamBoolean")
+  (docs "mute channel")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property volume
+  (of-object "GstVolume")
+  (prop-type "GParamDouble")
+  (docs "volume factor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstVorbisDec
+
+(define-property name
+  (of-object "GstVorbisDec")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstVorbisEnc
+
+(define-property name
+  (of-object "GstVorbisEnc")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-bitrate
+  (of-object "GstVorbisEnc")
+  (prop-type "GParamInt")
+  (docs "Specify a maximum bitrate (in bps). Useful for streaming applications. (-1 == disabled)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property bitrate
+  (of-object "GstVorbisEnc")
+  (prop-type "GParamInt")
+  (docs "Attempt to encode at a bitrate averaging this (in bps). This uses the bitrate management engine, and is not recommended for most users. Quality is a better alternative. (-1 == disabled)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property min-bitrate
+  (of-object "GstVorbisEnc")
+  (prop-type "GParamInt")
+  (docs "Specify a minimum bitrate (in bps). Useful for encoding for a fixed-size channel. (-1 == disabled)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property quality
+  (of-object "GstVorbisEnc")
+  (prop-type "GParamFloat")
+  (docs "Specify quality instead of specifying a particular bitrate.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property managed
+  (of-object "GstVorbisEnc")
+  (prop-type "GParamBoolean")
+  (docs "Enable bitrate management engine")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property last-message
+  (of-object "GstVorbisEnc")
+  (prop-type "GParamString")
+  (docs "The last status message")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+;; From GstVorbisParse
+
+(define-property name
+  (of-object "GstVorbisParse")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstVorbisTag
+
+(define-property name
+  (of-object "GstVorbisTag")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstXImageSink
+
+(define-property name
+  (of-object "GstXImageSink")
+  (prop-type "GParamString")
+  (docs "The name of the object")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property preroll-queue-len
+  (of-object "GstXImageSink")
+  (prop-type "GParamUInt")
+  (docs "Number of buffers to queue during preroll")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sync
+  (of-object "GstXImageSink")
+  (prop-type "GParamBoolean")
+  (docs "Sync on the clock")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-lateness
+  (of-object "GstXImageSink")
+  (prop-type "GParamInt64")
+  (docs "Maximum number of nanoseconds that a buffer can be late before it is dropped (-1 unlimited)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property qos
+  (of-object "GstXImageSink")
+  (prop-type "GParamBoolean")
+  (docs "Generate Quality-of-Service events upstream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property async
+  (of-object "GstXImageSink")
+  (prop-type "GParamBoolean")
+  (docs "Go asynchronously to PAUSED")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ts-offset
+  (of-object "GstXImageSink")
+  (prop-type "GParamInt64")
+  (docs "Timestamp offset in nanoseconds")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property last-buffer
+  (of-object "GstXImageSink")
+  (prop-type "GParamSpecMiniObject")
+  (docs "The last buffer received in the sink")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property blocksize
+  (of-object "GstXImageSink")
+  (prop-type "GParamUInt")
+  (docs "Size in bytes to pull per buffer (0 = default)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property display
+  (of-object "GstXImageSink")
+  (prop-type "GParamString")
+  (docs "X Display name")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property synchronous
+  (of-object "GstXImageSink")
+  (prop-type "GParamBoolean")
+  (docs "When enabled, runs the X display in synchronous mode. (used only for debugging)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property pixel-aspect-ratio
+  (of-object "GstXImageSink")
+  (prop-type "GParamString")
+  (docs "The pixel aspect ratio of the device")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property force-aspect-ratio
+  (of-object "GstXImageSink")
+  (prop-type "GParamBoolean")
+  (docs "When enabled, reverse caps negotiation (scaling) will respect original aspect ratio")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property handle-events
+  (of-object "GstXImageSink")
+  (prop-type "GParamBoolean")
+  (docs "When enabled, XEvents will be selected and handled")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property handle-expose
+  (of-object "GstXImageSink")
+  (prop-type "GParamBoolean")
+  (docs "When enabled, the current frame will always be drawn in response to X Expose events")
   (readable #t)
   (writable #t)
   (construct-only #f)

Added: gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs.patch
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs.patch	Fri Dec 12 03:49:44 2008
@@ -0,0 +1,11 @@
+--- gstbase_signals.defs.gen	2008-12-10 18:23:54.000000000 -0500
++++ gstbase_signals.defs	2008-12-10 18:24:41.000000000 -0500
+@@ -1782,7 +1782,7 @@
+ 
+ (define-signal convert-frame
+   (of-object "GstPlayBin2")
+-  (return-type "GstBuffer")
++  (return-type "GstBuffer*")
+   (when "last")
+   (parameters
+     '("GstCaps*" "p0")

Modified: gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gstbase.cc
==============================================================================
--- gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gstbase.cc	(original)
+++ gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gstbase.cc	Fri Dec 12 03:49:44 2008
@@ -21,6 +21,13 @@
 #include "get_plugin_defs.h"
 
 #include <gst/gst.h>
+#include <gst/audio/gstaudioclock.h>
+#include <gst/audio/gstaudiofilter.h>
+#include <gst/audio/gstbaseaudiosink.h>
+#include <gst/audio/gstbaseaudiosrc.h>
+#include <gst/audio/gstaudiosink.h>
+#include <gst/audio/gstaudiosrc.h>
+#include <gst/audio/gstringbuffer.h>
 #include <gst/interfaces/colorbalance.h>
 #include <gst/interfaces/colorbalancechannel.h>
 #include <gst/interfaces/xoverlay.h>
@@ -29,15 +36,64 @@
 {
   gst_init (&argc, &argv);
 
-  // gst-plugins-base (GStreamer base) types
-  std::cout << get_defs(GST_TYPE_COLOR_BALANCE)
+  // gst-plugins-base (GStreamer base) types:
+  std::cout << get_defs(GST_TYPE_AUDIO_CLOCK)
+            << get_defs(GST_TYPE_AUDIO_FILTER)
+            << get_defs(GST_TYPE_BASE_AUDIO_SINK)
+            << get_defs(GST_TYPE_BASE_AUDIO_SRC)
+            << get_defs(GST_TYPE_AUDIO_SINK)
+            << get_defs(GST_TYPE_AUDIO_SRC)
+            << get_defs(GST_TYPE_RING_BUFFER)
+
+  // gst-plugins-base (GStreamer base) interfaces:
+            << get_defs(GST_TYPE_COLOR_BALANCE)
             << get_defs(GST_TYPE_COLOR_BALANCE_CHANNEL)
             << get_defs(GST_TYPE_X_OVERLAY)
 
-  // gst-plugins-base (GStreamer base) plugin types
+  // gst-plugins-base (GStreamer base) plugin types:
+            << get_plugin_defs("adder")
+            << get_plugin_defs("alsamixer")
+            << get_plugin_defs("alsasink")
+            << get_plugin_defs("alsasrc")
             << get_plugin_defs("audioconvert")
+            << get_plugin_defs("audioresample")
+            << get_plugin_defs("audiotestsrc")
+            << get_plugin_defs("cdparanoiasrc")
+            << get_plugin_defs("clockoverlay")
             << get_plugin_defs("decodebin")
+            << get_plugin_defs("decodebin2")
+            << get_plugin_defs("ffmpegcolorspace")
+            << get_plugin_defs("gdpdepay")
+            << get_plugin_defs("gdppay")
+            << get_plugin_defs("giosink")
+            << get_plugin_defs("giosrc")
+            << get_plugin_defs("giostreamsink")
+            << get_plugin_defs("giostreamsrc")
+            << get_plugin_defs("gnomevfssink")
+            << get_plugin_defs("gnomevfssrc")
+            << get_plugin_defs("multifdsink")
+            << get_plugin_defs("oggdemux")
             << get_plugin_defs("oggmux")
+            << get_plugin_defs("playbin")
+            << get_plugin_defs("playbin2")
+            << get_plugin_defs("tcpserversink")
+            << get_plugin_defs("textoverlay")
+            << get_plugin_defs("textrender")
+            << get_plugin_defs("theoradec")
+            << get_plugin_defs("theoraenc")
+            << get_plugin_defs("theoraparse")
+            << get_plugin_defs("timeoverlay")
+            << get_plugin_defs("uridecodebin")
+            << get_plugin_defs("videorate")
+            << get_plugin_defs("videoscale")
+            << get_plugin_defs("videotestsrc")
+            << get_plugin_defs("volume")
+            << get_plugin_defs("vorbisdec")
+            << get_plugin_defs("vorbisenc")
+            << get_plugin_defs("vorbisparse")
+            << get_plugin_defs("vorbistag")
+            << get_plugin_defs("ximagesink")
+            << get_plugin_defs("xvimagesink")
             ;
 
   return 0;

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	Fri Dec 12 03:49:44 2008
@@ -167,7 +167,7 @@
 
         bool enumIsWrapped = false;
 
-        if (G_TYPE_IS_ENUM(propertyGType) &&
+        if ((G_TYPE_IS_ENUM(propertyGType) || G_TYPE_IS_FLAGS(propertyGType)) &&
           !(enumIsWrapped = is_wrapped_enum(propertyCType)))
         {
           enumWrapStatements += "_WRAP_ENUM(" + propertyCType.substr(3) + ", " +
@@ -288,10 +288,6 @@
               "'', _LQ()_CCONVERT(" + paramCType + ")_RQ(), ";
             convertMacros += g_type_is_a(paramGType, GST_TYPE_MINI_OBJECT) ?
               "``Gst::wrap($3, true)'')\n" : "``Glib::wrap($3, true)'')\n";
-
-            convertMacros += "#m4 _CONVERSION(_LQ()_CCONVERT(" + paramCType +
-              ")_RQ(), ``" + paramCType + "'', ";
-            convertMacros += "``($3)->gobj()'')\n";
           }
 
           wrapStatement += "_CCONVERT(" + paramCType + ") " + paramName;

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Fri Dec 12 03:49:44 2008
@@ -36,115 +36,116 @@
 _CONVERSION(`Glib::RefPtr<Gst::Object>',`GstObject*',`Glib::unwrap($3)')
 
 #Buffer
-_CONVERSION(`GstBuffer*',`Glib::RefPtr<Buffer>',`wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Buffer>&',`GstBuffer*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<const Buffer>&',`GstBuffer*', `const_cast<GstBuffer*>(Glib::unwrap($3))')
-_CONVERSION(`const Glib::RefPtr<Buffer>&',`const GstBuffer*', `Glib::unwrap($3)')
-_CONVERSION(`Glib::RefPtr<Buffer>',`GstBuffer*', `Glib::unwrap($3)')
+_CONVERSION(`GstBuffer*',`Glib::RefPtr<Gst::Buffer>',`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)')
 
 #Bus
-_CONVERSION(`const Glib::RefPtr<Bus>&',`GstBus*', `Glib::unwrap($3)')
-_CONVERSION(`GstBus*',`Glib::RefPtr<Bus>',`Glib::wrap($3)')
-_CONVERSION(`GstBus*',`const Glib::RefPtr<Bus>&',`Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Bus>&',`GstBus*', `Glib::unwrap($3)')
+_CONVERSION(`GstBus*',`Glib::RefPtr<Gst::Bus>',`Glib::wrap($3)')
+_CONVERSION(`GstBus*',`const Glib::RefPtr<Gst::Bus>&',`Glib::wrap($3)')
 
 #Caps
-_CONVERSION(`GstCaps*',`Glib::RefPtr<Caps>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Caps>&',`GstCaps*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<Caps>&',`const GstCaps*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<const Caps>&',`const GstCaps*', `Glib::unwrap($3)')
+_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>&',`const GstCaps*', `Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<const Gst::Caps>&',`const GstCaps*', `Glib::unwrap($3)')
 
 #Clock
-_CONVERSION(`GstClock*',`Glib::RefPtr<Clock>',`Glib::wrap($3)')
-_CONVERSION(`GstClock*',`Glib::RefPtr<const Clock>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Clock>&',`GstClock*', `Glib::unwrap($3)')
+_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 Clock&',`GstClock*',`((GstClock*) (&($3)))')
-_CONVERSION(`Glib::RefPtr<Clock>',`GstClock*', `Glib::unwrap($3)')
-_CONVERSION(`GstClock*',`const Glib::RefPtr<Clock>&',`Glib::wrap($3)')
+_CONVERSION(`Glib::RefPtr<Gst::Clock>',`GstClock*', `Glib::unwrap($3)')
+_CONVERSION(`GstClock*',`const Glib::RefPtr<Gst::Clock>&',`Glib::wrap($3)')
 
 #ClockID
-_CONVERSION(`GstClockID',`Glib::RefPtr<ClockID>',`Glib::wrap((GstClockEntry*)($3))')
-_CONVERSION(`const Glib::RefPtr<ClockID>&',`GstClockEntry*',`($3)->gobj()')
-_CONVERSION(`GstClockEntry*',`const Glib::RefPtr<ClockID>&',`Glib::wrap($3)')
+_CONVERSION(`GstClockID',`Glib::RefPtr<Gst::ClockID>',`Glib::wrap((GstClockEntry*)($3))')
+_CONVERSION(`const Glib::RefPtr<Gst::ClockID>&',`GstClockEntry*',`($3)->gobj()')
+_CONVERSION(`GstClockEntry*',`const Glib::RefPtr<Gst::ClockID>&',`Glib::wrap($3)')
 
 #Element
-_CONVERSION(`Glib::RefPtr<Element>',`GstElement*', `Glib::unwrap($3)')
-_CONVERSION(`GstElement*',`Glib::RefPtr<Element>',`Glib::wrap($3)')
-_CONVERSION(`GstElement*',`Glib::RefPtr<const Element>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Element>&',`GstElement*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<const Element>&',`GstElement*', `const_cast<GstElement*>(Glib::unwrap($3))')
+_CONVERSION(`Glib::RefPtr<Gst::Element>',`GstElement*', `Glib::unwrap($3)')
+_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(`State&',`GstState*',`((GstState*) (&($3)))')
 
 #ElementFactory
-_CONVERSION(`GstElementFactory*',`Glib::RefPtr<ElementFactory>',`Glib::wrap($3)')
+_CONVERSION(`GstElementFactory*',`Glib::RefPtr<Gst::ElementFactory>',`Glib::wrap($3)')
 
 #Event
-_CONVERSION(`const Glib::RefPtr<Event>&',`GstEvent*', `Gst::unwrap($3)')
-_CONVERSION(`GstEvent*',`const Glib::RefPtr<Event>&', `Gst::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Event>&',`GstEvent*', `Gst::unwrap($3)')
+_CONVERSION(`GstEvent*',`const Glib::RefPtr<Gst::Event>&', `Gst::wrap($3)')
 
 #Index
-_CONVERSION(`GstIndex*',`Glib::RefPtr<Index>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Index>&',`GstIndex*',`Glib::unwrap($3)')
-_CONVERSION(`const IndexAssociation&',`const GstIndexAssociation*',`((GstIndexAssociation*)(&($3)))')
-_CONVERSION(`GstIndex*',`const Glib::RefPtr<Index>&',`Glib::wrap($3)')
-_CONVERSION(`Glib::RefPtr<Index>',`GstIndex*',`Glib::unwrap($3)')
+_CONVERSION(`GstIndex*',`Glib::RefPtr<Gst::Index>',`Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Index>&',`GstIndex*',`Glib::unwrap($3)')
+_CONVERSION(`const Gst::IndexAssociation&',`const GstIndexAssociation*',`((GstIndexAssociation*)(&($3)))')
+_CONVERSION(`GstIndex*',`const Glib::RefPtr<Gst::Index>&',`Glib::wrap($3)')
+_CONVERSION(`Glib::RefPtr<Gst::Index>',`GstIndex*',`Glib::unwrap($3)')
 
 #IndexEntry
-_CONVERSION(`GstIndexEntry*',`IndexEntry',`Glib::wrap($3)')
-_CONVERSION(`GstIndexEntry*',`const IndexEntry&',`Glib::wrap($3)')
-_CONVERSION(`const IndexEntry&',`GstIndexEntry*',`const_cast<GstIndexEntry*>(($3).gobj())')
+_CONVERSION(`GstIndexEntry*',`Gst::IndexEntry',`Glib::wrap($3)')
+_CONVERSION(`GstIndexEntry*',`const Gst::IndexEntry&',`Glib::wrap($3)')
+_CONVERSION(`const Gst::IndexEntry&',`GstIndexEntry*',`const_cast<GstIndexEntry*>(($3).gobj())')
 
 #IndexFactory
-_CONVERSION(`GstIndexFactory*',`Glib::RefPtr<IndexFactory>',`Glib::wrap($3)')
+_CONVERSION(`GstIndexFactory*',`Glib::RefPtr<Gst::IndexFactory>',`Glib::wrap($3)')
 #
 #Iterator
-_CONVERSION(`GstIterator*',`Iterator<Element>',`Iterator<Element>::Iterator($3)')
-_CONVERSION(`GstIterator*',`Iterator<Pad>',`Iterator<Pad>::Iterator($3)')
-_CONVERSION(`GstIterator*',`IteratorBasic<const QueryTypeDefinition>',`IteratorBasic<const QueryTypeDefinition>::IteratorBasic($3)')
+_CONVERSION(`GstIterator*',`Gst::Iterator<Gst::Element>',`Gst::Iterator<Gst::Element>::Iterator($3)')
+_CONVERSION(`GstIterator*',`Gst::Iterator<Gst::Pad>',`Gst::Iterator<Gst::Pad>::Iterator($3)')
+_CONVERSION(`GstIterator*',`Gst::IteratorBasic<const Gst::QueryTypeDefinition>',`Gst::IteratorBasic<const Gst::QueryTypeDefinition>::IteratorBasic($3)')
 
 #Message
-_CONVERSION(`GstMessage*',`Glib::RefPtr<Message>',`Gst::Message::wrap($3)')
-_CONVERSION(`GstMessage*',`Glib::RefPtr<const Message>',`Gst::Message::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Message>&',`GstMessage*', `Glib::unwrap($3)')
-_CONVERSION(`GstMessage*',`const Glib::RefPtr<Message>&',`Gst::Message::wrap($3)')
+_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(`GstMessage*',`const Glib::RefPtr<Gst::Message>&',`Gst::Message::wrap($3)')
 
 #Pad
-_CONVERSION(`GstPad*',`Glib::RefPtr<Pad>',`Glib::wrap($3)')
-_CONVERSION(`GstPad*',`Glib::RefPtr<const Pad>',`Glib::wrap($3)')
-_CONVERSION(`Glib::RefPtr<Pad>',`GstPad*', `Glib::unwrap($3)')
-_CONVERSION(`const Glib::RefPtr<Pad>&',`GstPad*', `Glib::unwrap($3)')
+_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)')
 
 #PadTemplate
-_CONVERSION(`const Glib::RefPtr<PadTemplate>&',`GstPadTemplate*', `Glib::unwrap($3)')
-_CONVERSION(`GstPadTemplate*',`Glib::RefPtr<PadTemplate>', `Glib::wrap($3)')
-_CONVERSION(`GstPadTemplate*',`const Glib::RefPtr<PadTemplate>&', `Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::PadTemplate>&',`GstPadTemplate*', `Glib::unwrap($3)')
+_CONVERSION(`GstPadTemplate*',`Glib::RefPtr<Gst::PadTemplate>', `Glib::wrap($3)')
+_CONVERSION(`GstPadTemplate*',`const Glib::RefPtr<Gst::PadTemplate>&', `Glib::wrap($3)')
 
 #Plugin
-_CONVERSION(`const Glib::RefPtr<Plugin>&',`GstPlugin*',`Glib::unwrap($3)')
-_CONVERSION(`GstPlugin*',`Glib::RefPtr<Plugin>',`Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Plugin>&',`GstPlugin*',`Glib::unwrap($3)')
+_CONVERSION(`GstPlugin*',`Glib::RefPtr<Gst::Plugin>',`Glib::wrap($3)')
 
 #PluginFeature
-_CONVERSION(`GstPluginFeature*',`Glib::RefPtr<PluginFeature>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<PluginFeature>&',`GstPluginFeature*',`Glib::unwrap($3)')
+_CONVERSION(`GstPluginFeature*',`Glib::RefPtr<Gst::PluginFeature>',`Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::PluginFeature>&',`GstPluginFeature*',`Glib::unwrap($3)')
 
 #Query
-_CONVERSION(`const Glib::RefPtr<Query>&',`GstQuery*', `Gst::unwrap($3)')
-_CONVERSION(`GstQuery*',`const Glib::RefPtr<Query>&', `Gst::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::Query>&',`GstQuery*', `Gst::unwrap($3)')
+_CONVERSION(`GstQuery*',`const Glib::RefPtr<Gst::Query>&', `Gst::wrap($3)')
 
 #Registry
-_CONVERSION(`GstRegistry*',`Glib::RefPtr<Registry>', `Glib::wrap($3)')
+_CONVERSION(`GstRegistry*',`Glib::RefPtr<Gst::Registry>', `Glib::wrap($3)')
 
 #Structure
-_CONVERSION(`const GstStructure*',`const Structure',`Glib::wrap(const_cast<GstStructure*>($3), true)')
-_CONVERSION(`GstStructure*',`const Structure',`Glib::wrap(const_cast<GstStructure*>($3), true)')
+_CONVERSION(`const GstStructure*',`const Gst::Structure',`Glib::wrap(const_cast<GstStructure*>($3), true)')
+_CONVERSION(`GstStructure*',`const Gst::Structure',`Glib::wrap(const_cast<GstStructure*>($3), true)')
 
 #TagList
-_CONVERSION(`const TagList&',`const GstTagList*',`(($3).gobj())')
-_CONVERSION(`GstTagList*',`TagList',`Glib::wrap($3, 0, true)')
-_CONVERSION(`const TagList&',`GstTagList*',`const_cast<GstTagList*>(($3).gobj())')
-_CONVERSION(`const GstTagList*',`TagList',`Glib::wrap(const_cast<GstTagList*>($3), 0, true)')
+_CONVERSION(`const Gst::TagList&',`const GstTagList*',`(($3).gobj())')
+_CONVERSION(`GstTagList*',`Gst::TagList',`Glib::wrap($3, 0, true)')
+_CONVERSION(`const Gst::TagList&',`GstTagList*',`const_cast<GstTagList*>(($3).gobj())')
+_CONVERSION(`const GstTagList*',`Gst::TagList',`Glib::wrap(const_cast<GstTagList*>($3), 0, true)')
+_CONVERSION(`Gst::TagList',`GstTagList*',`($3).gobj()')
 
 #URIHandler
-_CONVERSION(`const Glib::RefPtr<URIHandler>&',`GstURIHandler*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gst::URIHandler>&',`GstURIHandler*',`Glib::unwrap($3)')
 
 ###################General Conversions############################
 

Modified: gstreamermm/trunk/tools/m4/convert_gstbase.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gstbase.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gstbase.m4	Fri Dec 12 03:49:44 2008
@@ -1,3 +1,5 @@
 
-#GstBase::ColorBalanceChannel
+#ColorBalanceChannel
 _CONVERSION(`const Glib::RefPtr<ColorBalanceChannel>&',`GstColorBalanceChannel*',`($3)->gobj()')
+
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]