diff options
| author | David Schleef <ds@schleef.org> | 2003-12-22 01:39:35 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-22 01:39:35 +0000 |
| commit | 8c9cd079d4f9a516ca52b2c44432ab8f3b19ec71 (patch) | |
| tree | f59378894f2eb1186291d5dd566d10ca34774715 /gst/gstvalue.h | |
| parent | 54b3850775db36acf0fabbe89861592647b86af4 (diff) | |
Merge CAPS branch
Original commit message from CVS:
Merge CAPS branch
Diffstat (limited to 'gst/gstvalue.h')
| -rw-r--r-- | gst/gstvalue.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gst/gstvalue.h b/gst/gstvalue.h index 2a6f2962a..6c19291d7 100644 --- a/gst/gstvalue.h +++ b/gst/gstvalue.h @@ -21,9 +21,7 @@ #define __GST_VALUE_H__ #include <gst/gstconfig.h> -#if 0 #include <gst/gstcaps2.h> -#endif G_BEGIN_DECLS @@ -76,13 +74,11 @@ 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); -#if 0 -G_CONST_RETURN GstCaps2 *gst_value_get_caps (const GValue *value); -void gst_value_set_caps (GValue *calue, const GstCaps2 *caps); -#endif +G_CONST_RETURN GstCaps *gst_value_get_caps (const GValue *value); +void gst_value_set_caps (GValue *calue, const GstCaps *caps); void gst_value_list_prepend_value (GValue *value, const GValue *prepend_value); -void gst_value_list_append_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); |