mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-05 15:08:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

.h: fix header files

Browse source 
Ensure correct indentation and :retab.
Make sure all structures have padding
Fix up some old ABI additions.
This commit is contained in:
Wim Taymans 2011-11-11 16:52:41 +01:00
parent 870a5b0e12
commit 4a7c3b929a
35 changed files with 768 additions and 734 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/gstbufferpool.h
View file

@ -89,6 +89,8 @@ typedef struct _GstBufferPoolParams {
gint64 start; gint64 start;
gint64 stop; gint64 stop;
GstBufferPoolFlags flags; GstBufferPoolFlags flags;
gpointer _gst_reserved[GST_PADDING];
} GstBufferPoolParams; } GstBufferPoolParams;
/** /**

3
gst/gstbus.h
View file

@ -127,7 +127,8 @@ struct _GstBus
/*< private >*/ /*< private >*/
GstBusPrivate *priv; GstBusPrivate *priv;
gpointer _gst_reserved[GST_PADDING - 1];
gpointer _gst_reserved[GST_PADDING];
}; };
struct _GstBusClass struct _GstBusClass

24
gst/gstchildproxy.h
View file

@ -68,21 +68,31 @@ struct _GstChildProxyInterface
GType gst_child_proxy_get_type (void); GType gst_child_proxy_get_type (void);
GstObject * gst_child_proxy_get_child_by_name (GstChildProxy * parent, const gchar * name); GstObject * gst_child_proxy_get_child_by_name (GstChildProxy * parent, const gchar * name);
GstObject *gst_child_proxy_get_child_by_index (GstChildProxy * parent, guint index);
guint gst_child_proxy_get_children_count (GstChildProxy * parent); guint gst_child_proxy_get_children_count (GstChildProxy * parent);
GstObject * gst_child_proxy_get_child_by_index (GstChildProxy * parent, guint index);
gboolean gst_child_proxy_lookup (GstObject *object, const gchar *name, gboolean gst_child_proxy_lookup (GstObject *object, const gchar *name,
GstObject **target, GParamSpec **pspec); GstObject **target, GParamSpec **pspec);
void gst_child_proxy_get_property (GstObject * object, const gchar *name, GValue *value);
void gst_child_proxy_get_property (GstObject * object, const gchar *name,
GValue *value);
void gst_child_proxy_get_valist (GstObject * object, void gst_child_proxy_get_valist (GstObject * object,
const gchar * first_property_name, va_list var_args); const gchar * first_property_name,
void gst_child_proxy_get (GstObject * object, const gchar * first_property_name, va_list var_args);
void gst_child_proxy_get (GstObject * object,
const gchar * first_property_name,
...) G_GNUC_NULL_TERMINATED; ...) G_GNUC_NULL_TERMINATED;
void gst_child_proxy_set_property (GstObject * object, const gchar *name, const GValue *value);
void gst_child_proxy_set_property (GstObject * object, const gchar *name,
const GValue *value);
void gst_child_proxy_set_valist (GstObject* object, void gst_child_proxy_set_valist (GstObject* object,
const gchar * first_property_name, va_list var_args); const gchar * first_property_name,
void gst_child_proxy_set (GstObject * object, const gchar * first_property_name, va_list var_args);
void gst_child_proxy_set (GstObject * object,
const gchar * first_property_name,
...) G_GNUC_NULL_TERMINATED; ...) G_GNUC_NULL_TERMINATED;
void gst_child_proxy_child_added (GstObject * object, GstObject * child); void gst_child_proxy_child_added (GstObject * object, GstObject * child);
void gst_child_proxy_child_removed (GstObject * object, GstObject * child); void gst_child_proxy_child_removed (GstObject * object, GstObject * child);

10
gst/gstclock.c
View file

