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;' \
{} \;

2 files changed, 6 insertions, 6 deletions

diff --git a/examples/mixer/mixer.c b/examples/mixer/mixer.c
index 4fad3174eb..6b27f5b944 100644
--- a/examples/mixer/mixer.c
+++ b/examples/mixer/mixer.c
@@ -40,12 +40,12 @@ void eos(GstElement *element)
 /*  playing = FALSE; */
 }
 
-G_GNUC_UNUSED static GstCaps2*
+G_GNUC_UNUSED static GstCaps*
 gst_play_type_find (GstBin *bin, GstElement *element)
 {
   GstElement *typefind;
   GstElement *pipeline;
-  GstCaps2 *caps = NULL;
+  GstCaps *caps = NULL;
 
   GST_DEBUG ("GstPipeline: typefind for element \"%s\"",
              GST_ELEMENT_NAME(element));
@@ -238,7 +238,7 @@ create_input_channel (int id, char* location)
   char buffer[20]; 		/* hold the names */
 
 /*  GstAutoplug *autoplug;
-  GstCaps2 *srccaps; */
+  GstCaps *srccaps; */
   GstElement *new_element;  
   GstElement *decoder;
 
@@ -330,7 +330,7 @@ create_input_channel (int id, char* location)
 #endif
  
   new_element = gst_autoplug_to_caps (autoplug, srccaps, 
-  					gst_caps2_new ("audio/raw", NULL), NULL);
+  					gst_caps_new ("audio/raw", NULL), NULL);
  
   if (!new_element) {
     g_print ("could not autoplug, no suitable codecs found...\n");
diff --git a/examples/typefind/typefind.c b/examples/typefind/typefind.c
index 11600dc8a8..a562306d30 100644
--- a/examples/typefind/typefind.c
+++ b/examples/typefind/typefind.c
@@ -1,7 +1,7 @@
 #include <gst/gst.h>
 
 void
-type_found (GstElement *typefind, const GstCaps2 * caps) 
+type_found (GstElement *typefind, const GstCaps * caps) 
 {
   xmlDocPtr doc;
   xmlNodePtr parent;
@@ -11,7 +11,7 @@ type_found (GstElement *typefind, const GstCaps2 * caps)
 
   parent = xmlNewChild (doc->xmlRootNode, NULL, "Caps1", NULL);
   /* FIXME */
-  //gst_caps2_save_thyself (caps, parent);
+  //gst_caps_save_thyself (caps, parent);
 
   xmlDocDump (stdout, doc);
 }