[gstreamermm: 36/167] some fixes in clock

[Murray Cumming <murrayc src gnome org>]

commit efa2dbf21ef0334fff21fd0dce18aa927eb63912
Author: Marcin Kolny at Flytronic <marcin kolny flytronic pl>
Date:   Thu Jul 25 13:02:48 2013 +0200

    some fixes in clock

 gstreamer/src/clock.ccg       |    2 +-
 gstreamer/src/clock.hg        |    7 +------
 gstreamer/src/gst_vfuncs.defs |    1 +
 3 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/gstreamer/src/clock.ccg b/gstreamer/src/clock.ccg
index 208ec95..6e7c793 100644
--- a/gstreamer/src/clock.ccg
+++ b/gstreamer/src/clock.ccg
@@ -101,7 +101,7 @@ guint get_fractional_seconds(ClockTime time)
 ClockReturn ClockID::wait_async(const SlotClock& slot)
 {
   SlotClock* slot_copy = new SlotClock(slot);
-  return static_cast<ClockReturn>(gst_clock_id_wait_async(gobj(), &ClockID_Clock_gstreamermm_callback, 
slot_copy));
+  return static_cast<ClockReturn>(gst_clock_id_wait_async(gobj(), &ClockID_Clock_gstreamermm_callback, 
slot_copy, NULL)); // TODO temporary NULL value
 }
 
 ClockReturn ClockID::wait()
diff --git a/gstreamer/src/clock.hg b/gstreamer/src/clock.hg
index 0223db2..a0d862a 100644
--- a/gstreamer/src/clock.hg
+++ b/gstreamer/src/clock.hg
@@ -242,7 +242,6 @@ public:
   _WRAP_METHOD(void get_calibration(ClockTime& internal, ClockTime& external, ClockTime& rate_num, 
ClockTime& rate_denom) const, gst_clock_get_calibration)
   _WRAP_METHOD(void set_calibration(ClockTime internal, ClockTime external, ClockTime rate_num, ClockTime 
rate_denom), gst_clock_set_calibration)
   
-  _WRAP_PROPERTY("stats", bool)
   _WRAP_PROPERTY("timeout", guint64)
   _WRAP_PROPERTY("window-size", int)
   _WRAP_PROPERTY("window-threshold", int)
@@ -265,7 +264,7 @@ public:
   /** Perform a blocking wait for the given Gst::ClockID. Deprecated,
    * implement wait_jitter_vfunc() instead.
    */
-  _WRAP_VFUNC(ClockReturn wait(const Glib::RefPtr<Gst::ClockID>& id), "wait")
+  _WRAP_VFUNC(ClockReturn wait(const Glib::RefPtr<Gst::ClockID>& id, ClockTimeDiff& jitter), "wait")
 
   /** Perform an asynchronous wait for the given Gst::ClockID.
    */
@@ -275,10 +274,6 @@ public:
    */
   _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<Gst::ClockID>& id, ClockTimeDiff& jitter), 
"wait_jitter")
 };
 
 } //namespace Gst
diff --git a/gstreamer/src/gst_vfuncs.defs b/gstreamer/src/gst_vfuncs.defs
index b719f03..bd22e31 100644
--- a/gstreamer/src/gst_vfuncs.defs
+++ b/gstreamer/src/gst_vfuncs.defs
@@ -576,6 +576,7 @@
   (return-type "GstClockReturn")
   (parameters
    '("GstClockEntry*" "entry")
+   '("GstClockTimeDiff*" "jitter")
   )
 )