@ -140,13 +140,13 @@ struct _GstClockPrivate
/* seqlocks */ /* seqlocks */
#define read_seqbegin(clock) \ #define read_seqbegin(clock) \
g_atomic_int_get (&clock->ABI.priv->post_count); g_atomic_int_get (&clock->priv->post_count);
static inline gboolean static inline gboolean
read_seqretry (GstClock * clock, gint seq) read_seqretry (GstClock * clock, gint seq)
{ {
/* no retry if the seqnum did not change */ /* no retry if the seqnum did not change */
if (G_LIKELY (seq == g_atomic_int_get (&clock->ABI.priv->pre_count))) if (G_LIKELY (seq == g_atomic_int_get (&clock->priv->pre_count)))
return FALSE; return FALSE;
/* wait for the writer to finish and retry */ /* wait for the writer to finish and retry */
@ -158,12 +158,12 @@ read_seqretry (GstClock * clock, gint seq)
#define write_seqlock(clock) \ #define write_seqlock(clock) \
G_STMT_START { \ G_STMT_START { \
GST_OBJECT_LOCK (clock); \ GST_OBJECT_LOCK (clock); \
g_atomic_int_inc (&clock->ABI.priv->pre_count); \ g_atomic_int_inc (&clock->priv->pre_count); \
} G_STMT_END; } G_STMT_END;
#define write_sequnlock(clock) \ #define write_sequnlock(clock) \
G_STMT_START { \ G_STMT_START { \
g_atomic_int_inc (&clock->ABI.priv->post_count); \ g_atomic_int_inc (&clock->priv->post_count); \
GST_OBJECT_UNLOCK (clock); \ GST_OBJECT_UNLOCK (clock); \
} G_STMT_END; } G_STMT_END;
@ -695,7 +695,7 @@ gst_clock_init (GstClock * clock)
clock->entries_changed = g_cond_new (); clock->entries_changed = g_cond_new ();
clock->stats = FALSE; clock->stats = FALSE;
clock->ABI.priv = clock->priv =
G_TYPE_INSTANCE_GET_PRIVATE (clock, GST_TYPE_CLOCK, GstClockPrivate); G_TYPE_INSTANCE_GET_PRIVATE (clock, GST_TYPE_CLOCK, GstClockPrivate);
clock->internal_calibration = 0; clock->internal_calibration = 0;

7
gst/gstclock.h
View file

@ -371,6 +371,8 @@ struct _GstClockEntry {
GDestroyNotify destroy_data; GDestroyNotify destroy_data;
gboolean unscheduled; gboolean unscheduled;
gboolean woken_up; gboolean woken_up;
gpointer _gst_reserved[GST_PADDING];
}; };
#include <gst/gstobject.h> #include <gst/gstobject.h>
@ -475,10 +477,9 @@ struct _GstClock {
GstClockID clockid; GstClockID clockid;
/*< private >*/ /*< private >*/
union {
GstClockPrivate *priv; GstClockPrivate *priv;
GstClockTime _gst_reserved[GST_PADDING];
} ABI; gpointer _gst_reserved[GST_PADDING];
}; };
/** /**

6
gst/gstcontrolsource.h
View file

@ -156,9 +156,11 @@ struct _GstControlSourceClass
GType gst_control_source_get_type (void); GType gst_control_source_get_type (void);
/* Functions */ /* Functions */
gboolean gst_control_source_get_value (GstControlSource *self, GstClockTime timestamp,
GValue *value);
gboolean gst_control_source_get_value_array (GstControlSource *self, GstClockTime timestamp,
GstValueArray *value_array);
gboolean gst_control_source_get_value (GstControlSource *self, GstClockTime timestamp, GValue *value);
gboolean gst_control_source_get_value_array (GstControlSource *self, GstClockTime timestamp, GstValueArray *value_array);
gboolean gst_control_source_bind (GstControlSource *self, GParamSpec *pspec); gboolean gst_control_source_bind (GstControlSource *self, GParamSpec *pspec);
G_END_DECLS G_END_DECLS

2
gst/gstmemory.h
View file

@ -265,6 +265,8 @@ struct _GstMemoryInfo {
GstMemoryIsSpanFunction is_span; GstMemoryIsSpanFunction is_span;
gpointer user_data; gpointer user_data;
gpointer _gst_reserved[GST_PADDING];
}; };
/* allocators */ /* allocators */

2
gst/gstmeta.h
View file

@ -106,6 +106,8 @@ struct _GstMetaInfo {
GstMetaFreeFunction free_func; GstMetaFreeFunction free_func;
GstMetaCopyFunction copy_func; GstMetaCopyFunction copy_func;
GstMetaTransformFunction transform_func; GstMetaTransformFunction transform_func;
gpointer _gst_reserved[GST_PADDING];
}; };
const GstMetaInfo * gst_meta_register (const gchar *api, const gchar *impl, const GstMetaInfo * gst_meta_register (const gchar *api, const gchar *impl,

19
gst/gstobject.h
View file

@ -242,14 +242,21 @@ gboolean gst_object_sync_values (GstObject * object, GstClockTime timestamp);
gboolean gst_object_has_active_controlled_properties (GstObject *object); gboolean gst_object_has_active_controlled_properties (GstObject *object);
void gst_object_set_controlled_properties_disabled (GstObject *object, gboolean disabled); void gst_object_set_controlled_properties_disabled (GstObject *object, gboolean disabled);
void gst_object_set_controlled_property_disabled (GstObject *object, const gchar * property_name, gboolean disabled); void gst_object_set_controlled_property_disabled (GstObject *object,
const gchar * property_name,
gboolean disabled);
gboolean gst_object_set_control_source (GstObject *object, const gchar * property_name, GstControlSource *csource); gboolean gst_object_set_control_source (GstObject *object, const gchar * property_name,
GstControlSource * gst_object_get_control_source (GstObject *object, const gchar * property_name); GstControlSource *csource);
GstControlSource *
gst_object_get_control_source (GstObject *object, const gchar * property_name);
GValue *gst_object_get_value (GstObject * object, const gchar * property_name, GstClockTime timestamp); GValue * gst_object_get_value (GstObject * object, const gchar * property_name,
gboolean gst_object_get_value_arrays (GstObject * object, GstClockTime timestamp, GSList * value_arrays); GstClockTime timestamp);
gboolean gst_object_get_value_array (GstObject * object, GstClockTime timestamp, GstValueArray * value_array); gboolean gst_object_get_value_arrays (GstObject * object, GstClockTime timestamp,
GSList * value_arrays);
gboolean gst_object_get_value_array (GstObject * object, GstClockTime timestamp,
GstValueArray * value_array);
GstClockTime gst_object_get_control_rate (GstObject * object); GstClockTime gst_object_get_control_rate (GstObject * object);
void gst_object_set_control_rate (GstObject * object, GstClockTime control_rate); void gst_object_set_control_rate (GstObject * object, GstClockTime control_rate);

2
gst/gstpad.h
View file

@ -520,6 +520,8 @@ typedef struct
gpointer data; gpointer data;
guint64 offset; guint64 offset;
guint size; guint size;
gpointer _gst_reserved[GST_PADDING];
} GstPadProbeInfo; } GstPadProbeInfo;
#define GST_PAD_PROBE_INFO_TYPE(d) ((d)->type) #define GST_PAD_PROBE_INFO_TYPE(d) ((d)->type)

