From dc04fd005c49f6431cd69817c21262804819e6d3 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 25 Jan 2013 15:51:02 -0300 Subject: [PATCH] Rename GESStandardEffectClip to GESEffectClip --- docs/libs/ges-docs.sgml | 2 +- docs/libs/ges-sections.txt | 28 +++++----- docs/libs/ges.types | 2 +- ges/Makefile.am | 4 +- ...andard-effect-clip.c => ges-effect-clip.c} | 55 +++++++++---------- ...andard-effect-clip.h => ges-effect-clip.h} | 46 ++++++++-------- ges/ges-types.h | 4 +- ges/ges.h | 2 +- tests/check/ges/effects.c | 16 +++--- 9 files changed, 79 insertions(+), 80 deletions(-) rename ges/{ges-standard-effect-clip.c => ges-effect-clip.c} (74%) rename ges/{ges-standard-effect-clip.h => ges-effect-clip.h} (51%) diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml index 335cfd905b..baf394261e 100644 --- a/docs/libs/ges-docs.sgml +++ b/docs/libs/ges-docs.sgml @@ -58,7 +58,7 @@ platform as well as Windows. It is released under the GNU Library General Public - + diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index c01458d699..8b8e705fb6 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -530,21 +530,21 @@ GES_BASE_EFFECT_CLIP_GET_CLASS
-ges-standard-effect-clip -GESStandardEffectClip -GESStandardEffectClip -ges_standard_effect_clip_new +ges-effect-clip +GESEffectClip +GESEffectClip +ges_effect_clip_new -GESStandardEffectClipClass -GESStandardEffectClipPrivate -GES_STANDARD_EFFECT_CLIP_CLASS -GES_STANDARD_EFFECT_CLIP -GES_IS_STANDARD_EFFECT_CLIP -GES_TYPE_STANDARD_EFFECT_CLIP -ges_standard_effect_clip_get_type -GES_STANDARD_EFFECT_CLIP_CLASS_ -GES_IS_STANDARD_EFFECT_CLIP_CLASS -GES_STANDARD_EFFECT_CLIP_GET_CLASS +GESEffectClipClass +GESEffectClipPrivate +GES_EFFECT_CLIP_CLASS +GES_EFFECT_CLIP +GES_IS_EFFECT_CLIP +GES_TYPE_EFFECT_CLIP +ges_effect_clip_get_type +GES_EFFECT_CLIP_CLASS_ +GES_IS_EFFECT_CLIP_CLASS +GES_EFFECT_CLIP_GET_CLASS
diff --git a/docs/libs/ges.types b/docs/libs/ges.types index 17dedd8bec..243751666a 100644 --- a/docs/libs/ges.types +++ b/docs/libs/ges.types @@ -17,7 +17,7 @@ ges_test_clip_get_type ges_base_transition_clip_get_type ges_transition_clip_get_type ges_base_effect_clip_get_type -ges_standard_effect_clip_get_type +ges_effect_clip_get_type ges_uri_clip_get_type ges_overlay_text_clip_get_type ges_title_clip_get_type diff --git a/ges/Makefile.am b/ges/Makefile.am index 412c40cffe..908221605c 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -20,7 +20,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \ ges-timeline-pipeline.c \ ges-source-clip.c \ ges-base-effect-clip.c \ - ges-standard-effect-clip.c \ + ges-effect-clip.c \ ges-uri-clip.c \ ges-operation-clip.c \ ges-base-transition-clip.c \ @@ -75,7 +75,7 @@ libges_@GST_API_VERSION@include_HEADERS = \ ges-source-clip.h \ ges-uri-clip.h \ ges-base-effect-clip.h \ - ges-standard-effect-clip.h \ + ges-effect-clip.h \ ges-operation-clip.h \ ges-base-transition-clip.h \ ges-transition-clip.h \ diff --git a/ges/ges-standard-effect-clip.c b/ges/ges-effect-clip.c similarity index 74% rename from ges/ges-standard-effect-clip.c rename to ges/ges-effect-clip.c index fab7c4d0f1..d0415884d1 100644 --- a/ges/ges-standard-effect-clip.c +++ b/ges/ges-effect-clip.c @@ -18,7 +18,7 @@ */ /** - * SECTION: ges-standard-effect-clip + * SECTION: ges-effect-clip * @short_description: An effect created by parse-launch style bin descriptions * in a #GESTimelineLayer * @@ -36,10 +36,9 @@ #include "ges-internal.h" #include "ges-types.h" -G_DEFINE_TYPE (GESStandardEffectClip, ges_standard_effect_clip, - GES_TYPE_BASE_EFFECT_CLIP); +G_DEFINE_TYPE (GESEffectClip, ges_effect_clip, GES_TYPE_BASE_EFFECT_CLIP); -struct _GESStandardEffectClipPrivate +struct _GESEffectClipPrivate { gchar *video_bin_description; gchar *audio_bin_description; @@ -52,27 +51,27 @@ enum PROP_AUDIO_BIN_DESCRIPTION, }; -static void ges_standard_effect_clip_finalize (GObject * object); +static void ges_effect_clip_finalize (GObject * object); static GESTrackObject * ges_tl_parse_launch_effect_create_track_obj (GESClip * self, GESTrackType type); static void -ges_standard_effect_clip_finalize (GObject * object) +ges_effect_clip_finalize (GObject * object) { - GESStandardEffectClipPrivate *priv = GES_STANDARD_EFFECT_CLIP (object)->priv; + GESEffectClipPrivate *priv = GES_EFFECT_CLIP (object)->priv; g_free (priv->audio_bin_description); g_free (priv->video_bin_description); - G_OBJECT_CLASS (ges_standard_effect_clip_parent_class)->finalize (object); + G_OBJECT_CLASS (ges_effect_clip_parent_class)->finalize (object); } static void -ges_standard_effect_clip_get_property (GObject * object, +ges_effect_clip_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { - GESStandardEffectClipPrivate *priv = GES_STANDARD_EFFECT_CLIP (object)->priv; + GESEffectClipPrivate *priv = GES_EFFECT_CLIP (object)->priv; switch (property_id) { case PROP_VIDEO_BIN_DESCRIPTION: @@ -87,10 +86,10 @@ ges_standard_effect_clip_get_property (GObject * object, } static void -ges_standard_effect_clip_set_property (GObject * object, +ges_effect_clip_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { - GESStandardEffectClip *self = GES_STANDARD_EFFECT_CLIP (object); + GESEffectClip *self = GES_EFFECT_CLIP (object); switch (property_id) { case PROP_VIDEO_BIN_DESCRIPTION: @@ -105,19 +104,19 @@ ges_standard_effect_clip_set_property (GObject * object, } static void -ges_standard_effect_clip_class_init (GESStandardEffectClipClass * klass) +ges_effect_clip_class_init (GESEffectClipClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GESClipClass *timobj_class = GES_CLIP_CLASS (klass); - g_type_class_add_private (klass, sizeof (GESStandardEffectClipPrivate)); + g_type_class_add_private (klass, sizeof (GESEffectClipPrivate)); - object_class->get_property = ges_standard_effect_clip_get_property; - object_class->set_property = ges_standard_effect_clip_set_property; - object_class->finalize = ges_standard_effect_clip_finalize; + object_class->get_property = ges_effect_clip_get_property; + object_class->set_property = ges_effect_clip_set_property; + object_class->finalize = ges_effect_clip_finalize; /** - * GESStandardEffectClip:video-bin-description: + * GESEffectClip:video-bin-description: * * The description of the video track of the effect bin with a gst-launch-style * pipeline description. This should be used for test purposes. @@ -131,7 +130,7 @@ ges_standard_effect_clip_class_init (GESStandardEffectClipClass * klass) NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); /** - * GESStandardEffectClip:audio-bin-description: + * GESEffectClip:audio-bin-description: * * The description of the audio track of the effect bin with a gst-launch-style * pipeline description. This should be used for test purposes. @@ -150,10 +149,10 @@ ges_standard_effect_clip_class_init (GESStandardEffectClipClass * klass) } static void -ges_standard_effect_clip_init (GESStandardEffectClip * self) +ges_effect_clip_init (GESEffectClip * self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - GES_TYPE_STANDARD_EFFECT_CLIP, GESStandardEffectClipPrivate); + GES_TYPE_EFFECT_CLIP, GESEffectClipPrivate); } @@ -161,7 +160,7 @@ static GESTrackObject * ges_tl_parse_launch_effect_create_track_obj (GESClip * self, GESTrackType type) { const gchar *bin_description = NULL; - GESStandardEffectClip *effect = GES_STANDARD_EFFECT_CLIP (self); + GESEffectClip *effect = GES_EFFECT_CLIP (self); if (type == GES_TRACK_TYPE_VIDEO) { bin_description = effect->priv->video_bin_description; @@ -180,22 +179,22 @@ ges_tl_parse_launch_effect_create_track_obj (GESClip * self, GESTrackType type) } /** - * ges_standard_effect_clip_new: + * ges_effect_clip_new: * @video_bin_description: The gst-launch like bin description of the effect * @audio_bin_description: The gst-launch like bin description of the effect * - * Creates a new #GESStandardEffectClip from the description of the bin. + * Creates a new #GESEffectClip from the description of the bin. * - * Returns: a newly created #GESStandardEffectClip, or + * Returns: a newly created #GESEffectClip, or * %NULL if something went wrong. * * Since: 0.10.2 */ -GESStandardEffectClip * -ges_standard_effect_clip_new (const gchar * video_bin_description, +GESEffectClip * +ges_effect_clip_new (const gchar * video_bin_description, const gchar * audio_bin_description) { - return g_object_new (GES_TYPE_STANDARD_EFFECT_CLIP, + return g_object_new (GES_TYPE_EFFECT_CLIP, "video-bin-description", video_bin_description, "audio-bin-description", audio_bin_description, NULL); } diff --git a/ges/ges-standard-effect-clip.h b/ges/ges-effect-clip.h similarity index 51% rename from ges/ges-standard-effect-clip.h rename to ges/ges-effect-clip.h index b5db2aeded..2e0c6c82b7 100644 --- a/ges/ges-standard-effect-clip.h +++ b/ges/ges-effect-clip.h @@ -17,52 +17,52 @@ * Boston, MA 02110-1301, USA. */ -#ifndef _GES_STANDARD_EFFECT_CLIP -#define _GES_STANDARD_EFFECT_CLIP +#ifndef _GES_EFFECT_CLIP +#define _GES_EFFECT_CLIP #include #include G_BEGIN_DECLS -#define GES_TYPE_STANDARD_EFFECT_CLIP ges_standard_effect_clip_get_type() +#define GES_TYPE_EFFECT_CLIP ges_effect_clip_get_type() -#define GES_STANDARD_EFFECT_CLIP(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_STANDARD_EFFECT_CLIP, GESStandardEffectClip)) +#define GES_EFFECT_CLIP(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_EFFECT_CLIP, GESEffectClip)) -#define GES_STANDARD_EFFECT_CLIP_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_STANDARD_EFFECT_CLIP, GESStandardEffectClipClass)) +#define GES_EFFECT_CLIP_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_EFFECT_CLIP, GESEffectClipClass)) -#define GES_IS_STANDARD_EFFECT_CLIP(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_STANDARD_EFFECT_CLIP)) +#define GES_IS_EFFECT_CLIP(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_EFFECT_CLIP)) -#define GES_IS_STANDARD_EFFECT_CLIP_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_STANDARD_EFFECT_CLIP)) +#define GES_IS_EFFECT_CLIP_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_EFFECT_CLIP)) -#define GES_STANDARD_EFFECT_CLIP_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_STANDARD_EFFECT_CLIP, GESStandardEffectClipClass)) +#define GES_EFFECT_CLIP_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_EFFECT_CLIP, GESEffectClipClass)) -typedef struct _GESStandardEffectClipPrivate GESStandardEffectClipPrivate; +typedef struct _GESEffectClipPrivate GESEffectClipPrivate; /** - * GESStandardEffectClip: + * GESEffectClip: */ -struct _GESStandardEffectClip { +struct _GESEffectClip { /*< private >*/ GESBaseEffectClip parent; - GESStandardEffectClipPrivate *priv; + GESEffectClipPrivate *priv; /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; /** - * GESStandardEffectClipClass: + * GESEffectClipClass: * */ -struct _GESStandardEffectClipClass { +struct _GESEffectClipClass { /*< private >*/ GESBaseEffectClipClass parent_class; @@ -70,11 +70,11 @@ struct _GESStandardEffectClipClass { gpointer _ges_reserved[GES_PADDING]; }; -GType ges_standard_effect_clip_get_type (void); +GType ges_effect_clip_get_type (void); -GESStandardEffectClip * -ges_standard_effect_clip_new (const gchar * video_bin_description, +GESEffectClip * +ges_effect_clip_new (const gchar * video_bin_description, const gchar * audio_bin_description); G_END_DECLS -#endif /* _GES_STANDARD_EFFECT_CLIP */ +#endif /* _GES_EFFECT_CLIP */ diff --git a/ges/ges-types.h b/ges/ges-types.h index cc747e73fc..24240eacef 100644 --- a/ges/ges-types.h +++ b/ges/ges-types.h @@ -80,8 +80,8 @@ typedef struct _GESOverlayClipClass GESOverlayClipClass; typedef struct _GESTextOverlayClip GESTextOverlayClip; typedef struct _GESTextOverlayClipClass GESTextOverlayClipClass; -typedef struct _GESStandardEffectClip GESStandardEffectClip; -typedef struct _GESStandardEffectClipClass GESStandardEffectClipClass; +typedef struct _GESEffectClip GESEffectClip; +typedef struct _GESEffectClipClass GESEffectClipClass; typedef struct _GESTrack GESTrack; typedef struct _GESTrackClass GESTrackClass; diff --git a/ges/ges.h b/ges/ges.h index f6595e1001..23f82c01b2 100644 --- a/ges/ges.h +++ b/ges/ges.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/check/ges/effects.c b/tests/check/ges/effects.c index ca47768603..0e2670521c 100644 --- a/tests/check/ges/effects.c +++ b/tests/check/ges/effects.c @@ -166,7 +166,7 @@ GST_START_TEST (test_effect_clip) GESTimeline *timeline; GESTimelineLayer *layer; GESTrack *track_audio, *track_video; - GESStandardEffectClip *effect_clip; + GESEffectClip *effect_clip; GESTrackParseLaunchEffect *tck_effect, *tck_effect1; GList *effects, *tmp; gint i, clip_height; @@ -189,7 +189,7 @@ GST_START_TEST (test_effect_clip) ges_timeline_add_layer (timeline, layer); GST_DEBUG ("Create effect"); - effect_clip = ges_standard_effect_clip_new ("identity", "identity"); + effect_clip = ges_effect_clip_new ("identity", "identity"); g_object_set (effect_clip, "duration", 25 * GST_SECOND, NULL); @@ -240,7 +240,7 @@ GST_START_TEST (test_priorities_clip) GESTimeline *timeline; GESTimelineLayer *layer; GESTrack *track_audio, *track_video; - GESStandardEffectClip *effect_clip; + GESEffectClip *effect_clip; GESTrackParseLaunchEffect *tck_effect, *tck_effect1; GList *effects, *tmp; gint i, clip_height; @@ -258,7 +258,7 @@ GST_START_TEST (test_priorities_clip) ges_timeline_add_layer (timeline, layer); GST_DEBUG ("Create effect"); - effect_clip = ges_standard_effect_clip_new ("identity", "identity"); + effect_clip = ges_effect_clip_new ("identity", "identity"); g_object_set (effect_clip, "duration", 25 * GST_SECOND, NULL); @@ -316,7 +316,7 @@ GST_START_TEST (test_track_effect_set_properties) GESTimeline *timeline; GESTimelineLayer *layer; GESTrack *track_video; - GESStandardEffectClip *effect_clip; + GESEffectClip *effect_clip; GESTrackObject *tck_effect; guint scratch_line, n_props, i; gboolean color_aging; @@ -334,7 +334,7 @@ GST_START_TEST (test_track_effect_set_properties) ges_timeline_add_layer (timeline, layer); GST_DEBUG ("Create effect"); - effect_clip = ges_standard_effect_clip_new ("agingtv", NULL); + effect_clip = ges_effect_clip_new ("agingtv", NULL); g_object_set (effect_clip, "duration", 25 * GST_SECOND, NULL); @@ -404,7 +404,7 @@ GST_START_TEST (test_clip_signals) GESTimeline *timeline; GESTimelineLayer *layer; GESTrack *track_video; - GESStandardEffectClip *effect_clip; + GESEffectClip *effect_clip; GESTrackParseLaunchEffect *tck_effect; GValue val = { 0, }; @@ -418,7 +418,7 @@ GST_START_TEST (test_clip_signals) ges_timeline_add_layer (timeline, layer); GST_DEBUG ("Create effect"); - effect_clip = ges_standard_effect_clip_new ("agingtv", NULL); + effect_clip = ges_effect_clip_new ("agingtv", NULL); g_signal_connect (effect_clip, "effect-added", (GCallback) effect_added_cb, effect_clip);