Global change from "caps2" to "caps". Script is: #!/bin/sh find . -name '*.[chy]' -exec perl -i -p \CAPS-ENDCAPS

Original commit message from CVS:
Global change from "caps2" to "caps".  Script is:
#!/bin/sh

find . -name '*.[chy]' -exec perl -i -p \
-e 's/gst_static_caps2_/gst_static_caps_/g;\
s/GST_CAPS2_/GST_CAPS_/g;\
s/gst_caps2_/gst_caps_/g;\
s/GstCaps2/GstCaps/g;\
s/GstStaticCaps2/GstStaticCaps/g;\
s/GST_STATIC_CAPS2_/GST_STATIC_CAPS_/g;\
s/GST_TYPE_CAPS2/GST_TYPE_CAPS/g;\
s/gst_caps_get_nth_cap/gst_caps_get_structure/g;\
s/gst_caps_get_n_structures/gst_caps_get_size/g;\
s/gst_caps_append_cap/gst_caps_append_structure/g;\
s/GST_CAPS2_/GST_CAPS_/g;' \
{} \;

1 files changed, 29 insertions, 29 deletions

diff --git a/testsuite/caps/compatibility.c b/testsuite/caps/compatibility.c
index 500267dbce..036813a810 100644
--- a/testsuite/caps/compatibility.c
+++ b/testsuite/caps/compatibility.c
@@ -1,30 +1,30 @@
 #include <gst/gst.h>
 
 /* these caps all have a non empty intersection */
-GstStaticCaps2 sinkcaps = GST_STATIC_CAPS(
+GstStaticCaps sinkcaps = GST_STATIC_CAPS(
   "video/mpeg, "
     "mpegtype=(int)[1,2]"
 );
 
-GstStaticCaps2 mp1parsecaps = GST_STATIC_CAPS(
+GstStaticCaps mp1parsecaps = GST_STATIC_CAPS(
   "video/mpeg, "
     "mpegtype=(int)1"
 );
 
-GstStaticCaps2 rawcaps = GST_STATIC_CAPS(
+GstStaticCaps rawcaps = GST_STATIC_CAPS(
   "video/raw, "
     "fourcc=(fourcc){YV12,YUY2}, "
     "width=(int)[16,4096], "
     "height=(int)[16,4096]"
 );
 
-GstStaticCaps2 rawcaps2 = GST_STATIC_CAPS(
+GstStaticCaps rawcaps2 = GST_STATIC_CAPS(
   "video/raw, "
     "fourcc=(fourcc)YUY2, "
     "height=(int)[16,256]"
 );
 
-GstStaticCaps2 rawcaps3 = GST_STATIC_CAPS(
+GstStaticCaps rawcaps3 = GST_STATIC_CAPS(
   "video/raw, "
     "fourcc=(fourcc){YV12,YUY2}, "
     "height=(int)[16,4096]"
@@ -32,27 +32,27 @@ GstStaticCaps2 rawcaps3 = GST_STATIC_CAPS(
 
 #if 0
 /* these caps aren't used yet */
-GstStaticCaps2 rawcaps4 = GST_STATIC_CAPS(
+GstStaticCaps rawcaps4 = GST_STATIC_CAPS(
   "video/raw, "
     "fourcc=(fourcc){\"YV12\", \"YUYV\"}, "
     "height=(int)[16,4096]"
 );
 
-GstStaticCaps2 rawcaps4 = GST_STATIC_CAPS(
+GstStaticCaps rawcaps4 = GST_STATIC_CAPS(
   "video/raw, "
     "fourcc=(fourcc){\"YUYV\", \"YUY2\"}, "
     "height=(int)[16,4096]"
 );
 #endif
 
-GstStaticCaps2 rawcaps6 = GST_STATIC_CAPS(
+GstStaticCaps rawcaps6 = GST_STATIC_CAPS(
   "video/raw, "
     "format=(fourcc)\"I420\"; "
   "video/raw, "
     "format=(fourcc)\"YUYV\""
 );
 
-GstStaticCaps2 rawcaps7 = GST_STATIC_CAPS(
+GstStaticCaps rawcaps7 = GST_STATIC_CAPS(
   "video/raw, "
     "format=(fourcc)\"I420\"; "
   "video/raw, "
@@ -68,53 +68,53 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&mp1parsecaps),
-      gst_static_caps2_get (&rawcaps));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&mp1parsecaps),
+      gst_static_caps_get (&rawcaps));
   g_print ("4 <-> 2 == %d (invalid, wrong major type)\n", testret);
   ret = ret + (testret == FALSE) ? 0 : 1;
   
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&mp1parsecaps),
-      gst_static_caps2_get (&sinkcaps));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&mp1parsecaps),
+      gst_static_caps_get (&sinkcaps));
   g_print ("4 <-> 1 == %d (valid, subset)\n", testret);
   ret = ret + (testret == TRUE) ? 0 : 1;
   
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&sinkcaps),
-      gst_static_caps2_get (&mp1parsecaps));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&sinkcaps),
+      gst_static_caps_get (&mp1parsecaps));
   g_print ("1 <-> 4 == %d (invalid, superset)\n", testret);
   ret = ret + (testret == FALSE) ? 0 : 1;
 
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&rawcaps),
-      gst_static_caps2_get (&rawcaps2));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&rawcaps),
+      gst_static_caps_get (&rawcaps2));
   g_print ("2 <-> 3 == %d (invalid, ranges)\n", testret);
   ret = ret + (testret == FALSE) ? 0 : 1;
 
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&rawcaps),
-      gst_static_caps2_get (&rawcaps3));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&rawcaps),
+      gst_static_caps_get (&rawcaps3));
   g_print ("2 <-> 5 == %d (valid)\n", testret);
   ret = ret + (testret == TRUE) ? 0 : 1;
 
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&rawcaps3),
-      gst_static_caps2_get (&rawcaps));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&rawcaps3),
+      gst_static_caps_get (&rawcaps));
   g_print ("5 <-> 2 == %d (invalid)\n", testret);
   ret = ret + (testret == FALSE) ? 0 : 1;
 
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&rawcaps2),
-      gst_static_caps2_get (&rawcaps3));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&rawcaps2),
+      gst_static_caps_get (&rawcaps3));
   g_print ("3 <-> 5 == %d (valid)\n", testret);
   ret = ret + (testret == TRUE) ? 0 : 1;
 
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&rawcaps2),
-      gst_static_caps2_get (&rawcaps));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&rawcaps2),
+      gst_static_caps_get (&rawcaps));
   g_print ("3 <-> 2 == %d (invalid, property missing in source)\n", testret);
   ret = ret + (testret == FALSE) ? 0 : 1;
 
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&rawcaps),
-      gst_static_caps2_get (&rawcaps));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&rawcaps),
+      gst_static_caps_get (&rawcaps));
   g_print ("2 <-> 2 == %d (valid, same caps)\n", testret);
   ret = ret + (testret == TRUE) ? 0 : 1;
 
-  testret = gst_caps2_is_always_compatible (gst_static_caps2_get (&rawcaps6),
-      gst_static_caps2_get (&rawcaps7));
+  testret = gst_caps_is_always_compatible (gst_static_caps_get (&rawcaps6),
+      gst_static_caps_get (&rawcaps7));
   g_print ("6 <-> 7 == %d (invalid, second caps doesn't fit)\n", testret);
   ret = ret + (testret == FALSE) ? 0 : 1;