From 642685bbbcc69948495fc13b2ba4787b837161d6 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 4 Feb 2004 22:35:12 +0000 Subject: [PATCH] gst/gstclock.*: reset padding, remove unused fields Original commit message from CVS: 2004-02-04 Benjamin Otte * gst/gstclock.c: (gst_clock_init), (gst_clock_set_speed), (gst_clock_get_speed): * gst/gstclock.h: reset padding, remove unused fields --- ChangeLog | 7 +++++++ gst/gstclock.c | 6 ++---- gst/gstclock.h | 7 +------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90efcb83c4..71b3fb2868 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-02-04 Benjamin Otte + + * 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 * gst/autoplug/gstspideridentity.c: diff --git a/gst/gstclock.c b/gst/gstclock.c index a74adbe832..e8bbd7a504 100644 --- 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 b300150340..dee05965e4 100644 --- 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 {