.h: fix header files

Ensure correct indentation and retab
Make sure all structure have padding
This commit is contained in:
Wim Taymans 2011-11-11 17:17:43 +01:00
parent 4a7c3b929a
commit 841ad590b9
19 changed files with 462 additions and 443 deletions

View file

@ -264,7 +264,7 @@ struct _GstBaseParseClass {
GstBuffer * buffer);
/*< private >*/
gpointer _gst_reserved[GST_PADDING_LARGE - 2];
gpointer _gst_reserved[GST_PADDING_LARGE];
};
GType gst_base_parse_get_type (void);

View file

@ -55,8 +55,8 @@ void gst_bit_reader_free (GstBitReader *reader);
void gst_bit_reader_init (GstBitReader *reader, const guint8 *data, guint size);
gboolean gst_bit_reader_set_pos (GstBitReader *reader, guint pos);
guint gst_bit_reader_get_pos (const GstBitReader *reader);
guint gst_bit_reader_get_remaining (const GstBitReader *reader);
guint gst_bit_reader_get_size (const GstBitReader *reader);

View file

@ -52,8 +52,8 @@ void gst_byte_reader_free (GstByteReader *reader);
void gst_byte_reader_init (GstByteReader *reader, const guint8 *data, guint size);
gboolean gst_byte_reader_set_pos (GstByteReader *reader, guint pos);
guint gst_byte_reader_get_pos (const GstByteReader *reader);
guint gst_byte_reader_get_remaining (const GstByteReader *reader);
guint gst_byte_reader_get_size (const GstByteReader *reader);

View file

@ -57,7 +57,8 @@ GstByteWriter * gst_byte_writer_new_with_data (guint8 *data, guint size, gboolea
void gst_byte_writer_init (GstByteWriter *writer);
void gst_byte_writer_init_with_size (GstByteWriter *writer, guint size, gboolean fixed);
void gst_byte_writer_init_with_data (GstByteWriter *writer, guint8 *data, guint size, gboolean initialized);
void gst_byte_writer_init_with_data (GstByteWriter *writer, guint8 *data,
guint size, gboolean initialized);
void gst_byte_writer_free (GstByteWriter *writer);
guint8 * gst_byte_writer_free_and_get_data (GstByteWriter *writer);

View file

@ -101,7 +101,7 @@ struct _GstCollectData
gint refcount;
} ABI;
/* adding + 0 to mark ABI change to be undone later */
gpointer _gst_reserved[GST_PADDING + 0];
gpointer _gst_reserved[GST_PADDING];
} abidata;
};
@ -165,7 +165,7 @@ struct _GstCollectPads {
GstCollectPadsPrivate *priv;
} ABI;
/* adding + 0 to mark ABI change to be undone later */
gpointer _gst_reserved[GST_PADDING + 0];
gpointer _gst_reserved[GST_PADDING];
} abidata;
};

View file

