1 files changed, 140 insertions, 140 deletions

diff --git a/gst/gstcaps2.c b/gst/gstcaps2.c
index ae7dd5a16d..66e0eb9ec4 100644
--- a/gst/gstcaps2.c
+++ b/gst/gstcaps2.c
@@ -24,25 +24,25 @@
 
 #include <gst/gst.h>
 
-static void _gst_caps2_transform_to_string (const GValue *src_value,
+static void _gst_caps_transform_to_string (const GValue *src_value,
     GValue *dest_value);
-static void _gst_caps2_value_init (GValue *value);
-static void _gst_caps2_value_free (GValue *value);
-static void _gst_caps2_value_copy (const GValue *src, GValue *dest);
-static gpointer _gst_caps2_value_peek_pointer (const GValue *value);
-static gboolean _gst_caps2_from_string_inplace (GstCaps2 *caps,
+static void _gst_caps_value_init (GValue *value);
+static void _gst_caps_value_free (GValue *value);
+static void _gst_caps_value_copy (const GValue *src, GValue *dest);
+static gpointer _gst_caps_value_peek_pointer (const GValue *value);
+static gboolean _gst_caps_from_string_inplace (GstCaps *caps,
     const gchar *string);
 
 
-GType _gst_caps2_type;
+GType _gst_caps_type;
 
-void _gst_caps2_initialize (void)
+void _gst_caps_initialize (void)
 {
   static const GTypeValueTable type_value_table = {
-    _gst_caps2_value_init,
-    _gst_caps2_value_free,
-    _gst_caps2_value_copy,
-    _gst_caps2_value_peek_pointer,
+    _gst_caps_value_init,
+    _gst_caps_value_free,
+    _gst_caps_value_copy,
+    _gst_caps_value_peek_pointer,
     NULL,
     NULL,
     NULL,
@@ -61,111 +61,111 @@ void _gst_caps2_initialize (void)
     &type_value_table,
   };
 
-  _gst_caps2_type = g_type_register_static (G_TYPE_BOXED, "GstCaps2",
+  _gst_caps_type = g_type_register_static (G_TYPE_BOXED, "GstCaps",
       &caps2_info, 0);
 
-  g_value_register_transform_func (_gst_caps2_type, G_TYPE_STRING,
-      _gst_caps2_transform_to_string);
+  g_value_register_transform_func (_gst_caps_type, G_TYPE_STRING,
+      _gst_caps_transform_to_string);
 }
 
-GType gst_caps2_get_type (void)
+GType gst_caps_get_type (void)
 {
-  return _gst_caps2_type;
+  return _gst_caps_type;
 }
 
 /* creation/deletion */
-GstCaps2 *gst_caps2_new_empty (void)
+GstCaps *gst_caps_new_empty (void)
 {
-  GstCaps2 *caps = g_new0(GstCaps2, 1);
+  GstCaps *caps = g_new0(GstCaps, 1);
 
-  caps->type = _gst_caps2_type;
+  caps->type = _gst_caps_type;
   caps->structs = g_ptr_array_new();
 
   return caps;
 }
 
-GstCaps2 *gst_caps2_new_any (void)
+GstCaps *gst_caps_new_any (void)
 {
-  GstCaps2 *caps = g_new0(GstCaps2, 1);
+  GstCaps *caps = g_new0(GstCaps, 1);
 
-  caps->type = _gst_caps2_type;
+  caps->type = _gst_caps_type;
   caps->structs = g_ptr_array_new();
-  caps->flags = GST_CAPS2_FLAGS_ANY;
+  caps->flags = GST_CAPS_FLAGS_ANY;
 
   return caps;
 }
 
-GstCaps2 *gst_caps2_new_simple (const char *media_type, const char *fieldname,
+GstCaps *gst_caps_new_simple (const char *media_type, const char *fieldname,
     ...)
 {
-  GstCaps2 *caps;
+  GstCaps *caps;
   GstStructure *structure;
   va_list var_args;
 
-  caps = g_new0(GstCaps2, 1);
-  caps->type = _gst_caps2_type;
+  caps = g_new0(GstCaps, 1);
+  caps->type = _gst_caps_type;
   caps->structs = g_ptr_array_new();
 
   va_start (var_args, fieldname);
   structure = gst_structure_new_valist (media_type, fieldname, var_args);
   va_end (var_args);
 
-  gst_caps2_append_cap (caps, structure);
+  gst_caps_append_structure (caps, structure);
   
   return caps;
 }
 
-GstCaps2 *gst_caps2_new_full (GstStructure *struct1, ...)
+GstCaps *gst_caps_new_full (GstStructure *struct1, ...)
 {
-  GstCaps2 *caps;
+  GstCaps *caps;
   va_list var_args;
 
   va_start (var_args, struct1);
-  caps = gst_caps2_new_full_valist (struct1, var_args);
+  caps = gst_caps_new_full_valist (struct1, var_args);
   va_end (var_args);
 
   return caps;
 }
 
-GstCaps2 *gst_caps2_new_full_valist (GstStructure *structure,
+GstCaps *gst_caps_new_full_valist (GstStructure *structure,
     va_list var_args)
 {
-  GstCaps2 *caps;
+  GstCaps *caps;
 
-  caps = g_new0(GstCaps2, 1);
-  caps->type = _gst_caps2_type;
+  caps = g_new0(GstCaps, 1);
+  caps->type = _gst_caps_type;
   caps->structs = g_ptr_array_new();
 
   while(structure){
-    gst_caps2_append_cap (caps, structure);
+    gst_caps_append_structure (caps, structure);
     structure = va_arg (var_args, GstStructure *);
   }
 
   return caps;
 }
 
-GstCaps2 *gst_caps2_copy (const GstCaps2 *caps)
+GstCaps *gst_caps_copy (const GstCaps *caps)
 {
-  GstCaps2 *newcaps;
+  GstCaps *newcaps;
   GstStructure *structure;
   int i;
 
   g_return_val_if_fail(caps != NULL, NULL);
 
-  newcaps = g_new0(GstCaps2, 1);
-  newcaps->type = _gst_caps2_type;
+  newcaps = g_new0(GstCaps, 1);
+  newcaps->type = _gst_caps_type;
   newcaps->flags = caps->flags;
   newcaps->structs = g_ptr_array_new();
 
   for(i=0;i<caps->structs->len;i++){
-    structure = gst_caps2_get_nth_cap (caps, i);
-    gst_caps2_append_cap (newcaps, gst_structure_copy(structure));
+    structure = gst_caps_get_structure (caps, i);
+    gst_caps_append_structure (newcaps, gst_structure_copy(structure));
   }
 
   return newcaps;
 }
 
-void gst_caps2_free (GstCaps2 *caps)
+void gst_caps_free (GstCaps *caps)
 {
   GstStructure *structure;
   int i;
@@ -173,25 +173,25 @@ void gst_caps2_free (GstCaps2 *caps)
   g_return_if_fail(caps != NULL);
 
   for(i=0;i<caps->structs->len;i++){
-    structure = gst_caps2_get_nth_cap (caps, i);
+    structure = gst_caps_get_structure (caps, i);
     gst_structure_free (structure);
   }
   g_ptr_array_free(caps->structs, TRUE);
 #ifdef USE_POISONING
-  memset (caps, 0xff, sizeof(GstCaps2));
+  memset (caps, 0xff, sizeof(GstCaps));
 #endif
   g_free(caps);
 }
 
-const GstCaps2 *gst_static_caps2_get (GstStaticCaps2 *static_caps)
+const GstCaps *gst_static_caps_get (GstStaticCaps *static_caps)
 {
-  GstCaps2 *caps = (GstCaps2 *)static_caps;
+  GstCaps *caps = (GstCaps *)static_caps;
   gboolean ret;
 
   if (caps->type == 0) {
-    caps->type = _gst_caps2_type;
+    caps->type = _gst_caps_type;
     caps->structs = g_ptr_array_new();
-    ret = _gst_caps2_from_string_inplace (caps, static_caps->string);
+    ret = _gst_caps_from_string_inplace (caps, static_caps->string);
 
     if (!ret) {
       g_critical ("Could not convert static caps \"%s\"", static_caps->string);
@@ -202,23 +202,23 @@ const GstCaps2 *gst_static_caps2_get (GstStaticCaps2 *static_caps)
 }
 
 /* manipulation */
-void gst_caps2_append (GstCaps2 *caps1, GstCaps2 *caps2)
+void gst_caps_append (GstCaps *caps1, GstCaps *caps2)
 {
   GstStructure *structure;
   int i;
   
   for(i=0;i<caps2->structs->len;i++){
-    structure = gst_caps2_get_nth_cap (caps2, i);
-    gst_caps2_append_cap (caps1, structure);
+    structure = gst_caps_get_structure (caps2, i);
+    gst_caps_append_structure (caps1, structure);
   }
   g_ptr_array_free(caps2->structs, TRUE);
 #ifdef USE_POISONING
-  memset (caps2, 0xff, sizeof(GstCaps2));
+  memset (caps2, 0xff, sizeof(GstCaps));
 #endif
   g_free(caps2);
 }
 
-void gst_caps2_append_cap (GstCaps2 *caps, GstStructure *structure)
+void gst_caps_append_structure (GstCaps *caps, GstStructure *structure)
 {
   g_return_if_fail(caps != NULL);
 
@@ -227,21 +227,21 @@ void gst_caps2_append_cap (GstCaps2 *caps, GstStructure *structure)
   }
 }
 
-GstCaps2 *gst_caps2_split_one (GstCaps2 *caps)
+GstCaps *gst_caps_split_one (GstCaps *caps)
 {
   /* FIXME */
 
   return NULL;
 }
 
-int gst_caps2_get_n_structures (const GstCaps2 *caps)
+int gst_caps_get_size (const GstCaps *caps)
 {
   g_return_val_if_fail (caps != NULL, 0);
 
   return caps->structs->len;
 }
 
-GstStructure *gst_caps2_get_nth_cap (const GstCaps2 *caps, int index)
+GstStructure *gst_caps_get_structure (const GstCaps *caps, int index)
 {
   g_return_val_if_fail (caps != NULL, NULL);
   g_return_val_if_fail (index >= 0, NULL);
@@ -250,27 +250,27 @@ GstStructure *gst_caps2_get_nth_cap (const GstCaps2 *caps, int index)
   return g_ptr_array_index(caps->structs, index);
 }
 
-GstCaps2 *gst_caps2_copy_1 (const GstCaps2 *caps)
+GstCaps *gst_caps_copy_1 (const GstCaps *caps)
 {
-  GstCaps2 *newcaps;
+  GstCaps *newcaps;
   GstStructure *structure;
 
   g_return_val_if_fail(caps != NULL, NULL);
 
-  newcaps = g_new0(GstCaps2, 1);
-  newcaps->type = _gst_caps2_type;
+  newcaps = g_new0(GstCaps, 1);
+  newcaps->type = _gst_caps_type;
   newcaps->flags = caps->flags;
   newcaps->structs = g_ptr_array_new();
 
   if (caps->structs->len > 0){
-    structure = gst_caps2_get_nth_cap (caps, 0);
-    gst_caps2_append_cap (newcaps, gst_structure_copy(structure));
+    structure = gst_caps_get_structure (caps, 0);
+    gst_caps_append_structure (newcaps, gst_structure_copy(structure));
   }
 
   return newcaps;
 }
 
-void gst_caps2_set_simple (GstCaps2 *caps, char *field, ...)
+void gst_caps_set_simple (GstCaps *caps, char *field, ...)
 {
   GstStructure *structure;
   va_list var_args;
@@ -278,43 +278,43 @@ void gst_caps2_set_simple (GstCaps2 *caps, char *field, ...)
   g_return_if_fail (caps != NULL);
   g_return_if_fail (caps->structs->len == 1);
 
-  structure = gst_caps2_get_nth_cap (caps, 0);
+  structure = gst_caps_get_structure (caps, 0);
 
   va_start (var_args, field);
   gst_structure_set_valist (structure, field, var_args);
   va_end(var_args);
 }
 
-void gst_caps2_set_simple_valist (GstCaps2 *caps, char *field, va_list varargs)
+void gst_caps_set_simple_valist (GstCaps *caps, char *field, va_list varargs)
 {
   GstStructure *structure;
 
   g_return_if_fail (caps != NULL);
   g_return_if_fail (caps->structs->len != 1);
 
-  structure = gst_caps2_get_nth_cap (caps, 0);
+  structure = gst_caps_get_structure (caps, 0);
 
   gst_structure_set_valist (structure, field, varargs);
 }
 
 /* tests */
-gboolean gst_caps2_is_any (const GstCaps2 *caps)
+gboolean gst_caps_is_any (const GstCaps *caps)
 {
   g_return_val_if_fail(caps != NULL, FALSE);
 
-  return (caps->flags & GST_CAPS2_FLAGS_ANY);
+  return (caps->flags & GST_CAPS_FLAGS_ANY);
 }
 
-gboolean gst_caps2_is_empty (const GstCaps2 *caps)
+gboolean gst_caps_is_empty (const GstCaps *caps)
 {
   g_return_val_if_fail(caps != NULL, FALSE);
 
-  if (caps->flags & GST_CAPS2_FLAGS_ANY) return FALSE;
+  if (caps->flags & GST_CAPS_FLAGS_ANY) return FALSE;
 
   return (caps->structs == NULL) || (caps->structs->len == 0);
 }
 
-gboolean gst_caps2_is_chained (const GstCaps2 *caps)
+gboolean gst_caps_is_chained (const GstCaps *caps)
 {
   g_return_val_if_fail(caps != NULL, FALSE);
 
@@ -322,7 +322,7 @@ gboolean gst_caps2_is_chained (const GstCaps2 *caps)
 }
 
 static gboolean
-_gst_caps2_is_fixed_foreach (GQuark field_id, GValue *value, gpointer unused)
+_gst_caps_is_fixed_foreach (GQuark field_id, GValue *value, gpointer unused)
 {
   GType type = G_VALUE_TYPE (value);
   if (G_TYPE_IS_FUNDAMENTAL (type)) return TRUE;
@@ -330,7 +330,7 @@ _gst_caps2_is_fixed_foreach (GQuark field_id, GValue *value, gpointer unused)
   return FALSE;
 }
 
-gboolean gst_caps2_is_fixed (const GstCaps2 *caps)
+gboolean gst_caps_is_fixed (const GstCaps *caps)
 {
   GstStructure *structure;
 
@@ -338,9 +338,9 @@ gboolean gst_caps2_is_fixed (const GstCaps2 *caps)
 
   if (caps->structs->len != 1) return FALSE;
 
-  structure = gst_caps2_get_nth_cap (caps, 0);
+  structure = gst_caps_get_structure (caps, 0);
 
-  return gst_structure_foreach (structure, _gst_caps2_is_fixed_foreach, NULL);
+  return gst_structure_foreach (structure, _gst_caps_is_fixed_foreach, NULL);
 }
 
 static gboolean
@@ -374,13 +374,13 @@ _gst_cap_is_always_compatible (const GstStructure *struct1,
 }
 
 static gboolean
-_gst_caps2_cap_is_always_compatible (const GstStructure *struct1,
-    const GstCaps2 *caps2)
+_gst_caps_cap_is_always_compatible (const GstStructure *struct1,
+    const GstCaps *caps2)
 {
   int i;
 
   for(i=0;i<caps2->structs->len;i++){
-    GstStructure *struct2 = gst_caps2_get_nth_cap (caps2, i);
+    GstStructure *struct2 = gst_caps_get_structure (caps2, i);
 
     if (_gst_cap_is_always_compatible (struct1, struct2)) {
       return TRUE;
@@ -391,25 +391,25 @@ _gst_caps2_cap_is_always_compatible (const GstStructure *struct1,
 }
 
 gboolean
-gst_caps2_is_always_compatible (const GstCaps2 *caps1, const GstCaps2 *caps2)
+gst_caps_is_always_compatible (const GstCaps *caps1, const GstCaps *caps2)
 {
   int i;
 
   g_return_val_if_fail (caps1 != NULL, FALSE);
   g_return_val_if_fail (caps2 != NULL, FALSE);
   /* FIXME: is this right ? */
-  g_return_val_if_fail (!gst_caps2_is_empty (caps1), FALSE);
-  g_return_val_if_fail (!gst_caps2_is_empty (caps2), FALSE);
+  g_return_val_if_fail (!gst_caps_is_empty (caps1), FALSE);
+  g_return_val_if_fail (!gst_caps_is_empty (caps2), FALSE);
   
-  if (gst_caps2_is_any (caps2))
+  if (gst_caps_is_any (caps2))
     return TRUE;
-  if (gst_caps2_is_any (caps1))
+  if (gst_caps_is_any (caps1))
     return FALSE;
   
   for(i=0;i<caps1->structs->len;i++) {
-    GstStructure *struct1 = gst_caps2_get_nth_cap (caps1, i);
+    GstStructure *struct1 = gst_caps_get_structure (caps1, i);
 
-    if (_gst_caps2_cap_is_always_compatible(struct1, caps2) == FALSE){
+    if (_gst_caps_cap_is_always_compatible(struct1, caps2) == FALSE){
       return FALSE;
     }
 
@@ -425,7 +425,7 @@ typedef struct {
 } IntersectData;
 
 static gboolean
-gst_caps2_structure_intersect_field (GQuark id, GValue *val1, gpointer data)
+gst_caps_structure_intersect_field (GQuark id, GValue *val1, gpointer data)
 {
   IntersectData *idata = (IntersectData *) data;
   GValue dest_value = { 0 };
@@ -445,7 +445,7 @@ gst_caps2_structure_intersect_field (GQuark id, GValue *val1, gpointer data)
   return TRUE;
 }
 
-static GstStructure *gst_caps2_structure_intersect (const GstStructure *struct1,
+static GstStructure *gst_caps_structure_intersect (const GstStructure *struct1,
     const GstStructure *struct2)
 {
   IntersectData data;
@@ -459,13 +459,13 @@ static GstStructure *gst_caps2_structure_intersect (const GstStructure *struct1,
   data.intersect = struct2;
   data.first_run = TRUE;
   if (!gst_structure_foreach ((GstStructure *) struct1, 
-	gst_caps2_structure_intersect_field, &data))
+	gst_caps_structure_intersect_field, &data))
     goto error;
   
   data.intersect = struct1;
   data.first_run = FALSE;
   if (!gst_structure_foreach ((GstStructure *) struct2, 
-	gst_caps2_structure_intersect_field, &data))
+	gst_caps_structure_intersect_field, &data))
     goto error;
 
   return data.dest;
@@ -476,7 +476,7 @@ error:
 }
 
 #if 0
-static GstStructure *gst_caps2_structure_union (const GstStructure *struct1,
+static GstStructure *gst_caps_structure_union (const GstStructure *struct1,
     const GstStructure *struct2)
 {
   int i;
@@ -514,32 +514,32 @@ static GstStructure *gst_caps2_structure_union (const GstStructure *struct1,
 #endif
 
 /* operations */
-GstCaps2 *gst_caps2_intersect (const GstCaps2 *caps1, const GstCaps2 *caps2)
+GstCaps *gst_caps_intersect (const GstCaps *caps1, const GstCaps *caps2)
 {
   int i,j;
   GstStructure *struct1;
   GstStructure *struct2;
-  GstCaps2 *dest;
+  GstCaps *dest;
 
   g_return_val_if_fail (caps1 != NULL, NULL);
   g_return_val_if_fail (caps2 != NULL, NULL);
 
-  if (gst_caps2_is_empty (caps1) || gst_caps2_is_empty (caps2)){
-    return gst_caps2_new_empty ();
+  if (gst_caps_is_empty (caps1) || gst_caps_is_empty (caps2)){
+    return gst_caps_new_empty ();
   }
-  if (gst_caps2_is_any (caps1)) return gst_caps2_copy (caps2);
-  if (gst_caps2_is_any (caps2)) return gst_caps2_copy (caps1);
+  if (gst_caps_is_any (caps1)) return gst_caps_copy (caps2);
+  if (gst_caps_is_any (caps2)) return gst_caps_copy (caps1);
 
-  dest = gst_caps2_new_empty();
+  dest = gst_caps_new_empty();
   for(i=0;i<caps1->structs->len;i++){
-    struct1 = gst_caps2_get_nth_cap (caps1, i);
+    struct1 = gst_caps_get_structure (caps1, i);
     for(j=0;j<caps2->structs->len;j++){
       GstStructure *istruct;
 
-      struct2 = gst_caps2_get_nth_cap (caps2, j);
-      istruct = gst_caps2_structure_intersect (struct1, struct2);
+      struct2 = gst_caps_get_structure (caps2, j);
+      istruct = gst_caps_structure_intersect (struct1, struct2);
 
-      gst_caps2_append_cap(dest, istruct);
+      gst_caps_append_structure(dest, istruct);
     }
   }
 
@@ -548,14 +548,14 @@ GstCaps2 *gst_caps2_intersect (const GstCaps2 *caps1, const GstCaps2 *caps2)
   return dest;
 }
 
-GstCaps2 *gst_caps2_union (const GstCaps2 *caps1, const GstCaps2 *caps2)
+GstCaps *gst_caps_union (const GstCaps *caps1, const GstCaps *caps2)
 {
-  GstCaps2 *dest1;
-  GstCaps2 *dest2;
+  GstCaps *dest1;
+  GstCaps *dest2;
 
-  dest1 = gst_caps2_copy (caps1);
-  dest2 = gst_caps2_copy (caps2);
-  gst_caps2_append (dest1, dest2);
+  dest1 = gst_caps_copy (caps1);
+  dest2 = gst_caps_copy (caps2);
+  gst_caps_append (dest1, dest2);
 
 
   /* FIXME: need a simplify function */
@@ -563,20 +563,20 @@ GstCaps2 *gst_caps2_union (const GstCaps2 *caps1, const GstCaps2 *caps2)
   return dest1;
 }
 
-GstCaps2 *gst_caps2_normalize (const GstCaps2 *caps)
+GstCaps *gst_caps_normalize (const GstCaps *caps)
 {
 
   return NULL;
 }
 
 #ifndef GST_DISABLE_LOADSAVE
-xmlNodePtr gst_caps2_save_thyself (const GstCaps2 *caps, xmlNodePtr parent)
+xmlNodePtr gst_caps_save_thyself (const GstCaps *caps, xmlNodePtr parent)
 {
 
   return 0;
 }
 
-GstCaps2 *gst_caps2_load_thyself (xmlNodePtr parent)
+GstCaps *gst_caps_load_thyself (xmlNodePtr parent)
 {
 
   return NULL;
@@ -584,15 +584,15 @@ GstCaps2 *gst_caps2_load_thyself (xmlNodePtr parent)
 #endif
 
 /* utility */
-void gst_caps2_replace (GstCaps2 **caps, GstCaps2 *newcaps)
+void gst_caps_replace (GstCaps **caps, GstCaps *newcaps)
 {
   /* FIXME */
 
-  if (*caps) gst_caps2_free(*caps);
+  if (*caps) gst_caps_free(*caps);
   *caps = newcaps;
 }
 
-gchar *gst_caps2_to_string (const GstCaps2 *caps)
+gchar *gst_caps_to_string (const GstCaps *caps)
 {
   int i;
   GstStructure *structure;
@@ -603,18 +603,18 @@ gchar *gst_caps2_to_string (const GstCaps2 *caps)
   if (caps == NULL) {
     return g_strdup("NULL");
   }
-  if(gst_caps2_is_any(caps)){
+  if(gst_caps_is_any(caps)){
     return g_strdup("ANY");
   }
-  if(gst_caps2_is_empty(caps)){
+  if(gst_caps_is_empty(caps)){
     return g_strdup("EMPTY");
   }
   s = g_string_new("");
-  structure = gst_caps2_get_nth_cap (caps, 0);
+  structure = gst_caps_get_structure (caps, 0);
   g_string_append(s, gst_structure_to_string(structure));
 
   for(i=1;i<caps->structs->len;i++){
-    structure = gst_caps2_get_nth_cap (caps, i);
+    structure = gst_caps_get_structure (caps, i);
 
     g_string_append(s, "; ");
     g_string_append(s, gst_structure_to_string(structure));
@@ -623,14 +623,14 @@ gchar *gst_caps2_to_string (const GstCaps2 *caps)
   return g_string_free(s, FALSE);
 }
 
-static gboolean _gst_caps2_from_string_inplace (GstCaps2 *caps,
+static gboolean _gst_caps_from_string_inplace (GstCaps *caps,
     const gchar *string)
 {
   GstStructure *structure;
   gchar *s;
 
   if (strcmp("ANY", string)==0) {
-    caps->flags = GST_CAPS2_FLAGS_ANY;
+    caps->flags = GST_CAPS_FLAGS_ANY;
     return TRUE;
   }
   if (strcmp("NONE", string)==0) {
@@ -641,7 +641,7 @@ static gboolean _gst_caps2_from_string_inplace (GstCaps2 *caps,
   if (structure == NULL) {
     return FALSE;
   }
-  gst_caps2_append_cap (caps, structure);
+  gst_caps_append_structure (caps, structure);
 
   while (*s == ';') {
     s++;
@@ -650,7 +650,7 @@ static gboolean _gst_caps2_from_string_inplace (GstCaps2 *caps,
     if (structure == NULL) {
       return FALSE;
     }
-    gst_caps2_append_cap (caps, structure);
+    gst_caps_append_structure (caps, structure);
     while (g_ascii_isspace(*s))s++;
   }
 
@@ -661,57 +661,57 @@ static gboolean _gst_caps2_from_string_inplace (GstCaps2 *caps,
   return TRUE;
 }
 
-GstCaps2 *gst_caps2_from_string (const gchar *string)
+GstCaps *gst_caps_from_string (const gchar *string)
 {
-  GstCaps2 *caps;
+  GstCaps *caps;
 
-  caps = gst_caps2_new_empty();
-  if (_gst_caps2_from_string_inplace (caps, string)) {
+  caps = gst_caps_new_empty();
+  if (_gst_caps_from_string_inplace (caps, string)) {
     return caps;
   } else {
-    gst_caps2_free (caps);
+    gst_caps_free (caps);
     return NULL;
   }
 }
 
-static void _gst_caps2_transform_to_string (const GValue *src_value,
+static void _gst_caps_transform_to_string (const GValue *src_value,
     GValue *dest_value)
 {
   g_return_if_fail (src_value != NULL);
   g_return_if_fail (dest_value != NULL);
 
   dest_value->data[0].v_pointer =
-    gst_caps2_to_string (src_value->data[0].v_pointer);
+    gst_caps_to_string (src_value->data[0].v_pointer);
 }
 
-static void _gst_caps2_value_init (GValue *value)
+static void _gst_caps_value_init (GValue *value)
 {
-  value->data[0].v_pointer = gst_caps2_new_empty();
+  value->data[0].v_pointer = gst_caps_new_empty();
 }
 
-static void _gst_caps2_value_free (GValue *value)
+static void _gst_caps_value_free (GValue *value)
 {
-  if (value->data[0].v_pointer) gst_caps2_free (value->data[0].v_pointer);
+  if (value->data[0].v_pointer) gst_caps_free (value->data[0].v_pointer);
 }
 
-static void _gst_caps2_value_copy (const GValue *src, GValue *dest)
+static void _gst_caps_value_copy (const GValue *src, GValue *dest)
 {
   if (dest->data[0].v_pointer) {
-    gst_caps2_free (dest->data[0].v_pointer);
-    dest->data[0].v_pointer = gst_caps2_copy (src->data[0].v_pointer);
+    gst_caps_free (dest->data[0].v_pointer);
+    dest->data[0].v_pointer = gst_caps_copy (src->data[0].v_pointer);
   } else {
     dest->data[0].v_pointer = NULL;
   }
 }
 
-static gpointer _gst_caps2_value_peek_pointer (const GValue *value)
+static gpointer _gst_caps_value_peek_pointer (const GValue *value)
 {
   return value->data[0].v_pointer;
 }
 
 /* fixate utility functions */
 
-gboolean gst_caps2_structure_fixate_field_nearest_int (GstStructure *structure,
+gboolean gst_caps_structure_fixate_field_nearest_int (GstStructure *structure,
     const char *field_name, int target)
 {
   const GValue *value;
@@ -758,7 +758,7 @@ gboolean gst_caps2_structure_fixate_field_nearest_int (GstStructure *structure,
   return FALSE;
 }
 
-gboolean gst_caps2_structure_fixate_field_nearest_double (GstStructure
+gboolean gst_caps_structure_fixate_field_nearest_double (GstStructure
     *structure, const char *field_name, double target)
 {
   const GValue *value;