diff --git a/android/ges.mk b/android/ges.mk
index c568045745..f0d105275e 100644
--- a/android/ges.mk
+++ b/android/ges.mk
@@ -19,7 +19,7 @@ LOCAL_SRC_FILES := \
ges-source-clip.c \
ges-uri-clip.c \
ges-operation-clip.c \
- ges-transition-clip.c \
+ ges-base-transition-clip.c \
ges-standard-transition-clip.c \
ges-test-clip.c \
ges-title-clip.c \
diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml
index 61a90fd67e..aaa7ca3a90 100644
--- a/docs/libs/ges-docs.sgml
+++ b/docs/libs/ges-docs.sgml
@@ -47,7 +47,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 d226cda202..22c4fe2ff3 100644
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -498,19 +498,19 @@ GES_TYPE_OVERLAY_CLIP
-ges-transition-clip
-GESTransitionClip
-GESTransitionClip
+ges-base-transition-clip
+GESBaseTransitionClip
+GESBaseTransitionClip
-GESTransitionClipClass
-GESTransitionClipPrivate
-GES_TRANSITION_CLIP
-GES_IS_TRANSITION_CLIP
-GES_TYPE_TRANSITION_CLIP
-ges_transition_clip_get_type
-GES_TRANSITION_CLIP_CLASS
-GES_IS_TRANSITION_CLIP_CLASS
-GES_TRANSITION_CLIP_GET_CLASS
+GESBaseTransitionClipClass
+GESBaseTransitionClipPrivate
+GES_BASE_TRANSITION_CLIP
+GES_IS_BASE_TRANSITION_CLIP
+GES_TYPE_BASE_TRANSITION_CLIP
+ges_base_transition_clip_get_type
+GES_BASE_TRANSITION_CLIP_CLASS
+GES_IS_BASE_TRANSITION_CLIP_CLASS
+GES_BASE_TRANSITION_CLIP_GET_CLASS
diff --git a/docs/libs/ges.types b/docs/libs/ges.types
index 45589bd19d..0ea59558f8 100644
--- a/docs/libs/ges.types
+++ b/docs/libs/ges.types
@@ -14,7 +14,7 @@ ges_overlay_clip_get_type
ges_timeline_pipeline_get_type
ges_source_clip_get_type
ges_test_clip_get_type
-ges_transition_clip_get_type
+ges_base_transition_clip_get_type
ges_standard_transition_clip_get_type
ges_effect_clip_get_type
ges_standard_effect_clip_get_type
diff --git a/ges/Makefile.am b/ges/Makefile.am
index a682498951..901b7e8d68 100644
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -23,7 +23,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-standard-effect-clip.c \
ges-uri-clip.c \
ges-operation-clip.c \
- ges-transition-clip.c \
+ ges-base-transition-clip.c \
ges-standard-transition-clip.c \
ges-test-clip.c \
ges-title-clip.c \
@@ -77,7 +77,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-effect-clip.h \
ges-standard-effect-clip.h \
ges-operation-clip.h \
- ges-transition-clip.h \
+ ges-base-transition-clip.h \
ges-standard-transition-clip.h \
ges-test-clip.h \
ges-title-clip.h \
diff --git a/ges/ges-auto-transition.c b/ges/ges-auto-transition.c
index 5c09113aa4..b2c862b2c2 100644
--- a/ges/ges-auto-transition.c
+++ b/ges/ges-auto-transition.c
@@ -17,8 +17,8 @@
* along with this program. If not, see .";
*/
-/* This class warps a GESTransitionClip, letting any implementation
- * of a GESTransitionClip to be used.
+/* This class warps a GESBaseTransitionClip, letting any implementation
+ * of a GESBaseTransitionClip to be used.
*
* NOTE: This is for internal use exclusively
*/
diff --git a/ges/ges-transition-clip.c b/ges/ges-base-transition-clip.c
similarity index 73%
rename from ges/ges-transition-clip.c
rename to ges/ges-base-transition-clip.c
index e38d5ed0a1..2ae928b8f5 100644
--- a/ges/ges-transition-clip.c
+++ b/ges/ges-base-transition-clip.c
@@ -19,31 +19,31 @@
*/
/**
- * SECTION: ges-transition-clip
+ * SECTION: ges-base-transition-clip
* @short_description: Base classes for transitions
*/
#include
#include "ges-internal.h"
-struct _GESTransitionClipPrivate
+struct _GESBaseTransitionClipPrivate
{
/* Dummy variable */
void *nothing;
};
-G_DEFINE_ABSTRACT_TYPE (GESTransitionClip, ges_transition_clip,
+G_DEFINE_ABSTRACT_TYPE (GESBaseTransitionClip, ges_base_transition_clip,
GES_TYPE_OPERATION_CLIP);
static void
-ges_transition_clip_class_init (GESTransitionClipClass * klass)
+ges_base_transition_clip_class_init (GESBaseTransitionClipClass * klass)
{
- g_type_class_add_private (klass, sizeof (GESTransitionClipPrivate));
+ g_type_class_add_private (klass, sizeof (GESBaseTransitionClipPrivate));
}
static void
-ges_transition_clip_init (GESTransitionClip * self)
+ges_base_transition_clip_init (GESBaseTransitionClip * self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- GES_TYPE_TRANSITION_CLIP, GESTransitionClipPrivate);
+ GES_TYPE_BASE_TRANSITION_CLIP, GESBaseTransitionClipPrivate);
}
diff --git a/ges/ges-transition-clip.h b/ges/ges-base-transition-clip.h
similarity index 53%
rename from ges/ges-transition-clip.h
rename to ges/ges-base-transition-clip.h
index bd7f86cf0d..b83afa7137 100644
--- a/ges/ges-transition-clip.h
+++ b/ges/ges-base-transition-clip.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _GES_TRANSITION_CLIP
-#define _GES_TRANSITION_CLIP
+#ifndef _GES_BASE_TRANSITION_CLIP
+#define _GES_BASE_TRANSITION_CLIP
#include "ges-operation-clip.h"
@@ -28,45 +28,45 @@
G_BEGIN_DECLS
-#define GES_TYPE_TRANSITION_CLIP ges_transition_clip_get_type()
+#define GES_TYPE_BASE_TRANSITION_CLIP ges_base_transition_clip_get_type()
-#define GES_TRANSITION_CLIP(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRANSITION_CLIP, GESTransitionClip))
+#define GES_BASE_TRANSITION_CLIP(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_BASE_TRANSITION_CLIP, GESBaseTransitionClip))
-#define GES_TRANSITION_CLIP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRANSITION_CLIP, GESTransitionClipClass))
+#define GES_BASE_TRANSITION_CLIP_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_BASE_TRANSITION_CLIP, GESBaseTransitionClipClass))
-#define GES_IS_TRANSITION_CLIP(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRANSITION_CLIP))
+#define GES_IS_BASE_TRANSITION_CLIP(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_BASE_TRANSITION_CLIP))
-#define GES_IS_TRANSITION_CLIP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRANSITION_CLIP))
+#define GES_IS_BASE_TRANSITION_CLIP_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_BASE_TRANSITION_CLIP))
-#define GES_TRANSITION_CLIP_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRANSITION_CLIP, GESTransitionClipClass))
+#define GES_BASE_TRANSITION_CLIP_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_BASE_TRANSITION_CLIP, GESBaseTransitionClipClass))
-typedef struct _GESTransitionClipPrivate GESTransitionClipPrivate;
+typedef struct _GESBaseTransitionClipPrivate GESBaseTransitionClipPrivate;
/**
- * GESTransitionClip:
+ * GESBaseTransitionClip:
*/
-struct _GESTransitionClip {
+struct _GESBaseTransitionClip {
/*< private >*/
GESOperationClip parent;
/*< private >*/
- GESTransitionClipPrivate *priv;
+ GESBaseTransitionClipPrivate *priv;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
/**
- * GESTransitionClipClass:
+ * GESBaseTransitionClipClass:
*
*/
-struct _GESTransitionClipClass {
+struct _GESBaseTransitionClipClass {
/*< private >*/
GESOperationClipClass parent_class;
@@ -74,8 +74,8 @@ struct _GESTransitionClipClass {
gpointer _ges_reserved[GES_PADDING];
};
-GType ges_transition_clip_get_type (void);
+GType ges_base_transition_clip_get_type (void);
G_END_DECLS
-#endif /* _GES_TRANSITION_CLIP */
+#endif /* _GES_BASE_TRANSITION_CLIP */
diff --git a/ges/ges-simple-timeline-layer.c b/ges/ges-simple-timeline-layer.c
index c6615bdfbb..6579ec9a6c 100644
--- a/ges/ges-simple-timeline-layer.c
+++ b/ges/ges-simple-timeline-layer.c
@@ -27,9 +27,9 @@
* GESSimpleTimelineLayer, and the layer will automatically compute the
* appropriate start times.
*
- * Users should be aware that GESTransitionClip objects are considered to
+ * Users should be aware that GESBaseTransitionClip objects are considered to
* have a negative duration for the purposes of positioning GESSourceClip
- * objects (i.e., adding a GESTransitionClip creates an overlap between
+ * objects (i.e., adding a GESBaseTransitionClip creates an overlap between
* the two adjacent sources.
*/
@@ -174,7 +174,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
GST_DEBUG ("recalculating values");
- if (priv->objects && GES_IS_TRANSITION_CLIP (priv->objects->data)) {
+ if (priv->objects && GES_IS_BASE_TRANSITION_CLIP (priv->objects->data)) {
valid = FALSE;
}
@@ -205,7 +205,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
g_assert (priority != -1);
- } else if (GES_IS_TRANSITION_CLIP (obj)) {
+ } else if (GES_IS_BASE_TRANSITION_CLIP (obj)) {
pos -= dur;
if (pos < 0)
@@ -227,7 +227,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
/* sanity checks */
l_next = g_list_next (tmp);
- if (GES_IS_TRANSITION_CLIP (prev_object)) {
+ if (GES_IS_BASE_TRANSITION_CLIP (prev_object)) {
GST_ERROR ("two transitions in sequence!");
valid = FALSE;
}
@@ -261,7 +261,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
}
- if (prev_object && GES_IS_TRANSITION_CLIP (prev_object)) {
+ if (prev_object && GES_IS_BASE_TRANSITION_CLIP (prev_object)) {
valid = FALSE;
}
@@ -307,14 +307,14 @@ ges_simple_timeline_layer_add_object (GESSimpleTimelineLayer * layer,
nth = g_list_nth (priv->objects, position);
- if (GES_IS_TRANSITION_CLIP (object)) {
+ if (GES_IS_BASE_TRANSITION_CLIP (object)) {
GList *lprev = g_list_previous (nth);
GESClip *prev = GES_CLIP (lprev ? lprev->data : NULL);
GESClip *next = GES_CLIP (nth ? nth->data : NULL);
- if ((prev && GES_IS_TRANSITION_CLIP (prev)) ||
- (next && GES_IS_TRANSITION_CLIP (next))) {
+ if ((prev && GES_IS_BASE_TRANSITION_CLIP (prev)) ||
+ (next && GES_IS_BASE_TRANSITION_CLIP (next))) {
GST_ERROR ("Not adding transition: Only insert transitions between two"
" sources, or at the begining or end the layer\n");
return FALSE;
diff --git a/ges/ges-standard-transition-clip.c b/ges/ges-standard-transition-clip.c
index d19ed4fe98..93ab5be66c 100644
--- a/ges/ges-standard-transition-clip.c
+++ b/ges/ges-standard-transition-clip.c
@@ -193,7 +193,7 @@ ges_extractable_interface_init (GESExtractableInterface * iface)
}
G_DEFINE_TYPE_WITH_CODE (GESStandardTransitionClip,
- ges_standard_transition_clip, GES_TYPE_TRANSITION_CLIP,
+ ges_standard_transition_clip, GES_TYPE_BASE_TRANSITION_CLIP,
G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE,
ges_extractable_interface_init));
diff --git a/ges/ges-standard-transition-clip.h b/ges/ges-standard-transition-clip.h
index e3d0a17453..fc3cb1d429 100644
--- a/ges/ges-standard-transition-clip.h
+++ b/ges/ges-standard-transition-clip.h
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
G_BEGIN_DECLS
@@ -53,7 +53,7 @@ typedef struct _GESStandardTransitionClipPrivate GESStandardTransitionClipPrivat
*/
struct _GESStandardTransitionClip {
/*< private >*/
- GESTransitionClip parent;
+ GESBaseTransitionClip parent;
/*< public >*/
GESVideoStandardTransitionType vtype;
@@ -72,7 +72,7 @@ struct _GESStandardTransitionClip {
struct _GESStandardTransitionClipClass {
/*< private >*/
- GESTransitionClipClass parent_class;
+ GESBaseTransitionClipClass parent_class;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
diff --git a/ges/ges-types.h b/ges/ges-types.h
index 307b2ae566..036ff957fc 100644
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -62,8 +62,8 @@ typedef struct _GESEffectClipClass GESEffectClipClass;
typedef struct _GESUriClip GESUriClip;
typedef struct _GESUriClipClass GESUriClipClass;
-typedef struct _GESTransitionClip GESTransitionClip;
-typedef struct _GESTransitionClipClass GESTransitionClipClass;
+typedef struct _GESBaseTransitionClip GESBaseTransitionClip;
+typedef struct _GESBaseTransitionClipClass GESBaseTransitionClipClass;
typedef struct _GESStandardTransitionClip GESStandardTransitionClip;
typedef struct _GESStandardTransitionClipClass GESStandardTransitionClipClass;
diff --git a/ges/ges.h b/ges/ges.h
index fe931e975d..a84daae638 100644
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -39,7 +39,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/tests/examples/ges-ui.c b/tests/examples/ges-ui.c
index 0de3429ba7..7729b98f5f 100644
--- a/tests/examples/ges-ui.c
+++ b/tests/examples/ges-ui.c
@@ -364,7 +364,7 @@ layer_object_added_cb (GESTimelineLayer * layer, GESClip * object, App * app)
gtk_list_store_set (app->model, &iter, 2, object, 0, "Test Source", -1);
}
- else if (GES_IS_TRANSITION_CLIP (object)) {
+ else if (GES_IS_BASE_TRANSITION_CLIP (object)) {
gtk_list_store_set (app->model, &iter, 2, object, 0, "Transition", -1);
}