From: Thibault Saunier Date: Sun, 31 Mar 2013 14:07:14 +0000 (+0200) Subject: track-element: Rename set_property_controlling_parameters set_control_source X-Git-Tag: 1.19.3~493^2~1926 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78d80c8ca41cc6f67a908b846573d731544a00d1;p=platform%2Fupstream%2Fgstreamer.git track-element: Rename set_property_controlling_parameters set_control_source + Generate the documentation --- diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index 327014b..d6a4a3a 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -117,6 +117,9 @@ ges_track_element_get_child_properties ges_track_element_get_child_property_valist ges_track_element_get_child_property_by_pspec ges_track_element_edit +ges_track_element_copy +ges_track_element_set_control_source +ges_track_element_get_control_binding GESTrackElementPrivate ges_track_element_set_track diff --git a/ges/ges-base-xml-formatter.c b/ges/ges-base-xml-formatter.c index b905bab..85eb961 100644 --- a/ges/ges-base-xml-formatter.c +++ b/ges/ges-base-xml-formatter.c @@ -850,7 +850,7 @@ ges_base_xml_formatter_add_control_binding (GESBaseXmlFormatter * self, GstControlSource *source; source = gst_interpolation_control_source_new (); - ges_track_element_set_property_controlling_parameters (element, source, + ges_track_element_set_control_source (element, source, property_name, binding_type); g_object_set (source, "mode", mode, NULL); diff --git a/ges/ges-internal.h b/ges/ges-internal.h index 0dcbf56..9df37a7 100644 --- a/ges/ges-internal.h +++ b/ges/ges-internal.h @@ -219,11 +219,11 @@ G_GNUC_INTERNAL void ges_base_xml_formatter_add_track_element (GESBaseXmlForm GError **error); G_GNUC_INTERNAL void ges_base_xml_formatter_add_control_binding(GESBaseXmlFormatter * self, - const gchar * binding_type, - const gchar * source_type, - const gchar * property_name, - gint mode, - GSList * timed_values); + const gchar * binding_type, + const gchar * source_type, + const gchar * property_name, + gint mode, + GSList * timed_values); G_GNUC_INTERNAL void set_property_foreach (GQuark field_id, const GValue * value, diff --git a/ges/ges-track-element.c b/ges/ges-track-element.c index 3881193..5f23f26 100644 --- a/ges/ges-track-element.c +++ b/ges/ges-track-element.c @@ -1468,7 +1468,7 @@ ges_track_element_edit (GESTrackElement * object, /** - * ges_track_element_set_property_controlling_parameters: + * ges_track_element_set_control_source: * @object: the #GESTrackElement on which to set a control binding * @source: (element-type GstControlSource): the #GstControlSource to set on the binding. * @property_name: The name of the property to control. @@ -1484,7 +1484,7 @@ ges_track_element_edit (GESTrackElement * object, * Since: 1.0.XX */ gboolean -ges_track_element_set_property_controlling_parameters (GESTrackElement * object, +ges_track_element_set_control_source (GESTrackElement * object, GstControlSource * source, const gchar * property_name, const gchar * binding_type) { diff --git a/ges/ges-track-element.h b/ges/ges-track-element.h index 8e4ee94..95ec6b1 100644 --- a/ges/ges-track-element.h +++ b/ges/ges-track-element.h @@ -187,14 +187,14 @@ ges_track_element_edit (GESTrackElement * object, GESEdge edge, guint64 position); gboolean -ges_track_element_set_property_controlling_parameters(GESTrackElement *object, - GstControlSource *source, - const gchar *property_name, - const gchar *binding_type); +ges_track_element_set_control_source (GESTrackElement *object, + GstControlSource *source, + const gchar *property_name, + const gchar *binding_type); GstControlBinding * ges_track_element_get_control_binding (GESTrackElement *object, - const gchar *property_name); + const gchar *property_name); G_END_DECLS #endif /* _GES_TRACK_ELEMENT */ diff --git a/tests/check/ges/project.c b/tests/check/ges/project.c index dd88a8a..27df1e5 100644 --- a/tests/check/ges/project.c +++ b/tests/check/ges/project.c @@ -303,13 +303,13 @@ _add_keyframes (GESTimeline * timeline) ges_track_element_get_control_binding (element, "scratch-lines"); fail_unless (binding == NULL); - ges_track_element_set_property_controlling_parameters (element, + ges_track_element_set_control_source (element, source, "scratch-lines", "direct"); tmp_binding = ges_track_element_get_control_binding (element, "scratch-lines"); fail_unless (tmp_binding != NULL); - ges_track_element_set_property_controlling_parameters (element, + ges_track_element_set_control_source (element, source, "scratch-lines", "direct"); binding = ges_track_element_get_control_binding (element, @@ -393,7 +393,6 @@ _check_keyframes (GESTimeline * timeline) GST_START_TEST (test_project_add_keyframes) { GMainLoop *mainloop; - //GESTimelinePipeline *pipeline; GESProject *project; GESTimeline *timeline; GESAsset *formatter_asset;