diff --git a/ChangeLog b/ChangeLog index 30199dbcb8..9807e59dea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-08-08 Tim-Philipp Müller + + * gst/base/gstadapter.h: + * gst/base/gstbasesink.h: + * gst/base/gstbasesrc.h: + * gst/base/gstbasetransform.h: + * gst/base/gstcollectpads.h: + * gst/base/gstpushsrc.h: + * gst/gstiterator.h: + Add padding to our base elements' class and instance structs and + to GstIterator (you will need to rebuild all plugins and apps!) + 2005-08-08 Ronald S. Bultje * gst/gstbin.c: (bin_bus_handler): diff --git a/gst/base/gstadapter.h b/gst/base/gstadapter.h index 964e882747..f39a7b9d46 100644 --- a/gst/base/gstadapter.h +++ b/gst/base/gstadapter.h @@ -51,12 +51,14 @@ struct _GstAdapter { guint assembled_size; guint assembled_len; + /*< private >*/ gpointer _gst_reserved[GST_PADDING]; }; struct _GstAdapterClass { GObjectClass parent_class; + /*< private >*/ gpointer _gst_reserved[GST_PADDING]; }; diff --git a/gst/base/gstbasesink.h b/gst/base/gstbasesink.h index f0f486fa56..b669319860 100644 --- a/gst/base/gstbasesink.h +++ b/gst/base/gstbasesink.h @@ -69,6 +69,9 @@ struct _GstBaseSink { gboolean eos; gboolean need_preroll; gboolean have_preroll; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; struct _GstBaseSinkClass { @@ -99,6 +102,9 @@ struct _GstBaseSinkClass { gboolean (*event) (GstBaseSink *sink, GstEvent *event); GstFlowReturn (*preroll) (GstBaseSink *sink, GstBuffer *buffer); GstFlowReturn (*render) (GstBaseSink *sink, GstBuffer *buffer); + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; GType gst_base_sink_get_type(void); diff --git a/gst/base/gstbasesrc.h b/gst/base/gstbasesrc.h index 51b9b7b976..2d2c854150 100644 --- a/gst/base/gstbasesrc.h +++ b/gst/base/gstbasesrc.h @@ -91,6 +91,9 @@ struct _GstBaseSrc { gint num_buffers; gint num_buffers_left; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; /** @@ -136,6 +139,9 @@ struct _GstBaseSrcClass { /* ask the subclass to create a buffer with offset and size */ GstFlowReturn (*create) (GstBaseSrc *src, guint64 offset, guint size, GstBuffer **buf); + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; GType gst_base_src_get_type(void); diff --git a/gst/base/gstbasetransform.h b/gst/base/gstbasetransform.h index fb4d07be3e..696607dfca 100644 --- a/gst/base/gstbasetransform.h +++ b/gst/base/gstbasetransform.h @@ -55,6 +55,9 @@ struct _GstBaseTransform { gboolean in_place; guint out_size; gboolean delay_configure; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; struct _GstBaseTransformClass { @@ -86,6 +89,9 @@ struct _GstBaseTransformClass { /* transform a buffer inplace */ GstFlowReturn (*transform_ip) (GstBaseTransform *trans, GstBuffer *buf); + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; void gst_base_transform_set_passthrough (GstBaseTransform *trans, gboolean passthrough); diff --git a/gst/base/gstcollectpads.h b/gst/base/gstcollectpads.h index c2328695e9..4f6c5db051 100644 --- a/gst/base/gstcollectpads.h +++ b/gst/base/gstcollectpads.h @@ -70,11 +70,15 @@ struct _GstCollectPads { guint queuedpads; /* number of pads with a buffer */ gboolean started; + + gpointer _gst_reserved[GST_PADDING]; }; struct _GstCollectPadsClass { GstObjectClass parent_class; + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; GType gst_collectpads_get_type(void); diff --git a/gst/base/gstpushsrc.h b/gst/base/gstpushsrc.h index c570b2f1f3..8c09eeebe7 100644 --- a/gst/base/gstpushsrc.h +++ b/gst/base/gstpushsrc.h @@ -41,6 +41,9 @@ typedef struct _GstPushSrcClass GstPushSrcClass; struct _GstPushSrc { GstBaseSrc parent; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; struct _GstPushSrcClass { @@ -48,6 +51,9 @@ struct _GstPushSrcClass { /* ask the subclass to create a buffer */ GstFlowReturn (*create) (GstPushSrc *src, GstBuffer **buf); + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; GType gst_push_src_get_type(void); diff --git a/gst/gstiterator.h b/gst/gstiterator.h index cd3e3fe641..38530e6452 100644 --- a/gst/gstiterator.h +++ b/gst/gstiterator.h @@ -22,8 +22,8 @@ #ifndef __GST_ITERATOR_H__ #define __GST_ITERATOR_H__ -#include #include /* for GValue in the fold */ +#include "gstconfig.h" G_BEGIN_DECLS @@ -68,6 +68,9 @@ struct _GstIterator { guint32 cookie; /* cookie of the iterator */ guint32 *master_cookie; /* pointer to guint32 holding the cookie when this iterator was created */ + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; /* creating iterators */ diff --git a/libs/gst/base/gstadapter.h b/libs/gst/base/gstadapter.h index 964e882747..f39a7b9d46 100644 --- a/libs/gst/base/gstadapter.h +++ b/libs/gst/base/gstadapter.h @@ -51,12 +51,14 @@ struct _GstAdapter { guint assembled_size; guint assembled_len; + /*< private >*/ gpointer _gst_reserved[GST_PADDING]; }; struct _GstAdapterClass { GObjectClass parent_class; + /*< private >*/ gpointer _gst_reserved[GST_PADDING]; }; diff --git a/libs/gst/base/gstbasesink.h b/libs/gst/base/gstbasesink.h index f0f486fa56..b669319860 100644 --- a/libs/gst/base/gstbasesink.h +++ b/libs/gst/base/gstbasesink.h @@ -69,6 +69,9 @@ struct _GstBaseSink { gboolean eos; gboolean need_preroll; gboolean have_preroll; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; struct _GstBaseSinkClass { @@ -99,6 +102,9 @@ struct _GstBaseSinkClass { gboolean (*event) (GstBaseSink *sink, GstEvent *event); GstFlowReturn (*preroll) (GstBaseSink *sink, GstBuffer *buffer); GstFlowReturn (*render) (GstBaseSink *sink, GstBuffer *buffer); + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; GType gst_base_sink_get_type(void); diff --git a/libs/gst/base/gstbasesrc.h b/libs/gst/base/gstbasesrc.h index 51b9b7b976..2d2c854150 100644 --- a/libs/gst/base/gstbasesrc.h +++ b/libs/gst/base/gstbasesrc.h @@ -91,6 +91,9 @@ struct _GstBaseSrc { gint num_buffers; gint num_buffers_left; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; /** @@ -136,6 +139,9 @@ struct _GstBaseSrcClass { /* ask the subclass to create a buffer with offset and size */ GstFlowReturn (*create) (GstBaseSrc *src, guint64 offset, guint size, GstBuffer **buf); + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; GType gst_base_src_get_type(void); diff --git a/libs/gst/base/gstbasetransform.h b/libs/gst/base/gstbasetransform.h index fb4d07be3e..696607dfca 100644 --- a/libs/gst/base/gstbasetransform.h +++ b/libs/gst/base/gstbasetransform.h @@ -55,6 +55,9 @@ struct _GstBaseTransform { gboolean in_place; guint out_size; gboolean delay_configure; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; struct _GstBaseTransformClass { @@ -86,6 +89,9 @@ struct _GstBaseTransformClass { /* transform a buffer inplace */ GstFlowReturn (*transform_ip) (GstBaseTransform *trans, GstBuffer *buf); + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; void gst_base_transform_set_passthrough (GstBaseTransform *trans, gboolean passthrough); diff --git a/libs/gst/base/gstcollectpads.h b/libs/gst/base/gstcollectpads.h index c2328695e9..4f6c5db051 100644 --- a/libs/gst/base/gstcollectpads.h +++ b/libs/gst/base/gstcollectpads.h @@ -70,11 +70,15 @@ struct _GstCollectPads { guint queuedpads; /* number of pads with a buffer */ gboolean started; + + gpointer _gst_reserved[GST_PADDING]; }; struct _GstCollectPadsClass { GstObjectClass parent_class; + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; GType gst_collectpads_get_type(void); diff --git a/libs/gst/base/gstpushsrc.h b/libs/gst/base/gstpushsrc.h index c570b2f1f3..8c09eeebe7 100644 --- a/libs/gst/base/gstpushsrc.h +++ b/libs/gst/base/gstpushsrc.h @@ -41,6 +41,9 @@ typedef struct _GstPushSrcClass GstPushSrcClass; struct _GstPushSrc { GstBaseSrc parent; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; struct _GstPushSrcClass { @@ -48,6 +51,9 @@ struct _GstPushSrcClass { /* ask the subclass to create a buffer */ GstFlowReturn (*create) (GstPushSrc *src, GstBuffer **buf); + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; }; GType gst_push_src_get_type(void);