2
gst/gstpipeline.h
View file

@ -78,7 +78,7 @@ struct _GstPipeline {
/*< private >*/ /*< private >*/
GstPipelinePrivate *priv; GstPipelinePrivate *priv;
gpointer _gst_reserved[GST_PADDING-1]; gpointer _gst_reserved[GST_PADDING];
}; };
struct _GstPipelineClass { struct _GstPipelineClass {

2
gst/gstplugin.h
View file

@ -213,6 +213,7 @@ struct _GstPlugin {
* that matches the plugin's basename */ * that matches the plugin's basename */
GstPluginPrivate *priv; GstPluginPrivate *priv;
gpointer _gst_reserved[GST_PADDING]; gpointer _gst_reserved[GST_PADDING];
}; };
@ -346,7 +347,6 @@ void gst_plugin_add_dependency (GstPlugin * plugin,
const gchar ** paths, const gchar ** paths,
const gchar ** names, const gchar ** names,
GstPluginDependencyFlags flags); GstPluginDependencyFlags flags);
void gst_plugin_add_dependency_simple (GstPlugin * plugin, void gst_plugin_add_dependency_simple (GstPlugin * plugin,
const gchar * env_vars, const gchar * env_vars,
const gchar * paths, const gchar * paths,

2
gst/gstpluginfeature.h
View file

@ -100,7 +100,7 @@ struct _GstPluginFeature {
GstPlugin *plugin; /* weak ref */ GstPlugin *plugin; /* weak ref */
/*< private >*/ /*< private >*/
gpointer _gst_reserved[GST_PADDING - 1]; gpointer _gst_reserved[GST_PADDING];
}; };
struct _GstPluginFeatureClass { struct _GstPluginFeatureClass {

9
gst/gstutils.h
View file

@ -949,11 +949,16 @@ gpointer gst_util_array_binary_search (gpointer array, guint
GstSearchMode mode, gconstpointer search_data, GstSearchMode mode, gconstpointer search_data,
gpointer user_data); gpointer user_data);
/* fraction operations */
gint gst_util_greatest_common_divisor (gint a, gint b); gint gst_util_greatest_common_divisor (gint a, gint b);
void gst_util_fraction_to_double (gint src_n, gint src_d, gdouble *dest); void gst_util_fraction_to_double (gint src_n, gint src_d, gdouble *dest);
void gst_util_double_to_fraction (gdouble src, gint *dest_n, gint *dest_d); void gst_util_double_to_fraction (gdouble src, gint *dest_n, gint *dest_d);
gboolean gst_util_fraction_multiply (gint a_n, gint a_d, gint b_n, gint b_d, gint *res_n, gint *res_d);
gboolean gst_util_fraction_add (gint a_n, gint a_d, gint b_n, gint b_d, gint *res_n, gint *res_d); gboolean gst_util_fraction_multiply (gint a_n, gint a_d, gint b_n, gint b_d,
gint *res_n, gint *res_d);
gboolean gst_util_fraction_add (gint a_n, gint a_d, gint b_n, gint b_d,
gint *res_n, gint *res_d);
gint gst_util_fraction_compare (gint a_n, gint a_d, gint b_n, gint b_d); gint gst_util_fraction_compare (gint a_n, gint a_d, gint b_n, gint b_d);

2
gst/gstvalue.h
View file

@ -418,7 +418,7 @@ struct _GstValueTable {
GstValueDeserializeFunc deserialize; GstValueDeserializeFunc deserialize;
/*< private >*/ /*< private >*/
void *_gst_reserved [GST_PADDING]; gpointer _gst_reserved [GST_PADDING];
}; };
GType gst_int_range_get_type (void); GType gst_int_range_get_type (void);