diff --git a/android/ges.mk b/android/ges.mk index 0f721fe5c8..40dc073cc8 100644 --- a/android/ges.mk +++ b/android/ges.mk @@ -20,7 +20,7 @@ LOCAL_SRC_FILES := \ ges-uri-clip.c \ ges-timeline-operation.c \ ges-transition-clip.c \ - ges-timeline-standard-transition.c \ + ges-standard-transition-clip.c \ ges-timeline-test-source.c \ ges-timeline-title-source.c \ ges-timeline-overlay.c \ diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml index d7519c28a5..00deebf52a 100644 --- a/docs/libs/ges-docs.sgml +++ b/docs/libs/ges-docs.sgml @@ -57,7 +57,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 63da4caf0e..f67915988f 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -545,21 +545,21 @@ GES_TIMELINE_PARSE_LAUNCH_EFFECT_GET_CLASS
-ges-timeline-standard-transition -GESTimelineStandardTransition -GESTimelineStandardTransition -ges_timeline_standard_transition_new -ges_timeline_standard_transition_new_for_nick +ges-standard-transition-clip +GESStandardTransitionClip +GESStandardTransitionClip +ges_standard_transition_clip_new +ges_standard_transition_clip_new_for_nick -GESTimelineStandardTransitionClass -GESTimelineStandardTransitionPrivate -GES_IS_TIMELINE_STANDARD_TRANSITION -GES_IS_TIMELINE_STANDARD_TRANSITION_CLASS -GES_TIMELINE_STANDARD_TRANSITION -GES_TIMELINE_STANDARD_TRANSITION_CLASS -GES_TIMELINE_STANDARD_TRANSITION_GET_CLASS -GES_TYPE_TIMELINE_STANDARD_TRANSITION -ges_timeline_standard_transition_get_type +GESStandardTransitionClipClass +GESStandardTransitionClipPrivate +GES_IS_STANDARD_TRANSITION_CLIP +GES_IS_STANDARD_TRANSITION_CLIP_CLASS +GES_STANDARD_TRANSITION_CLIP +GES_STANDARD_TRANSITION_CLIP_CLASS +GES_STANDARD_TRANSITION_CLIP_GET_CLASS +GES_TYPE_STANDARD_TRANSITION_CLIP +ges_standard_transition_clip_get_type
diff --git a/docs/libs/ges.types b/docs/libs/ges.types index 10ef8cdb16..df7a4875c3 100644 --- a/docs/libs/ges.types +++ b/docs/libs/ges.types @@ -15,7 +15,7 @@ ges_timeline_pipeline_get_type ges_timeline_source_get_type ges_timeline_test_source_get_type ges_transition_clip_get_type -ges_timeline_standard_transition_get_type +ges_standard_transition_clip_get_type ges_effect_clip_get_type ges_timeline_parse_launch_effect_get_type ges_uri_clip_get_type diff --git a/ges/Makefile.am b/ges/Makefile.am index 8ff11dad08..94fd55375c 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -24,7 +24,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \ ges-uri-clip.c \ ges-timeline-operation.c \ ges-transition-clip.c \ - ges-timeline-standard-transition.c \ + ges-standard-transition-clip.c \ ges-timeline-test-source.c \ ges-timeline-title-source.c \ ges-timeline-overlay.c \ @@ -78,7 +78,7 @@ libges_@GST_API_VERSION@include_HEADERS = \ ges-timeline-parse-launch-effect.h \ ges-timeline-operation.h \ ges-transition-clip.h \ - ges-timeline-standard-transition.h \ + ges-standard-transition-clip.h \ ges-timeline-test-source.h \ ges-timeline-title-source.h \ ges-timeline-overlay.h \ diff --git a/ges/ges-asset.c b/ges/ges-asset.c index c5e170e010..9ef0812e5c 100644 --- a/ges/ges-asset.c +++ b/ges/ges-asset.c @@ -52,13 +52,13 @@ * The identifier represents different things depending on the @extractable_type and you should check * the documentation of each type to know what the ID of #GESAsset actually represents for that type. By default, * we only have one #GESAsset per type, and the @id is the name of the type, but this behaviour is overriden - * to be more usefull. For example, for GESTimelineStandardTransitions, the ID is the vtype of the transition + * to be more usefull. For example, for GESStandardTransitionClips, the ID is the vtype of the transition * you will extract from it (ie crossfade, box-wipe-rc etc..) For #GESTrackParseLaunchEffect the id is the * @bin-description property of the extracted objects (ie the gst-launch style description of the bin that * will be used). * * Each and every #GESAsset are cached into GES, and you can query those with the #ges_list_assets function. - * Also the system will automatically register #GESAssets for #GESFormatters and #GESTimelineStandardTransitions + * Also the system will automatically register #GESAssets for #GESFormatters and #GESStandardTransitionClips * and standard effects (actually not implemented yet) and you can simply query those calling: * |[ * GList *formatter_assets, *tmp; diff --git a/ges/ges-enums.c b/ges/ges-enums.c index b77ac08e8e..dd8d48dcf9 100644 --- a/ges/ges-enums.c +++ b/ges/ges-enums.c @@ -27,7 +27,7 @@ #include "ges-internal.h" #include "ges-asset.h" #include "ges-meta-container.h" -#include "ges-timeline-standard-transition.h" +#include "ges-standard-transition-clip.h" #define C_ENUM(v) ((guint) v) @@ -525,7 +525,7 @@ _init_standard_transition_assets (void) guint i; for (i = 1; i < G_N_ELEMENTS (transition_types) - 1; i++) { - GESAsset *asset = ges_asset_request (GES_TYPE_TIMELINE_STANDARD_TRANSITION, + GESAsset *asset = ges_asset_request (GES_TYPE_STANDARD_TRANSITION_CLIP, transition_types[i].value_nick, NULL); ges_meta_container_register_meta_string (GES_META_CONTAINER (asset), diff --git a/ges/ges-meta-container.c b/ges/ges-meta-container.c index 1505734c85..a212916531 100644 --- a/ges/ges-meta-container.c +++ b/ges/ges-meta-container.c @@ -14,8 +14,7 @@ static GQuark ges_meta_key; G_DEFINE_INTERFACE_WITH_CODE (GESMetaContainer, ges_meta_container, G_TYPE_OBJECT, ges_meta_key = - g_quark_from_static_string ("ges-meta-container-data"); - ); + g_quark_from_static_string ("ges-meta-container-data");); enum { diff --git a/ges/ges-timeline-standard-transition.c b/ges/ges-standard-transition-clip.c similarity index 75% rename from ges/ges-timeline-standard-transition.c rename to ges/ges-standard-transition-clip.c index 9c74b80bd4..d19ed4fe98 100644 --- a/ges/ges-timeline-standard-transition.c +++ b/ges/ges-standard-transition-clip.c @@ -19,7 +19,7 @@ */ /** - * SECTION: ges-timeline-standard-transition + * SECTION: ges-standard-transition-clip * @short_description: Transition from one clip to another in a * #GESTimelineLayer * @@ -33,7 +33,7 @@ * supported. * * #GESSimpleTimelineLayer will automatically manage the priorities of sources - * and transitions. If you use #GESTimelineStandardTransitions in another type of + * and transitions. If you use #GESStandardTransitionClips in another type of * #GESTimelineLayer, you will need to manage priorities yourself. * * The ID of the ExtractableType is the nickname of the vtype property value. Note @@ -44,7 +44,7 @@ #include #include "ges-internal.h" -struct _GESTimelineStandardTransitionPrivate +struct _GESStandardTransitionClipPrivate { GSList *track_video_transitions; @@ -59,23 +59,22 @@ enum static GESTrackObject *ges_tl_transition_create_track_object (GESClip * self, GESTrackType type); static void -ges_timeline_standard_transition_track_object_added (GESClip * obj, +ges_standard_transition_clip_track_object_added (GESClip * obj, GESTrackObject * tckobj); static void -ges_timeline_standard_transition_track_object_released (GESClip * obj, +ges_standard_transition_clip_track_object_released (GESClip * obj, GESTrackObject * tckobj); /* Internal methods */ static void -ges_timeline_standard_transition_update_vtype_internal (GESClip * +ges_standard_transition_clip_update_vtype_internal (GESClip * self, GESVideoStandardTransitionType value, gboolean set_asset) { GSList *tmp; guint index; GEnumClass *enum_class; const gchar *asset_id = NULL; - GESTimelineStandardTransition *trself = - GES_TIMELINE_STANDARD_TRANSITION (self); + GESStandardTransitionClip *trself = GES_STANDARD_TRANSITION_CLIP (self); enum_class = g_type_class_peek (GES_VIDEO_STANDARD_TRANSITION_TYPE_TYPE); for (index = 0; index < enum_class->n_values; index++) { @@ -104,8 +103,7 @@ ges_timeline_standard_transition_update_vtype_internal (GESClip * if (set_asset) { /* We already checked the value, so we can be sure no error will accured */ ges_extractable_set_asset (GES_EXTRACTABLE (self), - ges_asset_request (GES_TYPE_TIMELINE_STANDARD_TRANSITION, - asset_id, NULL)); + ges_asset_request (GES_TYPE_STANDARD_TRANSITION_CLIP, asset_id, NULL)); } } @@ -146,7 +144,7 @@ extractable_get_id (GESExtractable * self) { guint index; GEnumClass *enum_class; - guint value = GES_TIMELINE_STANDARD_TRANSITION (self)->vtype; + guint value = GES_STANDARD_TRANSITION_CLIP (self)->vtype; enum_class = g_type_class_peek (GES_VIDEO_STANDARD_TRANSITION_TYPE_TYPE); for (index = 0; index < enum_class->n_values; index++) { @@ -162,8 +160,7 @@ extractable_set_asset (GESExtractable * self, GESAsset * asset) { GEnumClass *enum_class; GESVideoStandardTransitionType value; - GESTimelineStandardTransition *trans = - GES_TIMELINE_STANDARD_TRANSITION (self); + GESStandardTransitionClip *trans = GES_STANDARD_TRANSITION_CLIP (self); const gchar *vtype = ges_asset_get_id (asset); /* Update the transition type if we actually changed it */ @@ -180,7 +177,7 @@ extractable_set_asset (GESExtractable * self, GESAsset * asset) break; } } - ges_timeline_standard_transition_update_vtype_internal + ges_standard_transition_clip_update_vtype_internal (GES_CLIP (self), value, FALSE); } } @@ -195,17 +192,16 @@ ges_extractable_interface_init (GESExtractableInterface * iface) iface->set_asset = extractable_set_asset; } -G_DEFINE_TYPE_WITH_CODE (GESTimelineStandardTransition, - ges_timeline_standard_transition, GES_TYPE_TRANSITION_CLIP, +G_DEFINE_TYPE_WITH_CODE (GESStandardTransitionClip, + ges_standard_transition_clip, GES_TYPE_TRANSITION_CLIP, G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE, ges_extractable_interface_init)); static void -ges_timeline_standard_transition_get_property (GObject * object, +ges_standard_transition_clip_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { - GESTimelineStandardTransition *self = - GES_TIMELINE_STANDARD_TRANSITION (object); + GESStandardTransitionClip *self = GES_STANDARD_TRANSITION_CLIP (object); switch (property_id) { case PROP_VTYPE: g_value_set_enum (value, self->vtype); @@ -216,14 +212,14 @@ ges_timeline_standard_transition_get_property (GObject * object, } static void -ges_timeline_standard_transition_set_property (GObject * object, +ges_standard_transition_clip_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { GESClip *self = GES_CLIP (object); switch (property_id) { case PROP_VTYPE: - ges_timeline_standard_transition_update_vtype_internal (self, + ges_standard_transition_clip_update_vtype_internal (self, g_value_get_enum (value), TRUE); break; default: @@ -232,20 +228,18 @@ ges_timeline_standard_transition_set_property (GObject * object, } static void -ges_timeline_standard_transition_class_init (GESTimelineStandardTransitionClass - * klass) +ges_standard_transition_clip_class_init (GESStandardTransitionClipClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GESClipClass *timobj_class = GES_CLIP_CLASS (klass); - g_type_class_add_private (klass, - sizeof (GESTimelineStandardTransitionPrivate)); + g_type_class_add_private (klass, sizeof (GESStandardTransitionClipPrivate)); - object_class->get_property = ges_timeline_standard_transition_get_property; - object_class->set_property = ges_timeline_standard_transition_set_property; + object_class->get_property = ges_standard_transition_clip_get_property; + object_class->set_property = ges_standard_transition_clip_set_property; /** - * GESTimelineStandardTransition:vtype: + * GESStandardTransitionClip:vtype: * * a #GESVideoStandardTransitionType representing the wipe to use */ @@ -260,29 +254,28 @@ ges_timeline_standard_transition_class_init (GESTimelineStandardTransitionClass timobj_class->create_track_object = ges_tl_transition_create_track_object; timobj_class->need_fill_track = FALSE; timobj_class->track_object_added = - ges_timeline_standard_transition_track_object_added; + ges_standard_transition_clip_track_object_added; timobj_class->track_object_released = - ges_timeline_standard_transition_track_object_released; + ges_standard_transition_clip_track_object_released; } static void -ges_timeline_standard_transition_init (GESTimelineStandardTransition * self) +ges_standard_transition_clip_init (GESStandardTransitionClip * self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - GES_TYPE_TIMELINE_STANDARD_TRANSITION, - GESTimelineStandardTransitionPrivate); + GES_TYPE_STANDARD_TRANSITION_CLIP, GESStandardTransitionClipPrivate); self->vtype = GES_VIDEO_STANDARD_TRANSITION_TYPE_NONE; self->priv->vtype_name = NULL; } static void -ges_timeline_standard_transition_track_object_released (GESClip * obj, +ges_standard_transition_clip_track_object_released (GESClip * obj, GESTrackObject * tckobj) { - GESTimelineStandardTransitionPrivate *priv = - GES_TIMELINE_STANDARD_TRANSITION (obj)->priv; + GESStandardTransitionClipPrivate *priv = + GES_STANDARD_TRANSITION_CLIP (obj)->priv; /* If this is called, we should be sure the tckobj exists */ if (GES_IS_TRACK_VIDEO_TRANSITION (tckobj)) { @@ -294,11 +287,11 @@ ges_timeline_standard_transition_track_object_released (GESClip * obj, } static void -ges_timeline_standard_transition_track_object_added (GESClip * obj, +ges_standard_transition_clip_track_object_added (GESClip * obj, GESTrackObject * tckobj) { - GESTimelineStandardTransitionPrivate *priv = - GES_TIMELINE_STANDARD_TRANSITION (obj)->priv; + GESStandardTransitionClipPrivate *priv = + GES_STANDARD_TRANSITION_CLIP (obj)->priv; if (GES_IS_TRACK_VIDEO_TRANSITION (tckobj)) { GST_DEBUG ("GESTrackVideoTransition %p added to %p", tckobj, obj); @@ -310,8 +303,7 @@ ges_timeline_standard_transition_track_object_added (GESClip * obj, static GESTrackObject * ges_tl_transition_create_track_object (GESClip * obj, GESTrackType type) { - GESTimelineStandardTransition *transition = - (GESTimelineStandardTransition *) obj; + GESStandardTransitionClip *transition = (GESStandardTransitionClip *) obj; GESTrackObject *res = NULL; GESTrackType supportedformats; @@ -348,37 +340,37 @@ ges_tl_transition_create_track_object (GESClip * obj, GESTrackType type) } /** - * ges_timeline_standard_transition_new: + * ges_standard_transition_clip_new: * @vtype: the type of transition to create * - * Creates a new #GESTimelineStandardTransition. + * Creates a new #GESStandardTransitionClip. * - * Returns: a newly created #GESTimelineStandardTransition, or %NULL if something + * Returns: a newly created #GESStandardTransitionClip, or %NULL if something * went wrong. */ -GESTimelineStandardTransition * -ges_timeline_standard_transition_new (GESVideoStandardTransitionType vtype) +GESStandardTransitionClip * +ges_standard_transition_clip_new (GESVideoStandardTransitionType vtype) { - return g_object_new (GES_TYPE_TIMELINE_STANDARD_TRANSITION, "vtype", + return g_object_new (GES_TYPE_STANDARD_TRANSITION_CLIP, "vtype", (gint) vtype, NULL); } /** - * ges_timeline_standard_transition_new_for_nick: + * ges_standard_transition_clip_new_for_nick: * @nick: a string representing the type of transition to create * - * Creates a new #GESTimelineStandardTransition for the provided @nick. + * Creates a new #GESStandardTransitionClip for the provided @nick. * - * Returns: The newly created #GESTimelineStandardTransition, or %NULL if something + * Returns: The newly created #GESStandardTransitionClip, or %NULL if something * went wrong */ -GESTimelineStandardTransition * -ges_timeline_standard_transition_new_for_nick (gchar * nick) +GESStandardTransitionClip * +ges_standard_transition_clip_new_for_nick (gchar * nick) { GEnumValue *value; GEnumClass *klass; - GESTimelineStandardTransition *ret = NULL; + GESStandardTransitionClip *ret = NULL; klass = G_ENUM_CLASS (g_type_class_ref (GES_VIDEO_STANDARD_TRANSITION_TYPE_TYPE)); @@ -387,7 +379,7 @@ ges_timeline_standard_transition_new_for_nick (gchar * nick) value = g_enum_get_value_by_nick (klass, nick); if (value) { - ret = g_object_new (GES_TYPE_TIMELINE_STANDARD_TRANSITION, "vtype", + ret = g_object_new (GES_TYPE_STANDARD_TRANSITION_CLIP, "vtype", (gint) value->value, NULL); } diff --git a/ges/ges-standard-transition-clip.h b/ges/ges-standard-transition-clip.h new file mode 100644 index 0000000000..e3d0a17453 --- /dev/null +++ b/ges/ges-standard-transition-clip.h @@ -0,0 +1,88 @@ +/* GStreamer Editing Services + * Copyright (C) 2009 Edward Hervey + * 2009 Nokia Corporation + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef _GES_STANDARD_TRANSITION_CLIP +#define _GES_STANDARD_TRANSITION_CLIP + +#include +#include +#include + +G_BEGIN_DECLS + +#define GES_TYPE_STANDARD_TRANSITION_CLIP ges_standard_transition_clip_get_type() + +#define GES_STANDARD_TRANSITION_CLIP(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_STANDARD_TRANSITION_CLIP, GESStandardTransitionClip)) + +#define GES_STANDARD_TRANSITION_CLIP_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_STANDARD_TRANSITION_CLIP, GESStandardTransitionClipClass)) + +#define GES_IS_STANDARD_TRANSITION_CLIP(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_STANDARD_TRANSITION_CLIP)) + +#define GES_IS_STANDARD_TRANSITION_CLIP_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_STANDARD_TRANSITION_CLIP)) + +#define GES_STANDARD_TRANSITION_CLIP_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_STANDARD_TRANSITION_CLIP, GESStandardTransitionClipClass)) + +typedef struct _GESStandardTransitionClipPrivate GESStandardTransitionClipPrivate; + +/** + * GESStandardTransitionClip: + * @vtype: a #GESVideoStandardTransitionType indicating the type of video transition + * to apply. + */ +struct _GESStandardTransitionClip { + /*< private >*/ + GESTransitionClip parent; + + /*< public >*/ + GESVideoStandardTransitionType vtype; + + /*< private >*/ + GESStandardTransitionClipPrivate *priv; + + /* Padding for API extension */ + gpointer _ges_reserved[GES_PADDING]; +}; + +/** + * GESStandardTransitionClipClass: + * + */ + +struct _GESStandardTransitionClipClass { + /*< private >*/ + GESTransitionClipClass parent_class; + + /* Padding for API extension */ + gpointer _ges_reserved[GES_PADDING]; +}; + +GType ges_standard_transition_clip_get_type (void); + +GESStandardTransitionClip *ges_standard_transition_clip_new (GESVideoStandardTransitionType vtype); +GESStandardTransitionClip *ges_standard_transition_clip_new_for_nick (char *nick); + +G_END_DECLS + +#endif /* _GES_STANDARD_TRANSITION_CLIP */ diff --git a/ges/ges-timeline-pipeline.c b/ges/ges-timeline-pipeline.c index 95fedece51..9503878f4e 100644 --- a/ges/ges-timeline-pipeline.c +++ b/ges/ges-timeline-pipeline.c @@ -374,8 +374,8 @@ ges_timeline_pipeline_change_state (GstElement * element, ret = GST_STATE_CHANGE_FAILURE; goto done; } - if (self->priv-> - mode & (TIMELINE_MODE_RENDER | TIMELINE_MODE_SMART_RENDER)) + if (self-> + priv->mode & (TIMELINE_MODE_RENDER | TIMELINE_MODE_SMART_RENDER)) GST_DEBUG ("rendering => Updating pipeline caps"); if (!ges_timeline_pipeline_update_caps (self)) { GST_ERROR_OBJECT (element, "Error setting the caps for rendering"); diff --git a/ges/ges-timeline-standard-transition.h b/ges/ges-timeline-standard-transition.h deleted file mode 100644 index f4c37db585..0000000000 --- a/ges/ges-timeline-standard-transition.h +++ /dev/null @@ -1,88 +0,0 @@ -/* GStreamer Editing Services - * Copyright (C) 2009 Edward Hervey - * 2009 Nokia Corporation - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef _GES_TIMELINE_STANDARD_TRANSITION -#define _GES_TIMELINE_STANDARD_TRANSITION - -#include -#include -#include - -G_BEGIN_DECLS - -#define GES_TYPE_TIMELINE_STANDARD_TRANSITION ges_timeline_standard_transition_get_type() - -#define GES_TIMELINE_STANDARD_TRANSITION(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_STANDARD_TRANSITION, GESTimelineStandardTransition)) - -#define GES_TIMELINE_STANDARD_TRANSITION_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_STANDARD_TRANSITION, GESTimelineStandardTransitionClass)) - -#define GES_IS_TIMELINE_STANDARD_TRANSITION(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_STANDARD_TRANSITION)) - -#define GES_IS_TIMELINE_STANDARD_TRANSITION_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_STANDARD_TRANSITION)) - -#define GES_TIMELINE_STANDARD_TRANSITION_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_STANDARD_TRANSITION, GESTimelineStandardTransitionClass)) - -typedef struct _GESTimelineStandardTransitionPrivate GESTimelineStandardTransitionPrivate; - -/** - * GESTimelineStandardTransition: - * @vtype: a #GESVideoStandardTransitionType indicating the type of video transition - * to apply. - */ -struct _GESTimelineStandardTransition { - /*< private >*/ - GESTransitionClip parent; - - /*< public >*/ - GESVideoStandardTransitionType vtype; - - /*< private >*/ - GESTimelineStandardTransitionPrivate *priv; - - /* Padding for API extension */ - gpointer _ges_reserved[GES_PADDING]; -}; - -/** - * GESTimelineStandardTransitionClass: - * - */ - -struct _GESTimelineStandardTransitionClass { - /*< private >*/ - GESTransitionClipClass parent_class; - - /* Padding for API extension */ - gpointer _ges_reserved[GES_PADDING]; -}; - -GType ges_timeline_standard_transition_get_type (void); - -GESTimelineStandardTransition *ges_timeline_standard_transition_new (GESVideoStandardTransitionType vtype); -GESTimelineStandardTransition *ges_timeline_standard_transition_new_for_nick (char *nick); - -G_END_DECLS - -#endif /* _GES_TIMELINE_STANDARD_TRANSITION */ diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c index 1e065542e5..b6ee152b41 100644 --- a/ges/ges-timeline.c +++ b/ges/ges-timeline.c @@ -676,7 +676,7 @@ create_transition (GESTimeline * timeline, GESTrackObject * previous, if (transition == NULL) { /* TODO make it possible to specify a Transition asset in the API */ - asset = ges_asset_request (GES_TYPE_TIMELINE_STANDARD_TRANSITION, + asset = ges_asset_request (GES_TYPE_STANDARD_TRANSITION_CLIP, "crossfade", NULL); transition = ges_timeline_layer_add_asset (layer, asset, start, 0, duration, 1, diff --git a/ges/ges-types.h b/ges/ges-types.h index 5201187e04..ba0781cb86 100644 --- a/ges/ges-types.h +++ b/ges/ges-types.h @@ -65,8 +65,8 @@ typedef struct _GESUriClipClass GESUriClipClass; typedef struct _GESTransitionClip GESTransitionClip; typedef struct _GESTransitionClipClass GESTransitionClipClass; -typedef struct _GESTimelineStandardTransition GESTimelineStandardTransition; -typedef struct _GESTimelineStandardTransitionClass GESTimelineStandardTransitionClass; +typedef struct _GESStandardTransitionClip GESStandardTransitionClip; +typedef struct _GESStandardTransitionClipClass GESStandardTransitionClipClass; typedef struct _GESTimelineTestSource GESTimelineTestSource; typedef struct _GESTimelineTestSourceClass GESTimelineTestSourceClass; diff --git a/ges/ges.c b/ges/ges.c index 452e076419..95699a96d6 100644 --- a/ges/ges.c +++ b/ges/ges.c @@ -74,7 +74,7 @@ ges_init (void) GES_TYPE_TIMELINE_TEST_SOURCE; GES_TYPE_URI_CLIP; GES_TYPE_TIMELINE_TITLE_SOURCE; - GES_TYPE_TIMELINE_STANDARD_TRANSITION; + GES_TYPE_STANDARD_TRANSITION_CLIP; GES_TYPE_TIMELINE_OVERLAY; /* register formatter types with the system */ diff --git a/ges/ges.h b/ges/ges.h index 97e6b2fb95..2179f1c63a 100644 --- a/ges/ges.h +++ b/ges/ges.h @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/check/ges/asset.c b/tests/check/ges/asset.c index 47a5e59d89..6e68d3b356 100644 --- a/tests/check/ges/asset.c +++ b/tests/check/ges/asset.c @@ -62,7 +62,7 @@ GST_START_TEST (test_change_asset) gst_init (NULL, NULL); ges_init (); - a = ges_asset_request (GES_TYPE_TIMELINE_STANDARD_TRANSITION, + a = ges_asset_request (GES_TYPE_STANDARD_TRANSITION_CLIP, "box-wipe-lc", NULL); fail_unless (GES_IS_ASSET (a)); @@ -88,10 +88,10 @@ GST_START_TEST (test_change_asset) fail_unless_equals_string (ges_asset_get_id (a), "bar-wipe-tb"); /* Now try to set the a and see if the vtype is properly updated */ - a = ges_asset_request (GES_TYPE_TIMELINE_STANDARD_TRANSITION, + a = ges_asset_request (GES_TYPE_STANDARD_TRANSITION_CLIP, "box-wipe-lc", NULL); ges_extractable_set_asset (extractable, a); - fail_unless_equals_int (GES_TIMELINE_STANDARD_TRANSITION (extractable)->vtype, + fail_unless_equals_int (GES_STANDARD_TRANSITION_CLIP (extractable)->vtype, 26); gst_object_unref (extractable); @@ -108,7 +108,7 @@ GST_START_TEST (test_list_asset) fail_unless (ges_init ()); fail_if (ges_list_assets (GES_TYPE_TIMELINE_OVERLAY)); - assets = ges_list_assets (GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assets = ges_list_assets (GES_TYPE_STANDARD_TRANSITION_CLIP); /* note: we do not have a a for value=0 "Transition not set" */ assert_equals_int (g_list_length (assets), enum_class->n_values - 1); g_list_free (assets); diff --git a/tests/check/ges/effects.c b/tests/check/ges/effects.c index b3a28d9419..9ae01d1321 100644 --- a/tests/check/ges/effects.c +++ b/tests/check/ges/effects.c @@ -220,8 +220,8 @@ GST_START_TEST (test_effect_clip) GES_TRACK_EFFECT (tmp->data)); fail_unless (priority > effect_prio); fail_unless (GES_IS_TRACK_EFFECT (tmp->data)); - fail_unless (ges_track_object_get_track (GES_TRACK_OBJECT (tmp->data))-> - type == track_type[i]); + fail_unless (ges_track_object_get_track (GES_TRACK_OBJECT (tmp-> + data))->type == track_type[i]); effect_prio = priority; g_object_unref (tmp->data); diff --git a/tests/check/ges/layer.c b/tests/check/ges/layer.c index db128b22ce..0b628c7f82 100644 --- a/tests/check/ges/layer.c +++ b/tests/check/ges/layer.c @@ -336,12 +336,12 @@ GST_START_TEST (test_single_layer_automatic_transition) assert_is_type (objects->data, GES_TYPE_TIMELINE_TEST_SOURCE); transition = objects->next->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); transition = objects->next->next->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); g_list_free_full (objects, gst_object_unref); @@ -366,12 +366,12 @@ GST_START_TEST (test_single_layer_automatic_transition) assert_is_type (objects->data, GES_TYPE_TIMELINE_TEST_SOURCE); transition = objects->next->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 750); transition = objects->next->next->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_int (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 750); g_list_free_full (objects, gst_object_unref); @@ -526,14 +526,14 @@ GST_START_TEST (test_single_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 600); assert_equals_uint64 (_DURATION (transition), 1250 - 600); ASSERT_OBJECT_REFCOUNT (transition, "The layer and ourself own a ref", 2); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 600); assert_equals_uint64 (_DURATION (transition), 1250 - 600); ASSERT_OBJECT_REFCOUNT (transition, "The layer and ourself own a ref", 2); @@ -543,14 +543,14 @@ GST_START_TEST (test_single_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1250); assert_equals_uint64 (_DURATION (transition), 1400 - 1250); ASSERT_OBJECT_REFCOUNT (transition, "The layer and ourself own a ref", 2); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1250); assert_equals_uint64 (_DURATION (transition), 1400 - 1250); ASSERT_OBJECT_REFCOUNT (transition, "The layer and ourself own a ref", 2); @@ -573,7 +573,7 @@ GST_START_TEST (test_single_layer_automatic_transition) assert_equals_uint64 (_DURATION (src2), 1000); /* We check that the transition as actually been freed */ - fail_if (GES_IS_TIMELINE_STANDARD_TRANSITION (transition)); + fail_if (GES_IS_STANDARD_TRANSITION_CLIP (transition)); objects = ges_timeline_layer_get_objects (layer); assert_equals_int (g_list_length (objects), 3); @@ -604,13 +604,13 @@ GST_START_TEST (test_single_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1100); assert_equals_uint64 (_DURATION (transition), 1250 - 1100); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1100); assert_equals_uint64 (_DURATION (transition), 1250 - 1100); @@ -645,25 +645,25 @@ GST_START_TEST (test_single_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 1100 - 1000); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 1100 - 1000); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 1250 - 1000); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 1250 - 1000); @@ -741,13 +741,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); g_list_free_full (objects, gst_object_unref); @@ -785,13 +785,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); g_list_free_full (objects, gst_object_unref); @@ -833,13 +833,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); g_list_free_full (objects, gst_object_unref); @@ -852,13 +852,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); g_list_free_full (objects, gst_object_unref); @@ -891,13 +891,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); g_list_free_full (objects, gst_object_unref); @@ -939,13 +939,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); @@ -954,13 +954,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 1500 - 1000); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 1500 - 1000); @@ -1005,13 +1005,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 500); @@ -1056,13 +1056,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 500); @@ -1071,13 +1071,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1500); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1500); assert_equals_uint64 (_DURATION (transition), 500); @@ -1121,13 +1121,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 1700 - 1000); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 1700 - 1000); @@ -1136,13 +1136,13 @@ GST_START_TEST (test_multi_layer_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1700); assert_equals_uint64 (_DURATION (transition), 2000 - 1700); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1700); assert_equals_uint64 (_DURATION (transition), 2000 - 1700); @@ -1176,8 +1176,7 @@ GST_START_TEST (test_layer_activate_automatic_transition) asset = ges_asset_request (GES_TYPE_TIMELINE_TEST_SOURCE, NULL, NULL); transition_asset = - ges_asset_request (GES_TYPE_TIMELINE_STANDARD_TRANSITION, "crossfade", - NULL); + ges_asset_request (GES_TYPE_STANDARD_TRANSITION_CLIP, "crossfade", NULL); fail_unless (GES_IS_ASSET (asset)); GST_DEBUG ("Create timeline"); @@ -1234,7 +1233,7 @@ GST_START_TEST (test_layer_activate_automatic_transition) transition = GES_CLIP (ges_timeline_layer_add_asset (layer, transition_asset, 1000, 0, 500, 1, GES_TRACK_TYPE_VIDEO)); - fail_unless (GES_IS_TIMELINE_STANDARD_TRANSITION (transition)); + fail_unless (GES_IS_STANDARD_TRANSITION_CLIP (transition)); objects = ges_clip_get_track_objects (transition); assert_equals_int (g_list_length (objects), 1); g_list_free_full (objects, gst_object_unref); @@ -1252,7 +1251,7 @@ GST_START_TEST (test_layer_activate_automatic_transition) current = current->next; assert_is_type (current->data, GES_TYPE_TIMELINE_TEST_SOURCE); current = current->next; - assert_is_type (current->data, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (current->data, GES_TYPE_STANDARD_TRANSITION_CLIP); current = current->next; assert_is_type (current->data, GES_TYPE_TIMELINE_TEST_SOURCE); current = current->next; @@ -1284,13 +1283,13 @@ GST_START_TEST (test_layer_activate_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); @@ -1299,13 +1298,13 @@ GST_START_TEST (test_layer_activate_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1000); assert_equals_uint64 (_DURATION (transition), 500); @@ -1344,13 +1343,13 @@ GST_START_TEST (test_layer_activate_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 500); assert_equals_uint64 (_DURATION (transition), 500); @@ -1359,13 +1358,13 @@ GST_START_TEST (test_layer_activate_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1200); assert_equals_uint64 (_DURATION (transition), 300); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 1200); assert_equals_uint64 (_DURATION (transition), 300); @@ -1374,13 +1373,13 @@ GST_START_TEST (test_layer_activate_automatic_transition) current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 2000); assert_equals_uint64 (_DURATION (transition), 200); current = current->next; transition = current->data; - assert_is_type (transition, GES_TYPE_TIMELINE_STANDARD_TRANSITION); + assert_is_type (transition, GES_TYPE_STANDARD_TRANSITION_CLIP); assert_equals_uint64 (_START (transition), 2000); assert_equals_uint64 (_DURATION (transition), 200); diff --git a/tests/check/ges/project.c b/tests/check/ges/project.c index 3736ab4b18..3d4c772876 100644 --- a/tests/check/ges/project.c +++ b/tests/check/ges/project.c @@ -206,10 +206,10 @@ _test_project (GESProject * project, GESTimeline * timeline) assert_equals_string (ges_meta_container_get_string (GES_META_CONTAINER (project), "name"), "Example project"); clips = - ges_timeline_layer_get_objects (GES_TIMELINE_LAYER (timeline-> - layers->data)); - fail_unless (ges_meta_container_get_uint (GES_META_CONTAINER - (timeline->layers->data), "a", &a_meta)); + ges_timeline_layer_get_objects (GES_TIMELINE_LAYER (timeline->layers-> + data)); + fail_unless (ges_meta_container_get_uint (GES_META_CONTAINER (timeline-> + layers->data), "a", &a_meta)); assert_equals_int (a_meta, 3); assert_equals_int (g_list_length (clips), 1); media_uri = ges_test_file_uri ("audio_video.ogg"); diff --git a/tests/check/ges/simplelayer.c b/tests/check/ges/simplelayer.c index 303c2fff17..3f846afed9 100644 --- a/tests/check/ges/simplelayer.c +++ b/tests/check/ges/simplelayer.c @@ -236,7 +236,7 @@ GST_START_TEST (test_gsl_with_transitions) GESTimelineLayer *layer; GESTrack *track; GESCustomTimelineSource *source1, *source2, *source3, *source4; - GESTimelineStandardTransition *tr1, *tr2, *tr3, *tr4, *tr5; + GESStandardTransitionClip *tr1, *tr2, *tr3, *tr4, *tr5; GESSimpleTimelineLayer *gstl; gboolean valid; gint count = 0; @@ -293,31 +293,31 @@ GST_START_TEST (test_gsl_with_transitions) #define SECOND(a) ((guint64) (a * GST_SECOND)) tr1 = - ges_timeline_standard_transition_new + ges_standard_transition_clip_new (GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE); g_object_set (tr1, "duration", HALF_SECOND, "start", (guint64) 42, NULL); fail_unless_equals_uint64 (_DURATION (tr1), HALF_SECOND); tr2 = - ges_timeline_standard_transition_new + ges_standard_transition_clip_new (GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE); g_object_set (tr2, "duration", HALF_SECOND, "start", (guint64) 42, NULL); fail_unless_equals_uint64 (_DURATION (tr2), HALF_SECOND); tr3 = - ges_timeline_standard_transition_new + ges_standard_transition_clip_new (GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE); g_object_set (tr3, "duration", HALF_SECOND, "start", (guint64) 42, NULL); fail_unless_equals_uint64 (_DURATION (tr3), HALF_SECOND); tr4 = - ges_timeline_standard_transition_new + ges_standard_transition_clip_new (GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE); g_object_set (tr4, "duration", HALF_SECOND, "start", (guint64) 42, NULL); fail_unless_equals_uint64 (_DURATION (tr4), HALF_SECOND); tr5 = - ges_timeline_standard_transition_new + ges_standard_transition_clip_new (GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE); g_object_set (tr5, "duration", HALF_SECOND, "start", (guint64) 42, NULL); fail_unless_equals_uint64 (_DURATION (tr5), HALF_SECOND); diff --git a/tests/check/ges/transition.c b/tests/check/ges/transition.c index 7f053be0c7..79c4a79e88 100644 --- a/tests/check/ges/transition.c +++ b/tests/check/ges/transition.c @@ -27,7 +27,7 @@ GST_START_TEST (test_transition_basic) { - GESTimelineStandardTransition *tr1, *tr2; + GESStandardTransitionClip *tr1, *tr2; GESTrackObject *trackobject; GESTrack *track; @@ -37,12 +37,12 @@ GST_START_TEST (test_transition_basic) fail_unless (track != 0); tr1 = - ges_timeline_standard_transition_new + ges_standard_transition_clip_new (GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE); fail_unless (tr1 != 0); fail_unless (tr1->vtype == GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE); - tr2 = ges_timeline_standard_transition_new_for_nick ((gchar *) "bar-wipe-lr"); + tr2 = ges_standard_transition_clip_new_for_nick ((gchar *) "bar-wipe-lr"); fail_unless (tr2 != 0); fail_unless (tr2->vtype == 1); @@ -73,7 +73,7 @@ GST_START_TEST (test_transition_properties) ges_init (); object = - GES_CLIP (ges_timeline_standard_transition_new + GES_CLIP (ges_standard_transition_clip_new (GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE)); track = ges_track_video_raw_new (); @@ -119,7 +119,7 @@ GST_START_TEST (test_transition_properties) GST_DEBUG ("Setting to crossfade"); g_object_set (object, "vtype", GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE, NULL); - assert_equals_int (GES_TIMELINE_STANDARD_TRANSITION (object)->vtype, + assert_equals_int (GES_STANDARD_TRANSITION_CLIP (object)->vtype, GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE); assert_equals_int (ges_track_video_transition_get_transition_type (GES_TRACK_VIDEO_TRANSITION (trackobject)), @@ -130,7 +130,7 @@ GST_START_TEST (test_transition_properties) GST_DEBUG ("Setting back to 1 (should fail)"); g_object_set (object, "vtype", 1, NULL); - assert_equals_int (GES_TIMELINE_STANDARD_TRANSITION (object)->vtype, 1); + assert_equals_int (GES_STANDARD_TRANSITION_CLIP (object)->vtype, 1); assert_equals_int (ges_track_video_transition_get_transition_type (GES_TRACK_VIDEO_TRANSITION (trackobject)), 1); @@ -150,7 +150,7 @@ GST_START_TEST (test_transition_properties) GST_DEBUG ("Setting to vtype:1"); assert_equals_int (ges_track_video_transition_get_transition_type (GES_TRACK_VIDEO_TRANSITION (trackobject)), 1); - assert_equals_int (GES_TIMELINE_STANDARD_TRANSITION (object)->vtype, 1); + assert_equals_int (GES_STANDARD_TRANSITION_CLIP (object)->vtype, 1); ges_clip_release_track_object (object, trackobject); g_object_unref (object); diff --git a/tests/examples/ges-ui.c b/tests/examples/ges-ui.c index d500b5b00d..a27b96c91c 100644 --- a/tests/examples/ges-ui.c +++ b/tests/examples/ges-ui.c @@ -1219,7 +1219,7 @@ app_add_transition (App * app) GST_DEBUG ("adding transition"); - obj = GES_CLIP (ges_timeline_standard_transition_new + obj = GES_CLIP (ges_standard_transition_clip_new (GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE)); g_object_set (G_OBJECT (obj), "duration", GST_SECOND, NULL); diff --git a/tests/examples/transition.c b/tests/examples/transition.c index 1afa9d3979..4db726e517 100644 --- a/tests/examples/transition.c +++ b/tests/examples/transition.c @@ -99,7 +99,7 @@ make_timeline (gchar * nick, gdouble tdur, gchar * patha, gfloat adur, GESClip *srca, *srcb; GESTimelinePipeline *pipeline; guint64 aduration, bduration, tduration, tstart, ainpoint, binpoint; - GESTimelineStandardTransition *tr = NULL; + GESStandardTransitionClip *tr = NULL; pipeline = ges_timeline_pipeline_new (); @@ -137,7 +137,7 @@ make_timeline (gchar * nick, gdouble tdur, gchar * patha, gfloat adur, g_print ("creating transition at %" GST_TIME_FORMAT " of %f duration (%" GST_TIME_FORMAT ")\n", GST_TIME_ARGS (tstart), tdur, GST_TIME_ARGS (tduration)); - if (!(tr = ges_timeline_standard_transition_new_for_nick (nick))) + if (!(tr = ges_standard_transition_clip_new_for_nick (nick))) g_error ("invalid transition type %s\n", nick); g_object_set (tr, diff --git a/tools/ges-launch.c b/tools/ges-launch.c index 82d86b4c5b..3519470a44 100644 --- a/tools/ges-launch.c +++ b/tools/ges-launch.c @@ -178,7 +178,7 @@ create_timeline (int nbargs, gchar ** argv, gchar * audio, gchar * video) goto build_failure; } - obj = GES_CLIP (ges_timeline_standard_transition_new_for_nick (arg0)); + obj = GES_CLIP (ges_standard_transition_clip_new_for_nick (arg0)); if (!obj) { g_error ("invalid transition type\n");