--- a/gst_plugins_base/gst-libs/gst/audio/gstaudioclock.h	Tue Aug 31 15:30:33 2010 +0300
+++ b/gst_plugins_base/gst-libs/gst/audio/gstaudioclock.h	Wed Sep 01 12:16:41 2010 +0100
@@ -23,7 +23,6 @@
 #ifndef __GST_AUDIO_CLOCK_H__
 #define __GST_AUDIO_CLOCK_H__
 
-#include <gst/gst.h>
 #include <gst/gstsystemclock.h>
 
 G_BEGIN_DECLS
@@ -38,8 +37,6 @@
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_CLOCK))
 #define GST_IS_AUDIO_CLOCK_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_CLOCK))
-#define GST_AUDIO_CLOCK_CAST(obj) \
-  ((GstAudioClock*)(obj))
 
 typedef struct _GstAudioClock GstAudioClock;
 typedef struct _GstAudioClockClass GstAudioClockClass;
@@ -74,13 +71,7 @@
   GstClockTime last_time;
 
   /*< private >*/
-  union {
-    struct {
-      GstClockTimeDiff   time_offset;
-    } ABI;
-    /* adding + 0 to mark ABI change to be undone later */
-    gpointer _gst_reserved[GST_PADDING + 0];
-  } abidata;
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstAudioClockClass {
@@ -99,24 +90,8 @@
 IMPORT_C
 #endif
 
-GstClock*       gst_audio_clock_new             (const gchar *name, GstAudioClockGetTimeFunc func,
+GstClock*       gst_audio_clock_new             (gchar *name, GstAudioClockGetTimeFunc func,
                                                  gpointer user_data);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void            gst_audio_clock_reset           (GstAudioClock *clock, GstClockTime time);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-
-GstClockTime    gst_audio_clock_get_time        (GstClock * clock);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-GstClockTime    gst_audio_clock_adjust          (GstClock * clock, GstClockTime time);
 
 G_END_DECLS