From f9f0df62e801ba5a37550f820573575acc13ac93 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Mon, 22 Mar 2004 15:35:06 +0000 Subject: [PATCH] gst/gstvalue.h: Clean up a little bit. Original commit message from CVS: * gst/gstvalue.h: Clean up a little bit. --- ChangeLog | 4 ++ gst/gstvalue.h | 153 +++++++++++++++++++++++++++---------------------- 2 files changed, 90 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87fa529765..ef407ad5ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-03-22 Johan Dahlin + + * gst/gstvalue.h: Clean up a little bit. + 2004-03-21 Tim-Philipp Müller reviewed by Benjamin Otte diff --git a/gst/gstvalue.h b/gst/gstvalue.h index 6493ab5984..af8332eed7 100644 --- a/gst/gstvalue.h +++ b/gst/gstvalue.h @@ -25,26 +25,6 @@ G_BEGIN_DECLS -typedef int (* GstValueCompareFunc) (const GValue *value1, - const GValue *value2); -typedef char * (* GstValueSerializeFunc) (const GValue *value1); -typedef gboolean (* GstValueDeserializeFunc) (GValue *dest, const char *s); -typedef int (* GstValueUnionFunc) (GValue *dest, const GValue *value1, - const GValue *value2); -typedef int (* GstValueIntersectFunc) (GValue *dest, const GValue *value1, - const GValue *value2); - -typedef struct _GstValueTable GstValueTable; -struct _GstValueTable { - GType type; - GstValueCompareFunc compare; - GstValueSerializeFunc serialize; - GstValueDeserializeFunc deserialize; - - void *_gst_reserved [GST_PADDING]; -}; - - #define GST_MAKE_FOURCC(a,b,c,d) (guint32)((a)|(b)<<8|(c)<<16|(d)<<24) #define GST_STR_FOURCC(f) (guint32)(((f)[0])|((f)[1]<<8)|((f)[2]<<16)|((f)[3]<<24)) @@ -61,76 +41,115 @@ struct _GstValueTable { #define GST_VALUE_HOLDS_LIST(x) (G_VALUE_HOLDS(x, gst_type_list)) #define GST_VALUE_HOLDS_CAPS(x) (G_VALUE_HOLDS(x, GST_TYPE_CAPS)) -#define GST_TYPE_FOURCC gst_type_fourcc -#define GST_TYPE_INT_RANGE gst_type_int_range -#define GST_TYPE_DOUBLE_RANGE gst_type_double_range -#define GST_TYPE_LIST gst_type_list +#define GST_TYPE_FOURCC gst_type_fourcc +#define GST_TYPE_INT_RANGE gst_type_int_range +#define GST_TYPE_DOUBLE_RANGE gst_type_double_range +#define GST_TYPE_LIST gst_type_list -#define GST_VALUE_LESS_THAN (-1) -#define GST_VALUE_EQUAL 0 -#define GST_VALUE_GREATER_THAN 1 -#define GST_VALUE_UNORDERED 2 +#define GST_VALUE_LESS_THAN (-1) +#define GST_VALUE_EQUAL 0 +#define GST_VALUE_GREATER_THAN 1 +#define GST_VALUE_UNORDERED 2 + +typedef int (* GstValueCompareFunc) (const GValue *value1, + const GValue *value2); +typedef char * (* GstValueSerializeFunc) (const GValue *value1); +typedef gboolean (* GstValueDeserializeFunc) (GValue *dest, + const char *s); +typedef int (* GstValueUnionFunc) (GValue *dest, + const GValue *value1, + const GValue *value2); +typedef int (* GstValueIntersectFunc) (GValue *dest, + const GValue *value1, + const GValue *value2); + +typedef struct _GstValueTable GstValueTable; +struct _GstValueTable { + GType type; + GstValueCompareFunc compare; + GstValueSerializeFunc serialize; + GstValueDeserializeFunc deserialize; + + void *_gst_reserved [GST_PADDING]; +}; extern GType gst_type_fourcc; extern GType gst_type_int_range; extern GType gst_type_double_range; extern GType gst_type_list; -/* list */ +void gst_value_register (const GstValueTable *table); +void gst_value_init_and_copy (GValue *dest, + const GValue *src); -void gst_value_list_prepend_value (GValue *value, const GValue *prepend_value); -void gst_value_list_append_value (GValue *value, const GValue *append_value); -guint gst_value_list_get_size (const GValue *value); -G_CONST_RETURN GValue *gst_value_list_get_value (const GValue *value, guint index); -void gst_value_list_concat (GValue *dest, const GValue *value1, const GValue *value2); +gchar * gst_value_serialize (const GValue *value); +gboolean gst_value_deserialize (GValue *dest, + const gchar *src); + +/* list */ +void gst_value_list_append_value (GValue *value, + const GValue *append_value); +void gst_value_list_prepend_value (GValue *value, + const GValue *prepend_value); +void gst_value_list_concat (GValue *dest, + const GValue *value1, + const GValue *value2); +guint gst_value_list_get_size (const GValue *value); +G_CONST_RETURN GValue * gst_value_list_get_value (const GValue *value, + guint index); /* fourcc */ - -void gst_value_set_fourcc (GValue *value, guint32 fourcc); -guint32 gst_value_get_fourcc (const GValue *value); +void gst_value_set_fourcc (GValue *value, + guint32 fourcc); +guint32 gst_value_get_fourcc (const GValue *value); /* int range */ - -void gst_value_set_int_range (GValue *value, int start, int end); -int gst_value_get_int_range_min (const GValue *value); -int gst_value_get_int_range_max (const GValue *value); +void gst_value_set_int_range (GValue *value, + int start, + int end); +int gst_value_get_int_range_min (const GValue *value); +int gst_value_get_int_range_max (const GValue *value); /* double range */ - -void gst_value_set_double_range (GValue *value, double start, double end); -double gst_value_get_double_range_min (const GValue *value); -double gst_value_get_double_range_max (const GValue *value); +void gst_value_set_double_range (GValue *value, + double start, + double end); +double gst_value_get_double_range_min (const GValue *value); +double gst_value_get_double_range_max (const GValue *value); /* caps */ -G_CONST_RETURN GstCaps *gst_value_get_caps (const GValue *value); -void gst_value_set_caps (GValue *value, const GstCaps *caps); +G_CONST_RETURN GstCaps * gst_value_get_caps (const GValue *value); +void gst_value_set_caps (GValue *value, + const GstCaps *caps); /* compare */ - -gboolean gst_value_can_compare (const GValue *value1, const GValue *value2); -int gst_value_compare (const GValue *value1, const GValue *value2); +int gst_value_compare (const GValue *value1, + const GValue *value2); +gboolean gst_value_can_compare (const GValue *value1, + const GValue *value2); /* union */ - -gboolean gst_value_can_union (const GValue *value1, const GValue *value2); -gboolean gst_value_union (GValue *dest, const GValue *value1, const GValue *value2); -void gst_value_register_union_func (GType type1, GType type2, GstValueUnionFunc func); +gboolean gst_value_union (GValue *dest, + const GValue *value1, + const GValue *value2); +gboolean gst_value_can_union (const GValue *value1, + const GValue *value2); +void gst_value_register_union_func (GType type1, + GType type2, + GstValueUnionFunc func); /* intersection */ +gboolean gst_value_intersect (GValue *dest, + const GValue *value1, + const GValue *value2); +gboolean gst_value_can_intersect (const GValue *value1, + const GValue *value2); +void gst_value_register_intersect_func (GType type1, + GType type2, + GstValueIntersectFunc func); -gboolean gst_value_can_intersect (const GValue *value1, const GValue *value2); -gboolean gst_value_intersect (GValue *dest, const GValue *value1, const GValue *value2); -void gst_value_register_intersect_func (GType type1, GType type2, GstValueIntersectFunc func); - -/* */ - -void gst_value_register (const GstValueTable *table); -void gst_value_init_and_copy (GValue *dest, const GValue *src); -void _gst_value_initialize (void); - -gchar * gst_value_serialize (const GValue *value); -gboolean gst_value_deserialize (GValue *dest, const gchar *src); - +/* private */ +void _gst_value_initialize (void); G_END_DECLS