@ -318,8 +318,7 @@ struct _GstCollectPads2 {
GCond *evt_cond;
guint32 evt_cookie;
gpointer _gst_reserved[GST_PADDING + 0];
gpointer _gst_reserved[GST_PADDING];
};
struct _GstCollectPads2Class {
@ -335,20 +334,26 @@ GType gst_collect_pads2_get_type(void);
GstCollectPads2* gst_collect_pads2_new (void);
/* set the callbacks */
void gst_collect_pads2_set_function (GstCollectPads2 *pads, GstCollectPads2Function func,
void gst_collect_pads2_set_function (GstCollectPads2 *pads,
GstCollectPads2Function func,
gpointer user_data);
void gst_collect_pads2_set_buffer_function (GstCollectPads2 *pads,
GstCollectPads2BufferFunction func, gpointer user_data);
GstCollectPads2BufferFunction func,
gpointer user_data);
void gst_collect_pads2_set_event_function (GstCollectPads2 *pads,
GstCollectPads2EventFunction func, gpointer user_data);
GstCollectPads2EventFunction func,
gpointer user_data);
void gst_collect_pads2_set_compare_function (GstCollectPads2 *pads,
GstCollectPads2CompareFunction func, gpointer user_data);
void gst_collect_pads2_set_clip_function (GstCollectPads2 *pads, GstCollectPads2ClipFunction clipfunc,
GstCollectPads2CompareFunction func,
gpointer user_data);
void gst_collect_pads2_set_clip_function (GstCollectPads2 *pads,
GstCollectPads2ClipFunction clipfunc,
gpointer user_data);
/* pad management */
GstCollectData2* gst_collect_pads2_add_pad (GstCollectPads2 *pads, GstPad *pad, guint size);
GstCollectData2* gst_collect_pads2_add_pad_full (GstCollectPads2 *pads, GstPad *pad, guint size, GstCollectData2DestroyNotify destroy_notify,
GstCollectData2* gst_collect_pads2_add_pad_full (GstCollectPads2 *pads, GstPad *pad, guint size,
GstCollectData2DestroyNotify destroy_notify,
gboolean lock);
gboolean gst_collect_pads2_remove_pad (GstCollectPads2 *pads, GstPad *pad);
gboolean gst_collect_pads2_is_active (GstCollectPads2 *pads, GstPad *pad);

View file

@ -81,6 +81,7 @@ struct _GstInterpolationControlSource {
/* <private> */
GMutex *lock;
GstInterpolationControlSourcePrivate *priv;
gpointer _gst_reserved[GST_PADDING];
};
@ -95,11 +96,18 @@ GType gst_interpolation_control_source_get_type (void);
/* Functions */
GstInterpolationControlSource *gst_interpolation_control_source_new (void);
gboolean gst_interpolation_control_source_set_interpolation_mode (GstInterpolationControlSource *self, GstInterpolateMode mode);
gboolean gst_interpolation_control_source_set (GstInterpolationControlSource * self, GstClockTime timestamp, const GValue * value);
gboolean gst_interpolation_control_source_set_from_list (GstInterpolationControlSource * self, const GSList * timedvalues);
gboolean gst_interpolation_control_source_unset (GstInterpolationControlSource * self, GstClockTime timestamp);
GstInterpolationControlSource *
gst_interpolation_control_source_new (void);
gboolean gst_interpolation_control_source_set_interpolation_mode
(GstInterpolationControlSource *self,
GstInterpolateMode mode);
gboolean gst_interpolation_control_source_set (GstInterpolationControlSource * self,
GstClockTime timestamp,
const GValue * value);
gboolean gst_interpolation_control_source_set_from_list (GstInterpolationControlSource * self,
const GSList * timedvalues);
gboolean gst_interpolation_control_source_unset (GstInterpolationControlSource * self,
GstClockTime timestamp);
void gst_interpolation_control_source_unset_all (GstInterpolationControlSource *self);
GList * gst_interpolation_control_source_get_all (GstInterpolationControlSource * self);
gint gst_interpolation_control_source_get_count (GstInterpolationControlSource * self);

View file

@ -95,14 +95,18 @@ gint gst_net_address_set_address_bytes (GstNetAddress *naddr, GstNetT
guint8 address[16], guint16 port);
GstNetType gst_net_address_get_net_type (const GstNetAddress *naddr);
gboolean gst_net_address_get_ip4_address (const GstNetAddress *naddr, guint32 *address, guint16 *port);
gboolean gst_net_address_get_ip6_address (const GstNetAddress *naddr, guint8 address[16], guint16 *port);
gint gst_net_address_get_address_bytes (const GstNetAddress *naddr, guint8 address[16], guint16 *port);
gboolean gst_net_address_get_ip4_address (const GstNetAddress *naddr,
guint32 *address, guint16 *port);
gboolean gst_net_address_get_ip6_address (const GstNetAddress *naddr,
guint8 address[16], guint16 *port);
gint gst_net_address_get_address_bytes (const GstNetAddress *naddr,
guint8 address[16], guint16 *port);
gboolean gst_net_address_equal (const GstNetAddress *naddr1,
const GstNetAddress *naddr2);
gint gst_net_address_to_string (const GstNetAddress *naddr, gchar *dest, gsize len);
gint gst_net_address_to_string (const GstNetAddress *naddr,
gchar *dest, gsize len);
G_END_DECLS

View file

@ -86,7 +86,7 @@ struct _GstNetClientClock {
/*< private >*/
GstNetClientClockPrivate *priv;
gpointer _gst_reserved[GST_PADDING - 1];
gpointer _gst_reserved[GST_PADDING];
};
struct _GstNetClientClockClass {

View file

@ -63,7 +63,6 @@ typedef struct _GstNetTimeProvider GstNetTimeProvider;
typedef struct _GstNetTimeProviderClass GstNetTimeProviderClass;
typedef struct _GstNetTimeProviderPrivate GstNetTimeProviderPrivate;
/**
* GstNetTimeProvider:
*
@ -94,6 +93,8 @@ struct _GstNetTimeProvider {
struct _GstNetTimeProviderClass {
GstObjectClass parent_class;
gpointer _gst_reserved[GST_PADDING];
};
GType gst_net_time_provider_get_type (void);