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
This commit is contained in:
Benjamin Otte 2004-02-04 22:35:12 +00:00
parent 5554f286bd
commit 642685bbbc
3 changed files with 10 additions and 10 deletions

View file

@ -1,3 +1,10 @@
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> 2004-02-04 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/autoplug/gstspideridentity.c: * gst/autoplug/gstspideridentity.c:

View file

@ -397,8 +397,6 @@ gst_clock_init (GstClock *clock)
{ {
clock->max_diff = DEFAULT_MAX_DIFF; clock->max_diff = DEFAULT_MAX_DIFF;
clock->speed = 1.0;
clock->active = TRUE;
clock->start_time = 0; clock->start_time = 0;
clock->last_time = 0; clock->last_time = 0;
clock->entries = NULL; 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); g_return_val_if_fail (GST_IS_CLOCK (clock), 0.0);
GST_WARNING_OBJECT (clock, "called deprecated function"); 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); g_return_val_if_fail (GST_IS_CLOCK (clock), 0.0);
GST_WARNING_OBJECT (clock, "called deprecated function"); GST_WARNING_OBJECT (clock, "called deprecated function");
return clock->speed; return 1.0;
} }
/** /**

View file

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