Change GST_.*_PADDING to _gst_padding[GST_PADDING];

Original commit message from CVS:
Change GST_.*_PADDING to _gst_padding[GST_PADDING];

diff --git a/gst/Makefile.am b/gst/Makefile.am
index f963403..07bad28 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -80,7 +80,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES =            \
        gstatomic.c             \
        gstbin.c                \
        gstbuffer.c             \
-       gstbufferpool-default.c \
        gstcaps.c               \
        gstclock.c              \
        gstcpu.c                \
@@ -143,7 +142,6 @@ gst_headers =                       \
        gstobject.h             \
        gstbin.h                \
        gstbuffer.h             \
-       gstbufferpool-default.h \
        gstcaps.h               \
        gstclock.h              \
        gstcompat.h             \

diff --git a/gst/gst.c b/gst/gst.c
index d18a44a..840a8a1 100644 (file)
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -470,7 +470,7 @@ static GstPluginDesc plugin_desc = {
   GST_PACKAGE,
   GST_ORIGIN,
 
-  GST_STRUCT_PADDING_INIT
+  GST_PADDING_INIT
 };                         
 
 /*

diff --git a/gst/gstbin.h b/gst/gstbin.h
index 92af83b..bff735f 100644 (file)
--- a/gst/gstbin.h
+++ b/gst/gstbin.h
@@ -76,7 +76,7 @@ struct _GstBin {
 
   GstElementState child_states[GST_NUM_STATES];
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstBinClass {
@@ -95,7 +95,7 @@ struct _GstBinClass {
   void         (*element_added)        (GstBin *bin, GstElement *child);
   void         (*element_removed)      (GstBin *bin, GstElement *child);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType          gst_bin_get_type                (void);

diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h
index ab19247..8a9a30c 100644 (file)
--- a/gst/gstbuffer.h
+++ b/gst/gstbuffer.h
@@ -114,7 +114,7 @@ struct _GstBuffer {
   /* pointer to pool private data of parent buffer in case of a subbuffer */
   gpointer              pool_private;
 
