gst/gstclock.*: reset padding, remove unused fields

Original commit message from CVS:
2004-02-04  Benjamin Otte  <in7y118@public.uni-hamburg.de>

* gst/gstclock.c: (gst_clock_init), (gst_clock_set_speed),
(gst_clock_get_speed):
* gst/gstclock.h:
reset padding, remove unused fields

diff --git a/ChangeLog b/ChangeLog
index 90efcb8..71b3fb2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-02-04  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
+       * gst/gstclock.c: (gst_clock_init), (gst_clock_set_speed),
+       (gst_clock_get_speed):
+       * gst/gstclock.h:
+         reset padding, remove unused fields
+
+2004-02-04  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
        * gst/autoplug/gstspideridentity.c:
        (gst_spider_identity_sink_loop_type_finding):
          use get_allowed_caps, not get_caps (fixes #132519)

diff --git a/gst/gstclock.c b/gst/gstclock.c
index a74adbe..e8bbd7a 100644 (file)
--- a/gst/gstclock.c
+++ b/gst/gstclock.c
@@ -397,8 +397,6 @@ gst_clock_init (GstClock *clock)
 {
   clock->max_diff = DEFAULT_MAX_DIFF;
 
-  clock->speed = 1.0;
-  clock->active = TRUE;
   clock->start_time = 0;
   clock->last_time = 0;
   clock->entries = NULL;
@@ -436,7 +434,7 @@ gst_clock_set_speed (GstClock *clock, gdouble speed)
   g_return_val_if_fail (GST_IS_CLOCK (clock), 0.0);
 
   GST_WARNING_OBJECT (clock, "called deprecated function");
-  return clock->speed;
+  return 1.0;
 }
 
 /**
@@ -453,7 +451,7 @@ gst_clock_get_speed (GstClock *clock)
   g_return_val_if_fail (GST_IS_CLOCK (clock), 0.0);
 
   GST_WARNING_OBJECT (clock, "called deprecated function");
-  return clock->speed;
+  return 1.0;
 }
 
 /**

diff --git a/gst/gstclock.h b/gst/gstclock.h
index b300150..dee0596 100644 (file)
--- a/gst/gstclock.h
+++ b/gst/gstclock.h
@@ -128,10 +128,7 @@ struct _GstClock {
   gint64        max_diff;
 
   /* --- private --- */
-  gboolean      accept_discont;          /* FIXME: REMOVE! */
-  gdouble       speed;                   /* FIXME: REMOVE! */
   guint64       resolution;
-  gboolean      active;                  /* FIXME: REMOVE! */
   GList                *entries;
   GMutex       *active_mutex;
   GCond                *active_cond;
@@ -140,9 +137,7 @@ struct _GstClock {
   GstClockTime  last_event;
   GstClockTime  max_event_diff;
   
-  /* weird padding here */  
-  guint8        padding[sizeof(gpointer) * GST_PADDING];
-  /*gpointer _gst_reserved[GST_PADDING];*/
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstClockClass {