mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

rename filter-caps to caps property

Browse source 
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
This commit is contained in:
Thomas Vander Stichele 2005-09-29 12:37:38 +00:00
parent fa0afcafb4
commit 482d36244d
6 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2005-09-29 Tim-Philipp Müller <tim at centricular dot net>
* gst/gstvalue.c: (gst_value_deserialize_fraction): * gst/gstvalue.c: (gst_value_deserialize_fraction):

3
docs/libs/tmpl/gstdataprotocol.sgml
View file

@ -27,9 +27,6 @@ network connections also need a protocol to do this.
#GstBuffer, #GstCaps, #GstEvent #GstBuffer, #GstCaps, #GstEvent
</para> </para>
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### ENUM GstDPHeaderFlag ##### --> <!-- ##### ENUM GstDPHeaderFlag ##### -->
<para> <para>

6
docs/manual/advanced-dataaccess.xml
View file

@ -80,7 +80,7 @@ main (gint argc,
sink = gst_element_factory_make ("xvimagesink", "sink"); sink = gst_element_factory_make ("xvimagesink", "sink");
gst_bin_add_many (GST_BIN (pipeline), src, filter, csp, sink, NULL); gst_bin_add_many (GST_BIN (pipeline), src, filter, csp, sink, NULL);
gst_element_link_many (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", gst_caps_new_simple ("video/x-raw-rgb",
"width", G_TYPE_INT, 384, "width", G_TYPE_INT, 384,
"height", G_TYPE_INT, 288, "height", G_TYPE_INT, 288,
@ -181,7 +181,7 @@ main (gint argc,
can set a filtered caps on a link by using the can set a filtered caps on a link by using the
<quote>capsfilter</quote> element in between the two elements, and <quote>capsfilter</quote> element in between the two elements, and
specifying a <classname>GstCaps</classname> as 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 only allow types matching that specified capability set for
negotiation. negotiation.
</para> </para>
@ -235,7 +235,7 @@ main (gint argc,
videosink = gst_element_factory_make ("xvimagesink", "videosink"); videosink = gst_element_factory_make ("xvimagesink", "videosink");
/* setup */ /* setup */
g_object_set (G_OBJECT (flt), "filter-caps", g_object_set (G_OBJECT (flt), "caps",
gst_caps_new_simple ("video/x-raw-rgb", gst_caps_new_simple ("video/x-raw-rgb",
"width", G_TYPE_INT, 384, "width", G_TYPE_INT, 384,
"height", G_TYPE_INT, 288, "height", G_TYPE_INT, 288,

4
gst/elements/gstcapsfilter.c
View file

@ -130,8 +130,8 @@ gst_capsfilter_class_init (GstCapsFilterClass * klass)
gobject_class->dispose = gst_capsfilter_dispose; gobject_class->dispose = gst_capsfilter_dispose;
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FILTER_CAPS, g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FILTER_CAPS,
g_param_spec_boxed ("filter_caps", _("Filter caps"), g_param_spec_boxed ("caps", _("Filter caps"),
_("Restrict the possible allowed formats"), _("Restrict the possible allowed capabilities (NULL means ANY)"),
GST_TYPE_CAPS, G_PARAM_READWRITE)); GST_TYPE_CAPS, G_PARAM_READWRITE));
trans_class = (GstBaseTransformClass *) klass; trans_class = (GstBaseTransformClass *) klass;

2
gst/gstutils.c
View file

@ -1327,7 +1327,7 @@ gst_element_link_pads_filtered (GstElement * src, const gchar * srcpadname,
gst_object_unref (parent); 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") if (gst_element_link_pads (src, srcpadname, capsfilter, "sink")
&& gst_element_link_pads (capsfilter, "src", dest, destpadname)) { && gst_element_link_pads (capsfilter, "src", dest, destpadname)) {

4
plugins/elements/gstcapsfilter.c
View file

@ -130,8 +130,8 @@ gst_capsfilter_class_init (GstCapsFilterClass * klass)
gobject_class->dispose = gst_capsfilter_dispose; gobject_class->dispose = gst_capsfilter_dispose;
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FILTER_CAPS, g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FILTER_CAPS,
g_param_spec_boxed ("filter_caps", _("Filter caps"), g_param_spec_boxed ("caps", _("Filter caps"),
_("Restrict the possible allowed formats"), _("Restrict the possible allowed capabilities (NULL means ANY)"),
GST_TYPE_CAPS, G_PARAM_READWRITE)); GST_TYPE_CAPS, G_PARAM_READWRITE));
trans_class = (GstBaseTransformClass *) klass; trans_class = (GstBaseTransformClass *) klass;