-  GST_STRUCT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 /* bufferpools */
@@ -139,7 +139,7 @@ struct _GstBufferPool {
 
   gpointer                             user_data;
 
-  GST_STRUCT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 /* allocation */

diff --git a/gst/gstclock.h b/gst/gstclock.h
index 1e17ceb..37d7e28 100644 (file)
--- a/gst/gstclock.h
+++ b/gst/gstclock.h
@@ -137,7 +137,7 @@ struct _GstClock {
   GCond                *active_cond;
   gboolean      stats;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstClockClass {
@@ -159,7 +159,7 @@ struct _GstClockClass {
   void                  (*unschedule)          (GstClock *clock, GstClockEntry *entry);
   void                  (*unlock)              (GstClock *clock, GstClockEntry *entry);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType                  gst_clock_get_type              (void);

diff --git a/gst/gstdata.h b/gst/gstdata.h
index c329ec9..14d4b75 100644 (file)
--- a/gst/gstdata.h
+++ b/gst/gstdata.h
@@ -75,7 +75,7 @@ struct _GstData {
   GstDataFreeFunction   free;          /* free the data */
   GstDataCopyFunction   copy;          /* copy the data */
 
-  GST_STRUCT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 /* function used by subclasses only */

diff --git a/gst/gstelement.h b/gst/gstelement.h
index 15a9c66..f4fff8b 100644 (file)
--- a/gst/gstelement.h
+++ b/gst/gstelement.h
@@ -45,10 +45,10 @@ struct _GstElementDetails {
   gchar *description;           /* insights of one form or another */
   gchar *author;                /* who wrote this thing? */
 
-  GST_STRUCT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 #define GST_ELEMENT_DETAILS(longname,klass,description,author)         \
-  { longname, klass, description, author, GST_STRUCT_PADDING_INIT }
+  { longname, klass, description, author, GST_PADDING_INIT }
 #define GST_IS_ELEMENT_DETAILS(details) (                                      \
   (details) && ((details)->longname != NULL) && ((details)->klass != NULL)     \
   && ((details)->description != NULL) && ((details)->author != NULL))
@@ -184,7 +184,7 @@ struct _GstElement {
   GAsyncQueue          *prop_value_queue;
   GMutex               *property_mutex;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstElementClass {
@@ -241,7 +241,7 @@ struct _GstElementClass {
   GstIndex*            (*get_index)            (GstElement *element);
   void                 (*set_index)            (GstElement *element, GstIndex *index);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 void                   gst_element_class_add_pad_template      (GstElementClass *klass, GstPadTemplate *templ);
@@ -408,13 +408,13 @@ struct _GstElementFactory {
   
   GList *              interfaces;             /* interfaces this element implements */
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstElementFactoryClass {
   GstPluginFeatureClass parent_class;
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType                  gst_element_factory_get_type            (void);

diff --git a/gst/gstevent.h b/gst/gstevent.h
index aea4584..e6db596 100644 (file)
--- a/gst/gstevent.h
+++ b/gst/gstevent.h
@@ -186,7 +186,7 @@ struct _GstEvent {
     } structure;
   } event_data;
 
-  GST_STRUCT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 void           _gst_event_initialize           (void);

diff --git a/gst/gstindex.h b/gst/gstindex.h
index fa6231b..255d378 100644 (file)
--- a/gst/gstindex.h
+++ b/gst/gstindex.h
@@ -168,7 +168,7 @@ struct _GstIndex {
   GHashTable           *writers;
   gint                  last_id;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstIndexClass {
@@ -189,7 +189,7 @@ struct _GstIndexClass {
   /* signals */
   void         (*entry_added)          (GstIndex *index, GstIndexEntry *entry);
 
-  GST_CLASS_PADDING;
+  gpointer _gst_reserved[GST_PADDING];;
 };
 
 GType                  gst_index_get_type              (void);
@@ -253,13 +253,13 @@ struct _GstIndexFactory {
   gchar *longdesc;            /* long description of the index (well, don't overdo it..) */
   GType type;                 /* unique GType of the index */
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstIndexFactoryClass {
   GstPluginFeatureClass parent; 
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType                  gst_index_factory_get_type      (void);

diff --git a/gst/gstinterface.h b/gst/gstinterface.h
index 2d1bc71..8cd5ba3 100644 (file)
--- a/gst/gstinterface.h
+++ b/gst/gstinterface.h
@@ -56,7 +56,7 @@ typedef struct _GstImplementsInterfaceClass {
   gboolean (* supported) (GstImplementsInterface *iface,
                          GType                   iface_type);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 } GstImplementsInterfaceClass;
 
 #define GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_CAST(obj, type, cast_t) \

diff --git a/gst/gstobject.h b/gst/gstobject.h
index 741d320..0cc5ddc 100644 (file)
--- a/gst/gstobject.h
+++ b/gst/gstobject.h
@@ -77,7 +77,7 @@ struct _GstObject {
 
   guint32      flags;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 /* signal_object is used to signal to the whole class */
@@ -99,7 +99,7 @@ struct _GstObjectClass {
   xmlNodePtr   (*save_thyself)         (GstObject *object, xmlNodePtr parent);
   void         (*restore_thyself)      (GstObject *object, xmlNodePtr self);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 #define GST_FLAGS(obj)                 (GST_OBJECT_CAST (obj)->flags)

diff --git a/gst/gstpad.h b/gst/gstpad.h
index d50f5b6..e651d4b 100644 (file)
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -173,13 +173,13 @@ struct _GstPad {
 
   GstPadTemplate       *padtemplate;   /* the template for this pad */
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstPadClass {
   GstObjectClass parent_class;
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstRealPad {
@@ -221,7 +221,7 @@ struct _GstRealPad {
 
   GstProbeDispatcher            probedisp;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstRealPadClass {
@@ -233,7 +233,7 @@ struct _GstRealPadClass {
   void                 (*linked)               (GstPad *pad, GstPad *peer);
   void                 (*unlinked)             (GstPad *pad, GstPad *peer);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstGhostPad {
@@ -241,13 +241,13 @@ struct _GstGhostPad {
 
   GstRealPad *realpad;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstGhostPadClass {
   GstPadClass parent_class;
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 
@@ -334,7 +334,7 @@ struct _GstPadTemplate {
   GstPadPresence   presence;
   GstCaps        *caps;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstPadTemplateClass {
@@ -343,7 +343,7 @@ struct _GstPadTemplateClass {
   /* signal callbacks */
   void (*pad_created)  (GstPadTemplate *templ, GstPad *pad);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 #ifdef G_HAVE_ISO_VARARGS

diff --git a/gst/gstpipeline.h b/gst/gstpipeline.h
index b634195..5dd5b11 100644 (file)
--- a/gst/gstpipeline.h
+++ b/gst/gstpipeline.h
@@ -41,13 +41,13 @@ typedef struct _GstPipelineClass GstPipelineClass;
 struct _GstPipeline {
   GstBin        bin;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstPipelineClass {
   GstBinClass parent_class;
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType          gst_pipeline_get_type           (void);

diff --git a/gst/gstplugin.h b/gst/gstplugin.h
index f1626c0..fa2510c 100644 (file)
--- a/gst/gstplugin.h
+++ b/gst/gstplugin.h
@@ -64,7 +64,7 @@ struct _GstPluginDesc {
   gchar *package;                      /* package plugin belongs to */
   gchar *origin;                       /* URL to provider of plugin */
   
-  GST_STRUCT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstPlugin {
@@ -77,7 +77,7 @@ struct _GstPlugin {
   gpointer     manager;                /* managing registry */
   GModule *    module;                 /* contains the module if the plugin is loaded */
 
-  GST_STRUCT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 #ifndef GST_PLUGIN_STATIC                              
@@ -93,7 +93,7 @@ GstPluginDesc gst_plugin_desc = {                     \
   license,                                             \
   package,                                             \
   origin,                                              \
-  GST_STRUCT_PADDING_INIT                              \
+  GST_PADDING_INIT                                      \
 };                                                     
 #define GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,package,origin)
 #else
@@ -113,7 +113,7 @@ _gst_plugin_static_init__ ##init (void)                     \
     license,                                           \
     package,                                           \
     origin,                                            \
-    GST_STRUCT_PADDING_INIT                            \
+    GST_PADDING_INIT                                   \
   };                                                   \
   _gst_plugin_register_static (&plugin_desc_);         \
 }                      

diff --git a/gst/gstpluginfeature.h b/gst/gstpluginfeature.h
index 760214c..6699407 100644 (file)
--- a/gst/gstpluginfeature.h
+++ b/gst/gstpluginfeature.h
@@ -50,7 +50,7 @@ struct _GstPluginFeature {
 
   gpointer      manager;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstPluginFeatureClass {
@@ -58,7 +58,7 @@ struct _GstPluginFeatureClass {
 
   void          (*unload_thyself)      (GstPluginFeature *feature);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 typedef struct {

diff --git a/gst/gstqueue.h b/gst/gstqueue.h
index c52d637..428c3e0 100644 (file)
--- a/gst/gstqueue.h
+++ b/gst/gstqueue.h
@@ -83,7 +83,7 @@ struct _GstQueue {
   GTimeVal *timeval;   /* the timeout for the queue locking */
   GAsyncQueue *events; /* upstream events get decoupled here */
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstQueueClass {
@@ -92,7 +92,7 @@ struct _GstQueueClass {
   /* signal callbacks */
   void (*full)         (GstQueue *queue);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType gst_queue_get_type (void);

diff --git a/gst/gstregistry.h b/gst/gstregistry.h
index 7889ef3..ed10727 100644 (file)
--- a/gst/gstregistry.h
+++ b/gst/gstregistry.h
@@ -86,7 +86,7 @@ struct _GstRegistry {
 
   GList        *paths;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstRegistryClass {
@@ -105,7 +105,7 @@ struct _GstRegistryClass {
   /* signals */
   void                         (*plugin_added)         (GstRegistry *registry, GstPlugin *plugin);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 

diff --git a/gst/gstscheduler.h b/gst/gstscheduler.h
index 22cbf76..9233c52 100644 (file)
--- a/gst/gstscheduler.h
+++ b/gst/gstscheduler.h
@@ -72,7 +72,7 @@ struct _GstScheduler {
 
   GList                        *schedulers;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstSchedulerClass {
@@ -105,7 +105,7 @@ struct _GstSchedulerClass {
   void                  (*object_sync)          (GstScheduler *sched, GstClock *clock, GstObject *object,
                                                 GstClockID id);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType                  gst_scheduler_get_type          (void);
@@ -161,13 +161,13 @@ struct _GstSchedulerFactory {
   gchar *longdesc;              /* long description of the scheduler (well, don't overdo it..) */
   GType type;                  /* unique GType of the scheduler */
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstSchedulerFactoryClass {
   GstPluginFeatureClass parent;
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType                  gst_scheduler_factory_get_type          (void);

diff --git a/gst/gstsystemclock.h b/gst/gstsystemclock.h
index 5f4170b..33c0353 100644 (file)
--- a/gst/gstsystemclock.h
+++ b/gst/gstsystemclock.h
@@ -45,13 +45,13 @@ struct _GstSystemClock {
   GMutex *      mutex;
   GCond *       cond;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstSystemClockClass {
   GstClockClass  parent_class;
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType                  gst_system_clock_get_type       (void);

diff --git a/gst/gstthread.h b/gst/gstthread.h
index 3d554e2..62142bc 100644 (file)
--- a/gst/gstthread.h
+++ b/gst/gstthread.h
@@ -63,7 +63,7 @@ struct _GstThread {
   GMutex       *lock;                  /* thread lock/condititon pairs */
   GCond        *cond;                  /* used to control the thread */
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstThreadClass {
@@ -72,7 +72,7 @@ struct _GstThreadClass {
   /* signals */
   void (*shutdown)     (GstThread *thread);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType  gst_thread_get_type     (void);

diff --git a/gst/gsttypefind.h b/gst/gsttypefind.h
index 5662133..994e09a 100644 (file)
--- a/gst/gsttypefind.h
+++ b/gst/gsttypefind.h
@@ -67,7 +67,7 @@ struct _GstTypeFind {
   guint64              (* get_length)                  (gpointer               data);
 
   /* <private> */
-  GST_STRUCT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstTypeFindFactory {
@@ -80,14 +80,14 @@ struct _GstTypeFindFactory {
   
   gpointer                     user_data;
     
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
                                                                                                                                                                          
 struct _GstTypeFindFactoryClass {
   GstPluginFeatureClass                parent;
   /* <private> */
     
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 /* typefind function interface */

diff --git a/gst/gsttypes.h b/gst/gsttypes.h
index ad4f029..b9e8fb1 100644 (file)
--- a/gst/gsttypes.h
+++ b/gst/gsttypes.h
@@ -63,11 +63,8 @@ typedef enum {
 #define GST_RANK_MARGINAL   64
 #define GST_RANK_NONE       0
 
-#define GST_STRUCT_PADDING  gpointer _gst_reserved[4];
-#define GST_CLASS_PADDING   gpointer _gst_reserved[4];
-#define GST_OBJECT_PADDING  gpointer _gst_reserved[4];
-
-#define GST_STRUCT_PADDING_INIT        {NULL, NULL, NULL, NULL}
+#define GST_PADDING 4
+#define GST_PADDING_INIT       { 0 }
 
 G_END_DECLS
 

diff --git a/gst/gsturi.h b/gst/gsturi.h
index 0d0a109..20118ab 100644 (file)
--- a/gst/gsturi.h
+++ b/gst/gsturi.h
@@ -73,7 +73,7 @@ struct _GstURIHandlerInterface {
   
   /* we might want to add functions here to query features, someone with gnome-vfs knowledge go ahead */
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 /* general URI functions */

diff --git a/gst/gstxml.h b/gst/gstxml.h
index 25bb32e..6c12c3e 100644 (file)
--- a/gst/gstxml.h
+++ b/gst/gstxml.h
@@ -49,7 +49,7 @@ struct _GstXML {
 
   xmlNsPtr ns;
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 typedef struct _GstXMLNs GstXMLNs;
@@ -61,7 +61,7 @@ struct _GstXMLClass {
   void (*object_loaded)         (GstXML *xml, GstObject *object, xmlNodePtr self);
   void (*object_saved)          (GstXML *xml, GstObject *object, xmlNodePtr self);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType          gst_xml_get_type        (void);

diff --git a/plugins/elements/gstqueue.h b/plugins/elements/gstqueue.h
index c52d637..428c3e0 100644 (file)
--- a/plugins/elements/gstqueue.h
+++ b/plugins/elements/gstqueue.h
@@ -83,7 +83,7 @@ struct _GstQueue {
   GTimeVal *timeval;   /* the timeout for the queue locking */
   GAsyncQueue *events; /* upstream events get decoupled here */
 
-  GST_OBJECT_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstQueueClass {
@@ -92,7 +92,7 @@ struct _GstQueueClass {
   /* signal callbacks */
   void (*full)         (GstQueue *queue);
 
-  GST_CLASS_PADDING
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType gst_queue_get_type (void);