gst/gstcaps.h (GST_CAPS_IS_SIMPLE): Capitalize macro

Original commit message from CVS:
* gst/gstcaps.h (GST_CAPS_IS_SIMPLE): Capitalize macro
* gst/gstcaps.h: Clean up
This commit is contained in:
Johan Dahlin 2004-03-12 18:25:07 +00:00
parent e0c63736c6
commit 82d5ac58c4
2 changed files with 84 additions and 67 deletions

View file

@ -1,3 +1,8 @@
2004-03-12 Johan Dahlin <johan@gnome.org>
* gst/gstcaps.h (GST_CAPS_IS_SIMPLE): Capitalize macro
* gst/gstcaps.h: Clean up
2004-03-11 Ronald Bultje <rbultje@ronald.bitfreak.net> 2004-03-11 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/gstqueue.c: (gst_queue_init): * gst/gstqueue.c: (gst_queue_init):

View file

@ -1,5 +1,5 @@
/* GStreamer /* GStreamer
* Copyright (C) <2003> David A. Schleef <ds@schleef.org> * Copyright (C) 2003 David A. Schleef <ds@schleef.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -25,9 +25,28 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_CAPS_FLAGS_ANY (1<<0) #define GST_TYPE_CAPS gst_caps_get_type()
extern GType _gst_caps_type; #define GST_CAPS_FLAGS_ANY (1<<0)
#define GST_CAPS_ANY gst_caps_new_any()
#define GST_CAPS_NONE gst_caps_new_empty()
#define GST_STATIC_CAPS_ANY GST_STATIC_CAPS("ANY")
#define GST_STATIC_CAPS_NONE GST_STATIC_CAPS("NONE")
#define GST_CAPS_IS_SIMPLE(caps) (gst_caps_get_size(caps) == 1)
#ifndef GST_DISABLE_DEPRECATED
#define GST_DEBUG_CAPS(string, caps) \
GST_DEBUG ( string "%s: " GST_PTR_FORMAT, caps)
#endif
#define GST_STATIC_CAPS(string) \
{ \
/* caps */ { 0 }, \
/* string */ string, \
}
typedef struct _GstCaps GstCaps; typedef struct _GstCaps GstCaps;
typedef struct _GstStaticCaps GstStaticCaps; typedef struct _GstStaticCaps GstStaticCaps;
@ -44,87 +63,80 @@ struct _GstStaticCaps {
const char *string; const char *string;
}; };
#define GST_STATIC_CAPS(string) \ GType gst_caps_get_type (void);
{ \ GstCaps * gst_caps_new_empty (void);
/* caps */ { 0 }, \ GstCaps * gst_caps_new_any (void);
/* string */ string, \ GstCaps * gst_caps_new_simple (const char *media_type,
} const char *fieldname,
...);
#define GST_CAPS_ANY gst_caps_new_any() GstCaps * gst_caps_new_full (GstStructure *struct1,
#define GST_CAPS_NONE gst_caps_new_empty() ...);
GstCaps * gst_caps_new_full_valist (GstStructure *structure,
#define GST_STATIC_CAPS_ANY GST_STATIC_CAPS("ANY") va_list var_args);
#define GST_STATIC_CAPS_NONE GST_STATIC_CAPS("NONE") GstCaps * gst_caps_copy (const GstCaps *caps);
void gst_caps_free (GstCaps *caps);
#define GST_TYPE_CAPS gst_caps_get_type() G_CONST_RETURN GstCaps * gst_static_caps_get (GstStaticCaps *caps);
#ifndef GST_DISABLE_DEPRECATED
#define GST_DEBUG_CAPS(string, caps) \
GST_DEBUG ( string "%s: " GST_PTR_FORMAT, caps)
#endif
void _gst_caps_initialize (void);
GType gst_caps_get_type (void);
/* creation/deletion */
GstCaps *gst_caps_new_empty (void);
GstCaps *gst_caps_new_any (void);
GstCaps *gst_caps_new_simple (const char *media_type, const char *fieldname, ...);
GstCaps *gst_caps_new_full (GstStructure *struct1, ...);
GstCaps *gst_caps_new_full_valist (GstStructure *structure, va_list var_args);
GstCaps *gst_caps_copy (const GstCaps *caps);
void gst_caps_free (GstCaps *caps);
G_CONST_RETURN GstCaps *gst_static_caps_get (GstStaticCaps *caps);
/* manipulation */ /* manipulation */
void gst_caps_append (GstCaps *caps1, GstCaps *caps2); void gst_caps_append (GstCaps *caps1,
void gst_caps_append_structure (GstCaps *caps1, GstStructure *structure); GstCaps *caps2);
GstCaps *gst_caps_split_one (GstCaps *caps); void gst_caps_append_structure (GstCaps *caps1,
int gst_caps_get_size (const GstCaps *caps); GstStructure *structure);
#define gst_caps_is_simple(caps) (gst_caps_get_size(caps) == 1) GstCaps * gst_caps_split_one (GstCaps *caps);
GstStructure *gst_caps_get_structure (const GstCaps *caps, int index); int gst_caps_get_size (const GstCaps *caps);
GstStructure * gst_caps_get_structure (const GstCaps *caps,
int index);
#ifndef GST_DISABLE_DEPRECATED #ifndef GST_DISABLE_DEPRECATED
GstCaps *gst_caps_copy_1 (const GstCaps *caps); GstCaps * gst_caps_copy_1 (const GstCaps *caps);
#endif #endif
void gst_caps_set_simple (GstCaps *caps, char *field, ...); void gst_caps_set_simple (GstCaps *caps,
void gst_caps_set_simple_valist (GstCaps *caps, char *field, va_list varargs); char *field, ...);
void gst_caps_set_simple_valist (GstCaps *caps,
char *field,
va_list varargs);
/* tests */ /* tests */
gboolean gst_caps_is_any (const GstCaps *caps); gboolean gst_caps_is_any (const GstCaps *caps);
gboolean gst_caps_is_empty (const GstCaps *caps); gboolean gst_caps_is_empty (const GstCaps *caps);
#ifndef GST_DISABLE_DEPRECATED #ifndef GST_DISABLE_DEPRECATED
gboolean gst_caps_is_chained (const GstCaps *caps); gboolean gst_caps_is_chained (const GstCaps *caps);
#endif #endif
gboolean gst_caps_is_fixed (const GstCaps *caps); gboolean gst_caps_is_fixed (const GstCaps *caps);
gboolean gst_caps_is_equal_fixed (const GstCaps *caps1, const GstCaps *caps2); gboolean gst_caps_is_equal_fixed (const GstCaps *caps1,
gboolean gst_caps_is_always_compatible (const GstCaps *caps1, const GstCaps *caps2);
const GstCaps *caps2); gboolean gst_caps_is_always_compatible (const GstCaps *caps1,
const GstCaps *caps2);
/* operations */ /* operations */
GstCaps *gst_caps_intersect (const GstCaps *caps1, const GstCaps *caps2); GstCaps * gst_caps_intersect (const GstCaps *caps1,
GstCaps *gst_caps_union (const GstCaps *caps1, const GstCaps *caps2); const GstCaps *caps2);
GstCaps *gst_caps_normalize (const GstCaps *caps); GstCaps * gst_caps_union (const GstCaps *caps1,
GstCaps *gst_caps_simplify (const GstCaps *caps); const GstCaps *caps2);
GstCaps * gst_caps_normalize (const GstCaps *caps);
GstCaps * gst_caps_simplify (const GstCaps *caps);
#ifndef GST_DISABLE_LOADSAVE #ifndef GST_DISABLE_LOADSAVE
xmlNodePtr gst_caps_save_thyself (const GstCaps *caps, xmlNodePtr parent); xmlNodePtr gst_caps_save_thyself (const GstCaps *caps,
GstCaps *gst_caps_load_thyself (xmlNodePtr parent); xmlNodePtr parent);
GstCaps * gst_caps_load_thyself (xmlNodePtr parent);
#endif #endif
/* utility */ /* utility */
void gst_caps_replace (GstCaps **caps, GstCaps *newcaps); void gst_caps_replace (GstCaps **caps,
gchar *gst_caps_to_string (const GstCaps *caps); GstCaps *newcaps);
GstCaps *gst_caps_from_string (const gchar *string); gchar * gst_caps_to_string (const GstCaps *caps);
GstCaps * gst_caps_from_string (const gchar *string);
gboolean gst_caps_structure_fixate_field_nearest_int (GstStructure *structure,
const char *field_name, int target);
gboolean gst_caps_structure_fixate_field_nearest_double (GstStructure
*structure, const char *field_name, double target);
gboolean gst_caps_structure_fixate_field_nearest_int (GstStructure *structure,
const char *field_name,
int target);
gboolean gst_caps_structure_fixate_field_nearest_double (GstStructure *structure,
const char *field_name,
double target);
/* private */
void _gst_caps_initialize (void);
extern GType _gst_caps_type;
G_END_DECLS G_END_DECLS
#endif /* __GST_CAPS_H__ */ #endif /* __GST_CAPS_H__ */