diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index 82dd6c0ce8..49960be7ed 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -761,7 +761,7 @@ ges_track_effect_get_type ges-track-parse-launch-effect GESTrackParseLaunchEffect GESTrackParseLaunchEffect -ges_track_parse_launch_effect_new_from_bin_desc +ges_track_parse_launch_effect_new GESTrackParseLaunchEffectClass GESTrackParseLaunchEffectPrivate diff --git a/ges/ges-timeline-parse-launch-effect.c b/ges/ges-timeline-parse-launch-effect.c index f19064aff8..ad341ac17a 100644 --- a/ges/ges-timeline-parse-launch-effect.c +++ b/ges/ges-timeline-parse-launch-effect.c @@ -158,7 +158,7 @@ ges_tl_parse_launch_effect_create_track_obj (GESTimelineObject * self, if (track->type == GES_TRACK_TYPE_VIDEO) { if (effect->priv->video_bin_description != NULL) { GST_DEBUG ("Creating a GESTrackEffect for the video track"); - return GES_TRACK_OBJECT (ges_track_parse_launch_effect_new_from_bin_desc + return GES_TRACK_OBJECT (ges_track_parse_launch_effect_new (effect->priv->video_bin_description)); } GST_DEBUG ("Can't create the track Object, the\ @@ -167,7 +167,7 @@ ges_tl_parse_launch_effect_create_track_obj (GESTimelineObject * self, if (track->type == GES_TRACK_TYPE_AUDIO) { if (effect->priv->audio_bin_description != NULL) { GST_DEBUG ("Creating a GESTrackEffect for the audio track"); - return GES_TRACK_OBJECT (ges_track_parse_launch_effect_new_from_bin_desc + return GES_TRACK_OBJECT (ges_track_parse_launch_effect_new (effect->priv->audio_bin_description)); } GST_DEBUG ("Can't create the track Object, the\ diff --git a/ges/ges-track-parse-launch-effect.c b/ges/ges-track-parse-launch-effect.c index ba4ec40943..542d8ae342 100644 --- a/ges/ges-track-parse-launch-effect.c +++ b/ges/ges-track-parse-launch-effect.c @@ -252,7 +252,7 @@ ges_track_parse_launch_effect_create_element (GESTrackObject * object) } /** -* ges_track_parse_launch_effect_new_from_bin_desc: +* ges_track_parse_launch_effect_new: * @bin_description: The gst-launch like bin description of the effect * * Creates a new #GESTrackParseLaunchEffect from the description of the bin. @@ -261,7 +261,7 @@ ges_track_parse_launch_effect_create_element (GESTrackObject * object) * wrong. */ GESTrackParseLaunchEffect * -ges_track_parse_launch_effect_new_from_bin_desc (const gchar * bin_description) +ges_track_parse_launch_effect_new (const gchar * bin_description) { return g_object_new (GES_TYPE_TRACK_PARSE_LAUNCH_EFFECT, "bin-description", bin_description, NULL); diff --git a/ges/ges-track-parse-launch-effect.h b/ges/ges-track-parse-launch-effect.h index 540e792052..1da4d21eba 100644 --- a/ges/ges-track-parse-launch-effect.h +++ b/ges/ges-track-parse-launch-effect.h @@ -76,7 +76,7 @@ struct _GESTrackParseLaunchEffectClass GType ges_track_parse_launch_effect_get_type (void); GESTrackParseLaunchEffect -*ges_track_parse_launch_effect_new_from_bin_desc (const gchar * bin_description); +*ges_track_parse_launch_effect_new (const gchar * bin_description); G_END_DECLS #endif /* _GES_TRACK_PARSE_LAUNCH_EFFECT */ diff --git a/tests/check/ges/effects.c b/tests/check/ges/effects.c index d524ed8f4f..24c087618b 100644 --- a/tests/check/ges/effects.c +++ b/tests/check/ges/effects.c @@ -34,7 +34,7 @@ GST_START_TEST (test_effect_basic) ges_init (); - effect = ges_track_parse_launch_effect_new_from_bin_desc ("agingtv"); + effect = ges_track_parse_launch_effect_new ("agingtv"); fail_unless (effect != NULL); g_object_unref (effect); } @@ -69,7 +69,7 @@ GST_START_TEST (test_add_effect_to_tl_object) GST_DEBUG ("Create effect"); - track_effect = ges_track_parse_launch_effect_new_from_bin_desc ("agingtv"); + track_effect = ges_track_parse_launch_effect_new ("agingtv"); fail_unless (GES_IS_TRACK_EFFECT (track_effect)); @@ -117,9 +117,9 @@ GST_START_TEST (test_get_effects_from_tl) GST_DEBUG ("Create effect"); - track_effect = ges_track_parse_launch_effect_new_from_bin_desc ("agingtv"); - track_effect1 = ges_track_parse_launch_effect_new_from_bin_desc ("agingtv"); - track_effect2 = ges_track_parse_launch_effect_new_from_bin_desc ("agingtv"); + track_effect = ges_track_parse_launch_effect_new ("agingtv"); + track_effect1 = ges_track_parse_launch_effect_new ("agingtv"); + track_effect2 = ges_track_parse_launch_effect_new ("agingtv"); fail_unless (GES_IS_TRACK_EFFECT (track_effect)); fail_unless (GES_IS_TRACK_EFFECT (track_effect1)); @@ -199,7 +199,7 @@ GST_START_TEST (test_tl_effect) ges_simple_timeline_layer_add_object ((GESSimpleTimelineLayer *) (layer), (GESTimelineObject *) tl_effect, 0); - tck_effect = ges_track_parse_launch_effect_new_from_bin_desc ("identity"); + tck_effect = ges_track_parse_launch_effect_new ("identity"); fail_unless (ges_timeline_object_add_track_object (GES_TIMELINE_OBJECT (tl_effect), GES_TRACK_OBJECT (tck_effect))); fail_unless (ges_track_add_object (track_video, @@ -208,7 +208,7 @@ GST_START_TEST (test_tl_effect) g_object_get (tl_effect, "height", &tl_object_height, NULL); fail_unless (tl_object_height == 3); - tck_effect1 = ges_track_parse_launch_effect_new_from_bin_desc ("identity"); + tck_effect1 = ges_track_parse_launch_effect_new ("identity"); fail_unless (ges_timeline_object_add_track_object (GES_TIMELINE_OBJECT (tl_effect), GES_TRACK_OBJECT (tck_effect1))); fail_unless (ges_track_add_object (track_audio, @@ -270,7 +270,7 @@ GST_START_TEST (test_priorities_tl_object) ges_simple_timeline_layer_add_object ((GESSimpleTimelineLayer *) (layer), (GESTimelineObject *) tl_effect, 0); - tck_effect = ges_track_parse_launch_effect_new_from_bin_desc ("identity"); + tck_effect = ges_track_parse_launch_effect_new ("identity"); fail_unless (ges_timeline_object_add_track_object (GES_TIMELINE_OBJECT (tl_effect), GES_TRACK_OBJECT (tck_effect))); fail_unless (ges_track_add_object (track_video, @@ -279,7 +279,7 @@ GST_START_TEST (test_priorities_tl_object) g_object_get (tl_effect, "height", &tl_object_height, NULL); fail_unless (tl_object_height == 3); - tck_effect1 = ges_track_parse_launch_effect_new_from_bin_desc ("identity"); + tck_effect1 = ges_track_parse_launch_effect_new ("identity"); fail_unless (ges_timeline_object_add_track_object (GES_TIMELINE_OBJECT (tl_effect), GES_TRACK_OBJECT (tck_effect1))); fail_unless (ges_track_add_object (track_audio, @@ -347,7 +347,7 @@ GST_START_TEST (test_track_effect_set_properties) ges_simple_timeline_layer_add_object ((GESSimpleTimelineLayer *) (layer), (GESTimelineObject *) tl_effect, 0); - tck_effect = ges_track_parse_launch_effect_new_from_bin_desc ("agingtv"); + tck_effect = ges_track_parse_launch_effect_new ("agingtv"); fail_unless (ges_timeline_object_add_track_object (GES_TIMELINE_OBJECT (tl_effect), GES_TRACK_OBJECT (tck_effect))); fail_unless (ges_track_add_object (track_video, @@ -415,7 +415,7 @@ GST_START_TEST (test_tl_obj_signals) ges_simple_timeline_layer_add_object ((GESSimpleTimelineLayer *) (layer), (GESTimelineObject *) tl_effect, 0); - tck_effect = ges_track_parse_launch_effect_new_from_bin_desc ("agingtv"); + tck_effect = ges_track_parse_launch_effect_new ("agingtv"); fail_unless (ges_timeline_object_add_track_object (GES_TIMELINE_OBJECT (tl_effect), GES_TRACK_OBJECT (tck_effect))); fail_unless (ges_track_add_object (track_video,