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

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Tue Apr 15 02:43:30 2008
New Revision: 1461
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1461&view=rev

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

	* gstreamer/src/clock.ccg:
	* gstreamer/src/clock.hg: Used GstClockEntry as C type of class macro
	of class ClockID (a GstClockID, in fact, is a void pointer which in
	GStreamer API is generally cast to a (GstClockEntry*) (see
	implementation of gst_clock_id_* functions -- for example
	gst_clock_id_ref); Wrapped create_single_shot_id()
	create_periodic_id()

	* tools/m4/convert_gst.m4: Fixed ClockID conversions to reflect
	Gst::ClockID C type from GstClockID to GstCockEntry

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/clock.ccg
   gstreamermm/trunk/gstreamer/src/clock.hg
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/gstreamer/src/clock.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/clock.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/clock.ccg	Tue Apr 15 02:43:30 2008
@@ -31,7 +31,7 @@
   try
   {
   #endif //GLIBMM_EXCEPTIONS_ENABLED
-    bool result = (*the_slot)(Glib::wrap(clock, true), time, Glib::wrap((GstClockID*)(&id), true));
+    bool result = (*the_slot)(Glib::wrap(clock, true), time, Glib::wrap((GstClockEntry*)(id), true));
 
     //Delete the once executing slot before returning result
     delete the_slot;

Modified: gstreamermm/trunk/gstreamer/src/clock.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/clock.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/clock.hg	Tue Apr 15 02:43:30 2008
@@ -42,7 +42,7 @@
  */
 class ClockID
 {
-  _CLASS_OPAQUE_REFCOUNTED(ClockID, GstClockID, NONE, gst_clock_id_ref, gst_clock_id_unref)
+  _CLASS_OPAQUE_REFCOUNTED(ClockID, GstClockEntry, NONE, gst_clock_id_ref, gst_clock_id_unref)
   _IGNORE(gst_clock_id_ref, gst_clock_id_unref)
 
 public:
@@ -163,8 +163,8 @@
   _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)
-  //TODO: _WRAP_METHOD(Glib::RefPtr<ClockID> create_single_shot_id(ClockTime time), gst_clock_new_single_shot_id)
-  //TODO: _WRAP_METHOD(Glib::RefPtr<ClockID> create_periodic_id(ClockTime start_time, ClockTime intervals), gst_clock_new_periodic_id)
+  _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(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)

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 02:43:30 2008
@@ -39,10 +39,9 @@
 _CONVERSION(`const Clock&',`GstClock*',`((GstClock*) (&($3)))')
 
 #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)))')
+_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)')
 
 #Element
 _CONVERSION(`Glib::RefPtr<Element>',`GstElement*', `Glib::unwrap($3)')