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.

diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index a48520a..f95356b 100644 (file)
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -115,7 +115,7 @@ static gboolean gst_caps_from_string_inplace (GstCaps * caps,
 
 GType _gst_caps_type = 0;
 GstCaps *_gst_caps_any;
-GstCaps *_gst_caps_empty;
+GstCaps *_gst_caps_none;
 
 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_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_TYPE_STRING, gst_caps_transform_to_string);

diff --git a/gst/gstcaps.h b/gst/gstcaps.h
index 194441f..a08be07 100644 (file)
--- a/gst/gstcaps.h
+++ b/gst/gstcaps.h
@@ -94,7 +94,7 @@ typedef enum {
  * undefined media type that can not be detected. This macro returns a singleton
  * and should not be unreffed.
  */
-#define GST_CAPS_NONE             _gst_caps_empty
+#define GST_CAPS_NONE             _gst_caps_none
 
 /**
  * GST_STATIC_CAPS_ANY:
@@ -139,7 +139,7 @@ typedef struct _GstCaps GstCaps;
 typedef struct _GstStaticCaps GstStaticCaps;
 
 extern GstCaps * _gst_caps_any;
-extern GstCaps * _gst_caps_empty;
+extern GstCaps * _gst_caps_none;
 /**
  * GST_CAPS_FLAGS:
  * @caps: a #GstCaps.