mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +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 stop;
GstBufferPoolFlags flags;
gpointer _gst_reserved[GST_PADDING];
} GstBufferPoolParams;
/**

3
gst/gstbus.h
View file

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

28
gst/gstchildproxy.h
View file

@ -54,7 +54,7 @@ struct _GstChildProxyInterface
GTypeInterface parent;
/* methods */
GstObject *(*get_child_by_index) (GstChildProxy * parent, guint index);
GstObject * (*get_child_by_index) (GstChildProxy * parent, guint index);
guint (*get_children_count) (GstChildProxy * parent);
/*< private >*/
/* signals */
@ -67,22 +67,32 @@ struct _GstChildProxyInterface
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_index (GstChildProxy * parent, guint index);
GstObject * gst_child_proxy_get_child_by_name (GstChildProxy * parent, const gchar * name);
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,
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,
const gchar * first_property_name, va_list var_args);
void gst_child_proxy_get (GstObject * object, const gchar * first_property_name,
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;
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,
const gchar * first_property_name, va_list var_args);
void gst_child_proxy_set (GstObject * object, const gchar * first_property_name,
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;
void gst_child_proxy_child_added (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 */
#define read_seqbegin(clock) \
g_atomic_int_get (&clock->ABI.priv->post_count);
g_atomic_int_get (&clock->priv->post_count);
static inline gboolean
read_seqretry (GstClock * clock, gint seq)
{
/* 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;
/* wait for the writer to finish and retry */
@ -158,12 +158,12 @@ read_seqretry (GstClock * clock, gint seq)
#define write_seqlock(clock) \
G_STMT_START { \
GST_OBJECT_LOCK (clock); \
g_atomic_int_inc (&clock->ABI.priv->pre_count); \
g_atomic_int_inc (&clock->priv->pre_count); \
} G_STMT_END;
#define write_sequnlock(clock) \
G_STMT_START { \
g_atomic_int_inc (&clock->ABI.priv->post_count); \
g_atomic_int_inc (&clock->priv->post_count); \
GST_OBJECT_UNLOCK (clock); \
} G_STMT_END;
@ -695,7 +695,7 @@ gst_clock_init (GstClock * clock)
clock->entries_changed = g_cond_new ();
clock->stats = FALSE;
clock->ABI.priv =
clock->priv =
G_TYPE_INSTANCE_GET_PRIVATE (clock, GST_TYPE_CLOCK, GstClockPrivate);
clock->internal_calibration = 0;

7
gst/gstclock.h
View file

@ -371,6 +371,8 @@ struct _GstClockEntry {
GDestroyNotify destroy_data;
gboolean unscheduled;
gboolean woken_up;
gpointer _gst_reserved[GST_PADDING];
};
#include <gst/gstobject.h>
@ -475,10 +477,9 @@ struct _GstClock {
GstClockID clockid;
/*< private >*/
union {
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);
/* 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);
G_END_DECLS

14
gst/gstdatetime.h
View file

@ -45,21 +45,21 @@ gint gst_date_time_get_second (const GstDateTime * datetime);
gint gst_date_time_get_microsecond (const GstDateTime * datetime);
gfloat gst_date_time_get_time_zone_offset (const GstDateTime * datetime);
GstDateTime *gst_date_time_new_from_unix_epoch_local_time (gint64 secs);
GstDateTime *gst_date_time_new_from_unix_epoch_utc (gint64 secs);
GstDateTime *gst_date_time_new_local_time (gint year, gint month,
GstDateTime * gst_date_time_new_from_unix_epoch_local_time (gint64 secs);
GstDateTime * gst_date_time_new_from_unix_epoch_utc (gint64 secs);
GstDateTime * gst_date_time_new_local_time (gint year, gint month,
gint day, gint hour,
gint minute,
gdouble seconds);
GstDateTime *gst_date_time_new (gfloat tzoffset,
GstDateTime * gst_date_time_new (gfloat tzoffset,
gint year, gint month,
gint day, gint hour,
gint minute,
gdouble seconds);
GstDateTime *gst_date_time_new_now_local_time (void);
GstDateTime *gst_date_time_new_now_utc (void);
GstDateTime * gst_date_time_new_now_local_time (void);
GstDateTime * gst_date_time_new_now_utc (void);
GstDateTime *gst_date_time_ref (GstDateTime * datetime);
GstDateTime * gst_date_time_ref (GstDateTime * datetime);
void gst_date_time_unref (GstDateTime * datetime);
G_END_DECLS

2
gst/gstmemory.h
View file

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

2
gst/gstmeta.h
View file

@ -106,6 +106,8 @@ struct _GstMetaInfo {
GstMetaFreeFunction free_func;
GstMetaCopyFunction copy_func;
GstMetaTransformFunction transform_func;
gpointer _gst_reserved[GST_PADDING];
};
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);
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);
GstControlSource * gst_object_get_control_source (GstObject *object, const gchar * property_name);
gboolean gst_object_set_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);
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);
GValue * gst_object_get_value (GstObject * object, const gchar * property_name,
GstClockTime timestamp);
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);
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;
guint64 offset;
guint size;
gpointer _gst_reserved[GST_PADDING];
} GstPadProbeInfo;
#define GST_PAD_PROBE_INFO_TYPE(d) ((d)->type)

2
gst/gstpipeline.h
View file

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

2
gst/gstplugin.h
View file

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

2
gst/gstpluginfeature.h
View file

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

6
gst/gstpluginloader.h
View file

@ -26,9 +26,9 @@ G_BEGIN_DECLS
typedef struct _GstPluginLoader GstPluginLoader;
typedef struct _GstPluginLoaderFuncs {
GstPluginLoader * (*create)(GstRegistry *registry);
gboolean (*destroy)(GstPluginLoader *loader);
gboolean (*load)(GstPluginLoader *loader, const gchar *filename,
GstPluginLoader * (*create) (GstRegistry *registry);
gboolean (*destroy) (GstPluginLoader *loader);
gboolean (*load) (GstPluginLoader *loader, const gchar *filename,
off_t file_size, time_t file_mtime);
} GstPluginLoaderFuncs;

9
gst/gstutils.h
View file

@ -949,11 +949,16 @@ gpointer gst_util_array_binary_search (gpointer array, guint
GstSearchMode mode, gconstpointer search_data,
gpointer user_data);
/* fraction operations */
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_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);

4
gst/gstvalue.h
View file

@ -418,7 +418,7 @@ struct _GstValueTable {
GstValueDeserializeFunc deserialize;
/*< private >*/
void *_gst_reserved [GST_PADDING];
gpointer _gst_reserved [GST_PADDING];
};
GType gst_int_range_get_type (void);
@ -501,7 +501,7 @@ void gst_value_set_fraction (GValue *value,
gint numerator,
gint denominator);
gint gst_value_get_fraction_numerator (const GValue *value);
gint gst_value_get_fraction_denominator(const GValue *value);
gint gst_value_get_fraction_denominator (const GValue *value);
gboolean gst_value_fraction_multiply (GValue *product,
const GValue *factor1,
const GValue *factor2);