From 482d36244d43a40f4143defd9ddf85fc3c96b66d Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Thu, 29 Sep 2005 12:37:38 +0000
Subject: [PATCH] rename filter-caps to caps property

Original commit message from CVS:

* docs/libs/tmpl/gstdataprotocol.sgml:
* docs/manual/advanced-dataaccess.xml:
* gst/elements/gstcapsfilter.c:
* gst/gstutils.c:
rename filter-caps to caps property
---
 ChangeLog                           | 8 ++++++++
 docs/libs/tmpl/gstdataprotocol.sgml | 3 ---
 docs/manual/advanced-dataaccess.xml | 6 +++---
 gst/elements/gstcapsfilter.c        | 4 ++--
 gst/gstutils.c                      | 2 +-
 plugins/elements/gstcapsfilter.c    | 4 ++--
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7c9436..9fa1377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-29  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* docs/libs/tmpl/gstdataprotocol.sgml:
+	* docs/manual/advanced-dataaccess.xml:
+	* gst/elements/gstcapsfilter.c:
+	* gst/gstutils.c:
+	  rename filter-caps to caps property
+
 2005-09-29  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/gstvalue.c: (gst_value_deserialize_fraction):
diff --git a/docs/libs/tmpl/gstdataprotocol.sgml b/docs/libs/tmpl/gstdataprotocol.sgml
index c5446c9..0277c7c 100644
--- a/docs/libs/tmpl/gstdataprotocol.sgml
+++ b/docs/libs/tmpl/gstdataprotocol.sgml
@@ -27,9 +27,6 @@ network connections also need a protocol to do this.
 #GstBuffer, #GstCaps, #GstEvent
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### ENUM GstDPHeaderFlag ##### -->
 <para>
 
diff --git a/docs/manual/advanced-dataaccess.xml b/docs/manual/advanced-dataaccess.xml
index 88abe57..bd1d518 100644
--- a/docs/manual/advanced-dataaccess.xml
+++ b/docs/manual/advanced-dataaccess.xml
@@ -80,7 +80,7 @@ main (gint   argc,
   sink = gst_element_factory_make ("xvimagesink", "sink");
   gst_bin_add_many (GST_BIN (pipeline), src, filter, csp, sink, NULL);
   gst_element_link_many (src, filter, csp, sink, NULL);
-  g_object_set (G_OBJECT (filter), "filter-caps",
+  g_object_set (G_OBJECT (filter), "caps",
       gst_caps_new_simple ("video/x-raw-rgb",
 			   "width", G_TYPE_INT, 384,
 			   "height", G_TYPE_INT, 288,
@@ -181,7 +181,7 @@ main (gint   argc,
         can set a filtered caps on a link by using the
         <quote>capsfilter</quote> element in between the two elements, and
         specifying a <classname>GstCaps</classname> as
-        <quote>filter-caps</quote> property on this element. It will then
+        <quote>caps</quote> property on this element. It will then
         only allow types matching that specified capability set for
         negotiation.
       </para>
@@ -235,7 +235,7 @@ main (gint   argc,
   videosink = gst_element_factory_make ("xvimagesink", "videosink");
 
   /* setup */
-  g_object_set (G_OBJECT (flt), "filter-caps",
+  g_object_set (G_OBJECT (flt), "caps",
   		gst_caps_new_simple ("video/x-raw-rgb",
 				     "width", G_TYPE_INT, 384,
 				     "height", G_TYPE_INT, 288,
diff --git a/gst/elements/gstcapsfilter.c b/gst/elements/gstcapsfilter.c
index c4e7263..7c39843 100644
--- a/gst/elements/gstcapsfilter.c
+++ b/gst/elements/gstcapsfilter.c
@@ -130,8 +130,8 @@ gst_capsfilter_class_init (GstCapsFilterClass * klass)
   gobject_class->dispose = gst_capsfilter_dispose;
 
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FILTER_CAPS,
-      g_param_spec_boxed ("filter_caps", _("Filter caps"),
-          _("Restrict the possible allowed formats"),
+      g_param_spec_boxed ("caps", _("Filter caps"),
+          _("Restrict the possible allowed capabilities (NULL means ANY)"),
           GST_TYPE_CAPS, G_PARAM_READWRITE));
 
   trans_class = (GstBaseTransformClass *) klass;
diff --git a/gst/gstutils.c b/gst/gstutils.c
index ef2a4cd..3c9952f 100644
--- a/gst/gstutils.c
+++ b/gst/gstutils.c
@@ -1327,7 +1327,7 @@ gst_element_link_pads_filtered (GstElement * src, const gchar * srcpadname,
 
     gst_object_unref (parent);
 
-    g_object_set (capsfilter, "filter-caps", filter, NULL);
+    g_object_set (capsfilter, "caps", filter, NULL);
 
     if (gst_element_link_pads (src, srcpadname, capsfilter, "sink")
         && gst_element_link_pads (capsfilter, "src", dest, destpadname)) {
diff --git a/plugins/elements/gstcapsfilter.c b/plugins/elements/gstcapsfilter.c
index c4e7263..7c39843 100644
--- a/plugins/elements/gstcapsfilter.c
+++ b/plugins/elements/gstcapsfilter.c
@@ -130,8 +130,8 @@ gst_capsfilter_class_init (GstCapsFilterClass * klass)
   gobject_class->dispose = gst_capsfilter_dispose;
 
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FILTER_CAPS,
-      g_param_spec_boxed ("filter_caps", _("Filter caps"),
-          _("Restrict the possible allowed formats"),
+      g_param_spec_boxed ("caps", _("Filter caps"),
+          _("Restrict the possible allowed capabilities (NULL means ANY)"),
           GST_TYPE_CAPS, G_PARAM_READWRITE));
 
   trans_class = (GstBaseTransformClass *) klass;
-- 
2.7.4