caps: rename variable for consistency

Rename the variable for GST_CAPS_NONE to _gst_caps_none for consistency and to
hie the fact that NONE caps are also accidentally empty caps.
This commit is contained in:
Wim Taymans 2011-12-21 11:08:34 +01:00
parent 2f93cee988
commit 0a8dd0a4e7
2 changed files with 4 additions and 4 deletions

View file

@ -115,7 +115,7 @@ static gboolean gst_caps_from_string_inplace (GstCaps * caps,
GType _gst_caps_type = 0; GType _gst_caps_type = 0;
GstCaps *_gst_caps_any; GstCaps *_gst_caps_any;
GstCaps *_gst_caps_empty; GstCaps *_gst_caps_none;
GST_DEFINE_MINI_OBJECT_TYPE (GstCaps, gst_caps); GST_DEFINE_MINI_OBJECT_TYPE (GstCaps, gst_caps);
@ -125,7 +125,7 @@ _priv_gst_caps_initialize (void)
_gst_caps_type = gst_caps_get_type (); _gst_caps_type = gst_caps_get_type ();
_gst_caps_any = gst_caps_new_any (); _gst_caps_any = gst_caps_new_any ();
_gst_caps_empty = gst_caps_new_empty (); _gst_caps_none = gst_caps_new_empty ();
g_value_register_transform_func (_gst_caps_type, g_value_register_transform_func (_gst_caps_type,
G_TYPE_STRING, gst_caps_transform_to_string); G_TYPE_STRING, gst_caps_transform_to_string);

View file

@ -94,7 +94,7 @@ typedef enum {
* undefined media type that can not be detected. This macro returns a singleton * undefined media type that can not be detected. This macro returns a singleton
* and should not be unreffed. * and should not be unreffed.
*/ */
#define GST_CAPS_NONE _gst_caps_empty #define GST_CAPS_NONE _gst_caps_none
/** /**
* GST_STATIC_CAPS_ANY: * GST_STATIC_CAPS_ANY:
@ -139,7 +139,7 @@ typedef struct _GstCaps GstCaps;
typedef struct _GstStaticCaps GstStaticCaps; typedef struct _GstStaticCaps GstStaticCaps;
extern GstCaps * _gst_caps_any; extern GstCaps * _gst_caps_any;
extern GstCaps * _gst_caps_empty; extern GstCaps * _gst_caps_none;
/** /**
* GST_CAPS_FLAGS: * GST_CAPS_FLAGS:
* @caps: a #GstCaps. * @caps: a #GstCaps.