gnomemm r1460 - in gstreamermm/trunk: . gstreamer gstreamer/src tools/m4

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Tue Apr 15 01:36:12 2008
New Revision: 1460
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1460&view=rev

Log:
2008-04-14  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/gstreamermm.h: Added taglist.h to includes
	* gstreamer/src/segment.hg: Added _IGNORE for gst_element_free

	* gstreamer/src/bin.hg:
	* gstreamer/src/childproxy.hg:
	* gstreamer/src/clock.hg:
	* gstreamer/src/gst_vfuncs.defs: Added properties and virtual
	functions for Bin, ChildProxy and Clock

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/gstreamermm.h
   gstreamermm/trunk/gstreamer/src/bin.hg
   gstreamermm/trunk/gstreamer/src/childproxy.hg
   gstreamermm/trunk/gstreamer/src/clock.hg
   gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs
   gstreamermm/trunk/gstreamer/src/segment.hg
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/gstreamer/gstreamermm.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm.h	Tue Apr 15 01:36:12 2008
@@ -30,6 +30,7 @@
 #include <gstreamermm/query.h>
 #include <gstreamermm/structure.h>
 #include <gstreamermm/systemclock.h>
+#include <gstreamermm/taglist.h>
 #include <gstreamermm/tagsetter.h>
 #include <gstreamermm/task.h>
 #include <gstreamermm/urihandler.h>

Modified: gstreamermm/trunk/gstreamer/src/bin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/bin.hg	Tue Apr 15 01:36:12 2008
@@ -147,6 +147,10 @@
   _WRAP_SIGNAL(void element_removed(const Glib::RefPtr<Element>& element), "element-removed")
 
   _WRAP_PROPERTY("async-handling", bool)
+
+  _WRAP_VFUNC(bool add_element(const Glib::RefPtr<Element>& element), "add_element")
+  _WRAP_VFUNC(bool remove_element(const Glib::RefPtr<Element>& element), "remove_element")
+  _WRAP_VFUNC(void handle_message(const Glib::RefPtr<Message>& message), "handle_message")
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/childproxy.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/childproxy.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/childproxy.hg	Tue Apr 15 01:36:12 2008
@@ -63,6 +63,9 @@
   _WRAP_SIGNAL(void child_added(const Glib::RefPtr<Gst::Object>& object), "child-added")
   _WRAP_SIGNAL(void child_removed(const Glib::RefPtr<Gst::Object>& object), "child-removed")
 
+  _WRAP_VFUNC(Glib::RefPtr<Gst::Object> get_child_by_index(guint index) const, "get_child_by_index")
+  _WRAP_VFUNC(guint get_children_count() const, "get_children_count")
+
   _IGNORE(gst_child_proxy_get, gst_child_proxy_set)
 };
 

Modified: gstreamermm/trunk/gstreamer/src/clock.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/clock.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/clock.hg	Tue Apr 15 01:36:12 2008
@@ -168,6 +168,18 @@
   _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)
+
+  _WRAP_PROPERTY("stats", bool)
+  _WRAP_PROPERTY("timeout", guint64)
+  _WRAP_PROPERTY("window-size", int)
+  _WRAP_PROPERTY("window-threshold", int)
+
+  _WRAP_VFUNC(ClockTime change_resolution(ClockTime old_resolution, ClockTime new_resolution), "change_resolution")
+  _WRAP_VFUNC(ClockTime get_resolution(), "get_resolution")
+  _WRAP_VFUNC(ClockTime get_internal_time(), "get_internal_time")
+  _WRAP_VFUNC(ClockReturn wait_async(const Glib::RefPtr<ClockID>& id), "wait_async")
+  _WRAP_VFUNC(void unschedule(const Glib::RefPtr<ClockID>& id), "unschedule")
+  _WRAP_VFUNC(ClockReturn wait_jitter(const Glib::RefPtr<ClockID>& id, ClockTimeDiff& jitter), "wait_jitter")
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs	(original)
+++ gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs	Tue Apr 15 01:36:12 2008
@@ -3,10 +3,89 @@
 ; define-vfunc is g*mm-specific
 ; These are hand-written.
 
-; GAsyncResult
+; GstBin
 
-(define-vfunc get_source_object
-  (of-object "GAsyncResult")
-  (return-type "GObject*")
+(define-vfunc add_element
+  (of-object "GstBin")
+  (return-type "gboolean")
+  (parameters
+   '("GstElement*" "element")
+  )
 )
 
+(define-vfunc remove_element
+  (of-object "GstBin")
+  (return-type "gboolean")
+  (parameters
+   '("GstElement*" "element")
+  )
+)
+
+(define-vfunc handle_message
+  (of-object "GstBin")
+  (return-type "void")
+  (parameters
+   '("GstMessage*" "message")
+  )
+)
+
+; GstChildProxy
+
+(define-vfunc get_child_by_index
+  (of-object "GstChildProxy")
+  (return-type "GstObject*")
+  (parameters
+   '("guint" "index")
+  )
+)
+
+(define-vfunc get_children_count
+  (of-object "GstChildProxy")
+  (return-type "guint")
+)
+
+; GstClock
+
+(define-vfunc change_resolution
+  (of-object "GstClock")
+  (return-type "GstClockTime")
+  (parameters
+   '("GstClockTime" "old_resolution")
+   '("GstClockTime" "new_resolution")
+  )
+)
+
+(define-vfunc get_resolution
+  (of-object "GstClock")
+  (return-type "GstClockTime")
+)
+
+(define-vfunc get_internal_time
+  (of-object "GstClock")
+  (return-type "GstClockTime")
+)
+
+(define-vfunc wait_async
+  (of-object "GstClock")
+  (return-type "GstClockReturn")
+  (parameters
+   '("GstClockEntry*" "entry")
+  )
+)
+
+(define-vfunc unschedule
+  (of-object "GstClock")
+  (return-type "void")
+  (parameters
+   '("GstClockEntry*" "entry")
+  )
+)
+
+(define-vfunc wait_jitter
+  (of-object "GstClock")
+  (return-type "GstClockReturn")
+  (parameters
+   '("GstClockEntry*" "entry")
+   '("GstClockTimeDiff*" "jitter")
+  )
+)

Modified: gstreamermm/trunk/gstreamer/src/segment.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/segment.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/segment.hg	Tue Apr 15 01:36:12 2008
@@ -98,6 +98,8 @@
   _WRAP_METHOD(void set_seek(double rate, Format format, SeekFlags flags, SeekType start_type, gint64 start, SeekType stop_type, gint64 stop, bool& update), gst_segment_set_seek)
   _WRAP_METHOD(gint64 convert_to_running_time(Format format, gint64 position), gst_segment_to_running_time)
   _WRAP_METHOD(gint64 convert_to_stream_time(Format format, gint64 position), gst_segment_to_stream_time)
+
+  _IGNORE(gst_segment_free)
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Tue Apr 15 01:36:12 2008
@@ -14,6 +14,7 @@
 _CONVERSION(`GstObject*',`Glib::RefPtr<Gst::Object>',`Glib::wrap($3)')
 _CONVERSION(`GstObject*',`Glib::RefPtr<const Gst::Object>',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<Gst::Object>&',`GstObject*',`Glib::unwrap($3)')
+_CONVERSION(`Glib::RefPtr<Gst::Object>',`GstObject*',`Glib::unwrap($3)')
 
 #Buffer
 _CONVERSION(`GstBuffer*',`Glib::RefPtr<Buffer>',`wrap($3)')
@@ -40,6 +41,8 @@
 #ClockID
 _CONVERSION(`GstClockID',`Glib::RefPtr<ClockID>',`$3')
 _CONVERSION(`Glib::RefPtr<ClockID>',`GstClockID',`(GstClockID ($3))')
+_CONVERSION(`const Glib::RefPtr<ClockID>&',`GstClockEntry*',`(GstClockEntry*)(*(($3)->gobj()))')
+_CONVERSION(`GstClockEntry*',`const Glib::RefPtr<ClockID>&',`Glib::wrap((GstClockID*)(&($3)))')
 
 #Element
 _CONVERSION(`Glib::RefPtr<Element>',`GstElement*', `Glib::unwrap($3)')
@@ -69,6 +72,7 @@
 _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)')
 
 #Pad
 _CONVERSION(`GstPad*',`Glib::RefPtr<Pad>',`Glib::wrap($3)')
@@ -118,6 +122,7 @@
 _CONVERSION(`ClockTimeDiff',`GstClockTimeDiff',`GstClockTimeDiff ($3)')
 _CONVERSION(`ClockTimeDiff&',`GstClockTimeDiff*',`(GstClockTimeDiff*)(&($3))')
 _CONVERSION(`Format&',`GstFormat*',`(($2) &($3))')
+_CONVERSION(`GstClockTimeDiff*',`ClockTimeDiff&',`(ClockTimeDiff&)(*($3))')
 _CONVERSION(`const GstQueryType*',`const QueryType*',`(QueryType*)($3)')
 _CONVERSION(`GstTagFlag',`TagFlag',`(TagFlag)($3)')
 _CONVERSION(`guint64',`ClockTime',`(ClockTime ($3))')