diff --git a/android/ges.mk b/android/ges.mk
index 5a425e9e73..478b14e00f 100644
--- a/android/ges.mk
+++ b/android/ges.mk
@@ -10,13 +10,13 @@ LOCAL_SRC_FILES := \
$(built_source_make) \
ges.c \
ges-enums.c \
- ges-custom-timeline-source.c \
+ ges-custom-source-clip.c \
ges-simple-timeline-layer.c \
ges-timeline.c \
ges-timeline-layer.c \
ges-clip.c \
ges-timeline-pipeline.c \
- ges-timeline-source.c \
+ ges-source-clip.c \
ges-uri-clip.c \
ges-operation-clip.c \
ges-transition-clip.c \
diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml
index da4b45aac6..d228ec089b 100644
--- a/docs/libs/ges-docs.sgml
+++ b/docs/libs/ges-docs.sgml
@@ -38,7 +38,7 @@ platform as well as Windows. It is released under the GNU Library General Public
-
+
@@ -83,7 +83,7 @@ platform as well as Windows. It is released under the GNU Library General Public
Convenience classes
-
+
diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index 8c32bdb7f5..a323344c77 100644
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -423,19 +423,19 @@ GES_TYPE_TIMELINE_PIPELINE
-ges-timeline-source
-GESTimelineSource
-GESTimelineSource
-GESTimelineSourceClass
+ges-source-clip
+GESSourceClip
+GESSourceClip
+GESSourceClipClass
-GESTimelineSourcePrivate
-ges_timeline_source_get_type
-GES_IS_TIMELINE_SOURCE
-GES_IS_TIMELINE_SOURCE_CLASS
-GES_TIMELINE_SOURCE
-GES_TIMELINE_SOURCE_CLASS
-GES_TIMELINE_SOURCE_GET_CLASS
-GES_TYPE_TIMELINE_SOURCE
+GESSourceClipPrivate
+ges_source_clip_get_type
+GES_IS_SOURCE_CLIP
+GES_IS_SOURCE_CLIP_CLASS
+GES_SOURCE_CLIP
+GES_SOURCE_CLIP_CLASS
+GES_SOURCE_CLIP_GET_CLASS
+GES_TYPE_SOURCE_CLIP
@@ -564,21 +564,21 @@ ges_standard_transition_clip_get_type
-ges-custom-timeline-source
-GESCustomTimelineSource
-GESCustomTimelineSource
+ges-custom-source-clip
+GESCustomSourceClip
+GESCustomSourceClip
GESFillTrackObjectUserFunc
-ges_custom_timeline_source_new
+ges_custom_source_clip_new
-GESCustomTimelineSourceClass
-ges_custom_timeline_source_get_type
-GESCustomTimelineSourcePrivate
-GES_CUSTOM_TIMELINE_SOURCE
-GES_CUSTOM_TIMELINE_SOURCE_CLASS
-GES_CUSTOM_TIMELINE_SOURCE_GET_CLASS
-GES_IS_CUSTOM_TIMELINE_SOURCE
-GES_IS_CUSTOM_TIMELINE_SOURCE_CLASS
-GES_TYPE_CUSTOM_TIMELINE_SOURCE
+GESCustomSourceClipClass
+ges_custom_source_clip_get_type
+GESCustomSourceClipPrivate
+GES_CUSTOM_SOURCE_CLIP
+GES_CUSTOM_SOURCE_CLIP_CLASS
+GES_CUSTOM_SOURCE_CLIP_GET_CLASS
+GES_IS_CUSTOM_SOURCE_CLIP
+GES_IS_CUSTOM_SOURCE_CLIP_CLASS
+GES_TYPE_CUSTOM_SOURCE_CLIP
@@ -970,7 +970,7 @@ ges_asset_request_async
ges_asset_request_finish
ges_asset_extract
ges_list_assets
-ges_asset_custom_timeline_source_new
+ges_asset_custom_source_clip_new
GESAssetPrivate
GES_ASSET
diff --git a/docs/libs/ges.types b/docs/libs/ges.types
index d18cd7f51b..2b41705443 100644
--- a/docs/libs/ges.types
+++ b/docs/libs/ges.types
@@ -1,7 +1,7 @@
#include
#include
-ges_custom_timeline_source_get_type
+ges_custom_source_clip_get_type
ges_formatter_get_type
ges_simple_timeline_layer_get_type
%ges_text_halign_get_type
@@ -12,7 +12,7 @@ ges_clip_get_type
ges_operation_clip_get_type
ges_timeline_overlay_get_type
ges_timeline_pipeline_get_type
-ges_timeline_source_get_type
+ges_source_clip_get_type
ges_timeline_test_source_get_type
ges_transition_clip_get_type
ges_standard_transition_clip_get_type
diff --git a/ges/Makefile.am b/ges/Makefile.am
index abf46ed50d..4b84e175b3 100644
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -11,14 +11,14 @@ libges_@GST_API_VERSION@_la_SOURCES = \
$(built_source_make) \
ges.c \
ges-enums.c \
- ges-custom-timeline-source.c \
+ ges-custom-source-clip.c \
ges-meta-container.c \
ges-simple-timeline-layer.c \
ges-timeline.c \
ges-timeline-layer.c \
ges-clip.c \
ges-timeline-pipeline.c \
- ges-timeline-source.c \
+ ges-source-clip.c \
ges-effect-clip.c \
ges-standard-effect-clip.c \
ges-uri-clip.c \
@@ -65,14 +65,14 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-types.h \
ges.h \
ges-enums.h \
- ges-custom-timeline-source.h \
+ ges-custom-source-clip.h \
ges-meta-container.h \
ges-simple-timeline-layer.h \
ges-timeline.h \
ges-timeline-layer.h \
ges-clip.h \
ges-timeline-pipeline.h \
- ges-timeline-source.h \
+ ges-source-clip.h \
ges-uri-clip.h \
ges-effect-clip.h \
ges-standard-effect-clip.h \
diff --git a/ges/ges-custom-timeline-source.c b/ges/ges-custom-source-clip.c
similarity index 72%
rename from ges/ges-custom-timeline-source.c
rename to ges/ges-custom-source-clip.c
index a4321ad294..f6ecb118b3 100644
--- a/ges/ges-custom-timeline-source.c
+++ b/ges/ges-custom-source-clip.c
@@ -19,25 +19,25 @@
*/
/**
- * SECTION:ges-custom-timeline-source
- * @short_description: Convenience GESTimelineSource
+ * SECTION:ges-custom-source-clip
+ * @short_description: Convenience GESSourceClip
*
- * #GESCustomTimelineSource allows creating #GESTimelineSource(s) without the
+ * #GESCustomSourceClip allows creating #GESSourceClip(s) without the
* need to subclass.
*
* Its usage should be limited to testing and prototyping purposes.
*
- * To instanciate a asset to extract GESCustomTimelineSource-s the expected
+ * To instanciate a asset to extract GESCustomSourceClip-s the expected
* ID is:
* 'PointerToFuncAsInt!PointerToUDataAsInt'
*
- * You should use the #ges_asset_custom_timeline_source_new helper to create
- * a new GESAsset letting you extract GESCustomTimelineSource.
+ * You should use the #ges_asset_custom_source_clip_new helper to create
+ * a new GESAsset letting you extract GESCustomSourceClip.
*/
#include "ges-internal.h"
-#include "ges-custom-timeline-source.h"
-#include "ges-timeline-source.h"
+#include "ges-custom-source-clip.h"
+#include "ges-source-clip.h"
#include "ges-track-source.h"
#include "ges-extractable.h"
@@ -48,7 +48,7 @@ enum
PROP_USER_DATA
};
-struct _GESCustomTimelineSourcePrivate
+struct _GESCustomSourceClipPrivate
{
GESFillTrackObjectUserFunc filltrackobjectfunc;
gpointer user_data;
@@ -56,8 +56,8 @@ struct _GESCustomTimelineSourcePrivate
static void ges_extractable_interface_init (GESExtractableInterface * iface);
-G_DEFINE_TYPE_WITH_CODE (GESCustomTimelineSource, ges_custom_timeline_source,
- GES_TYPE_TIMELINE_SOURCE,
+G_DEFINE_TYPE_WITH_CODE (GESCustomSourceClip, ges_custom_source_clip,
+ GES_TYPE_SOURCE_CLIP,
G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE,
ges_extractable_interface_init));
@@ -115,8 +115,7 @@ extractable_check_id (GType type, const gchar * id)
static gchar *
extractable_get_id (GESExtractable * self)
{
- GESCustomTimelineSourcePrivate *priv =
- GES_CUSTOM_TIMELINE_SOURCE (self)->priv;
+ GESCustomSourceClipPrivate *priv = GES_CUSTOM_SOURCE_CLIP (self)->priv;
return g_strdup_printf ("%i!%i", GPOINTER_TO_INT (priv->filltrackobjectfunc),
GPOINTER_TO_INT (priv->user_data));
@@ -131,12 +130,11 @@ ges_extractable_interface_init (GESExtractableInterface * iface)
}
static gboolean
-ges_custom_timeline_source_fill_track_object (GESClip * object,
+ges_custom_source_clip_fill_track_object (GESClip * object,
GESTrackObject * trobject, GstElement * gnlobj);
static GESTrackObject *
-ges_custom_timeline_source_create_track_object (GESClip * obj,
- GESTrackType type)
+ges_custom_source_clip_create_track_object (GESClip * obj, GESTrackType type)
{
return g_object_new (GES_TYPE_TRACK_SOURCE, "track-type", type, NULL);
}
@@ -145,8 +143,7 @@ static void
_set_property (GObject * object, guint property_id,
const GValue * value, GParamSpec * pspec)
{
- GESCustomTimelineSourcePrivate *priv =
- GES_CUSTOM_TIMELINE_SOURCE (object)->priv;
+ GESCustomSourceClipPrivate *priv = GES_CUSTOM_SOURCE_CLIP (object)->priv;
switch (property_id) {
case PROP_FILL_FUNC:
priv->filltrackobjectfunc = g_value_get_pointer (value);
@@ -160,21 +157,20 @@ _set_property (GObject * object, guint property_id,
}
static void
-ges_custom_timeline_source_class_init (GESCustomTimelineSourceClass * klass)
+ges_custom_source_clip_class_init (GESCustomSourceClipClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GESClipClass *clip_class = GES_CLIP_CLASS (klass);
- g_type_class_add_private (klass, sizeof (GESCustomTimelineSourcePrivate));
+ g_type_class_add_private (klass, sizeof (GESCustomSourceClipPrivate));
- clip_class->fill_track_object = ges_custom_timeline_source_fill_track_object;
- clip_class->create_track_object =
- ges_custom_timeline_source_create_track_object;
+ clip_class->fill_track_object = ges_custom_source_clip_fill_track_object;
+ clip_class->create_track_object = ges_custom_source_clip_create_track_object;
object_class->set_property = _set_property;
/**
- * GESCustomTimelineSource:fill-func:
+ * GESCustomSourceClip:fill-func:
*
* The function pointer to create the TrackObject content
*/
@@ -184,7 +180,7 @@ ges_custom_timeline_source_class_init (GESCustomTimelineSourceClass * klass)
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
/**
- * GESCustomTimelineSource:user-data:
+ * GESCustomSourceClip:user-data:
*
* The user data that will be passed
*/
@@ -195,23 +191,23 @@ ges_custom_timeline_source_class_init (GESCustomTimelineSourceClass * klass)
}
static void
-ges_custom_timeline_source_init (GESCustomTimelineSource * self)
+ges_custom_source_clip_init (GESCustomSourceClip * self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- GES_TYPE_CUSTOM_TIMELINE_SOURCE, GESCustomTimelineSourcePrivate);
+ GES_TYPE_CUSTOM_SOURCE_CLIP, GESCustomSourceClipPrivate);
}
static gboolean
-ges_custom_timeline_source_fill_track_object (GESClip * object,
+ges_custom_source_clip_fill_track_object (GESClip * object,
GESTrackObject * trobject, GstElement * gnlobj)
{
gboolean res;
- GESCustomTimelineSourcePrivate *priv;
+ GESCustomSourceClipPrivate *priv;
GST_DEBUG ("Calling callback (timelineobj:%p, trackobj:%p, gnlobj:%p)",
object, trobject, gnlobj);
- priv = GES_CUSTOM_TIMELINE_SOURCE (object)->priv;
+ priv = GES_CUSTOM_SOURCE_CLIP (object)->priv;
res = priv->filltrackobjectfunc (object, trobject, gnlobj, priv->user_data);
GST_DEBUG ("Returning res:%d", res);
@@ -220,22 +216,21 @@ ges_custom_timeline_source_fill_track_object (GESClip * object,
}
/**
- * ges_custom_timeline_source_new:
+ * ges_custom_source_clip_new:
* @func: (scope notified): The #GESFillTrackObjectUserFunc that will be used to fill the track
* objects.
* @user_data: (closure): a gpointer that will be used when @func is called.
*
- * Creates a new #GESCustomTimelineSource.
+ * Creates a new #GESCustomSourceClip.
*
- * Returns: The new #GESCustomTimelineSource.
+ * Returns: The new #GESCustomSourceClip.
*/
-GESCustomTimelineSource *
-ges_custom_timeline_source_new (GESFillTrackObjectUserFunc func,
- gpointer user_data)
+GESCustomSourceClip *
+ges_custom_source_clip_new (GESFillTrackObjectUserFunc func, gpointer user_data)
{
- GESCustomTimelineSource *src;
+ GESCustomSourceClip *src;
- src = g_object_new (GES_TYPE_CUSTOM_TIMELINE_SOURCE, "supported-formats",
+ src = g_object_new (GES_TYPE_CUSTOM_SOURCE_CLIP, "supported-formats",
GES_TRACK_TYPE_CUSTOM, NULL);
src->priv->filltrackobjectfunc = func;
src->priv->user_data = user_data;
@@ -244,25 +239,25 @@ ges_custom_timeline_source_new (GESFillTrackObjectUserFunc func,
}
/**
- * ges_asset_custom_timeline_source_new:
+ * ges_asset_custom_source_clip_new:
* @func: (scope notified): The #GESFillTrackObjectUserFunc that will be used to fill the track
* objects.
* @user_data: (closure): a gpointer that will be used when @func is called.
*
* Helper constructor to instanciate a new #GESAsset from which you can
- * extract #GESCustomTimelineSource-s
+ * extract #GESCustomSourceClip-s
*
* Returns: The new #GESAsset.
*/
GESAsset *
-ges_asset_custom_timeline_source_new (GESFillTrackObjectUserFunc func,
+ges_asset_custom_source_clip_new (GESFillTrackObjectUserFunc func,
gpointer user_data)
{
GESAsset *asset;
gchar *id = g_strdup_printf ("%i!%i", GPOINTER_TO_INT (func),
GPOINTER_TO_INT (user_data));
- asset = ges_asset_request (GES_TYPE_CUSTOM_TIMELINE_SOURCE, id, NULL);
+ asset = ges_asset_request (GES_TYPE_CUSTOM_SOURCE_CLIP, id, NULL);
g_free (id);
diff --git a/ges/ges-custom-timeline-source.h b/ges/ges-custom-source-clip.h
similarity index 58%
rename from ges/ges-custom-timeline-source.h
rename to ges/ges-custom-source-clip.h
index c44c6e6572..9cbeeebedd 100644
--- a/ges/ges-custom-timeline-source.h
+++ b/ges/ges-custom-source-clip.h
@@ -18,33 +18,33 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _GES_CUSTOM_TIMELINE_SOURCE
-#define _GES_CUSTOM_TIMELINE_SOURCE
+#ifndef _GES_CUSTOM_SOURCE_CLIP
+#define _GES_CUSTOM_SOURCE_CLIP
#include
#include
-#include
+#include
G_BEGIN_DECLS
-#define GES_TYPE_CUSTOM_TIMELINE_SOURCE ges_custom_timeline_source_get_type()
+#define GES_TYPE_CUSTOM_SOURCE_CLIP ges_custom_source_clip_get_type()
-#define GES_CUSTOM_TIMELINE_SOURCE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_CUSTOM_TIMELINE_SOURCE, GESCustomTimelineSource))
+#define GES_CUSTOM_SOURCE_CLIP(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_CUSTOM_SOURCE_CLIP, GESCustomSourceClip))
-#define GES_CUSTOM_TIMELINE_SOURCE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_CUSTOM_TIMELINE_SOURCE, GESCustomTimelineSourceClass))
+#define GES_CUSTOM_SOURCE_CLIP_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_CUSTOM_SOURCE_CLIP, GESCustomSourceClipClass))
-#define GES_IS_CUSTOM_TIMELINE_SOURCE(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_CUSTOM_TIMELINE_SOURCE))
+#define GES_IS_CUSTOM_SOURCE_CLIP(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_CUSTOM_SOURCE_CLIP))
-#define GES_IS_CUSTOM_TIMELINE_SOURCE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_CUSTOM_TIMELINE_SOURCE))
+#define GES_IS_CUSTOM_SOURCE_CLIP_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_CUSTOM_SOURCE_CLIP))
-#define GES_CUSTOM_TIMELINE_SOURCE_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_CUSTOM_TIMELINE_SOURCE, GESCustomTimelineSourceClass))
+#define GES_CUSTOM_SOURCE_CLIP_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_CUSTOM_SOURCE_CLIP, GESCustomSourceClipClass))
-typedef struct _GESCustomTimelineSourcePrivate GESCustomTimelineSourcePrivate;
+typedef struct _GESCustomSourceClipPrivate GESCustomSourceClipPrivate;
/**
* GESFillTrackObjectUserFunc:
@@ -67,45 +67,45 @@ typedef gboolean (*GESFillTrackObjectUserFunc) (GESClip * object,
gpointer user_data);
/**
- * GESCustomTimelineSource:
+ * GESCustomSourceClip:
*
* Debugging custom timeline source
*/
-struct _GESCustomTimelineSource {
- GESTimelineSource parent;
+struct _GESCustomSourceClip {
+ GESSourceClip parent;
/*< private >*/
- GESCustomTimelineSourcePrivate *priv;
+ GESCustomSourceClipPrivate *priv;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
/**
- * GESCustomTimelineSourceClass:
+ * GESCustomSourceClipClass:
*/
-struct _GESCustomTimelineSourceClass {
- GESTimelineSourceClass parent_class;
+struct _GESCustomSourceClipClass {
+ GESSourceClipClass parent_class;
/*< private >*/
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
-GType ges_custom_timeline_source_get_type (void);
+GType ges_custom_source_clip_get_type (void);
-GESCustomTimelineSource*
-ges_custom_timeline_source_new (GESFillTrackObjectUserFunc func,
+GESCustomSourceClip*
+ges_custom_source_clip_new (GESFillTrackObjectUserFunc func,
gpointer user_data);
GESAsset*
-ges_asset_custom_timeline_source_new (GESFillTrackObjectUserFunc func,
+ges_asset_custom_source_clip_new (GESFillTrackObjectUserFunc func,
gpointer user_data);
G_END_DECLS
-#endif /* _GES_CUSTOM_TIMELINE_SOURCE */
+#endif /* _GES_CUSTOM_SOURCE_CLIP */
diff --git a/ges/ges-simple-timeline-layer.c b/ges/ges-simple-timeline-layer.c
index 6b0b069960..c6615bdfbb 100644
--- a/ges/ges-simple-timeline-layer.c
+++ b/ges/ges-simple-timeline-layer.c
@@ -28,7 +28,7 @@
* appropriate start times.
*
* Users should be aware that GESTransitionClip objects are considered to
- * have a negative duration for the purposes of positioning GESTimelineSource
+ * have a negative duration for the purposes of positioning GESSourceClip
* objects (i.e., adding a GESTransitionClip creates an overlap between
* the two adjacent sources.
*/
@@ -187,7 +187,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
dur = _DURATION (obj);
height = GES_CLIP_HEIGHT (obj);
- if (GES_IS_TIMELINE_SOURCE (obj)) {
+ if (GES_IS_SOURCE_CLIP (obj)) {
GST_LOG ("%p obj: height: %d: priority %d", obj, height, priority);
@@ -288,7 +288,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
*
* When adding transitions, it is important that the adjacent objects
* (objects at position, and position + 1) be (1) A derivative of
- * GESTimelineSource or other non-transition, and (2) have a duration at least
+ * GESSourceClip or other non-transition, and (2) have a duration at least
* as long as the duration of the transition.
*
* The layer will steal a reference to the provided object.
diff --git a/ges/ges-timeline-source.c b/ges/ges-source-clip.c
similarity index 66%
rename from ges/ges-timeline-source.c
rename to ges/ges-source-clip.c
index 7ab3a61841..c85ef01833 100644
--- a/ges/ges-timeline-source.c
+++ b/ges/ges-source-clip.c
@@ -19,17 +19,17 @@
*/
/**
- * SECTION:ges-timeline-source
+ * SECTION:ges-source-clip
* @short_description: Base Class for sources of a GESTimelineLayer
*/
#include "ges-internal.h"
#include "ges-clip.h"
-#include "ges-timeline-source.h"
+#include "ges-source-clip.h"
#include "ges-track-source.h"
-struct _GESTimelineSourcePrivate
+struct _GESSourceClipPrivate
{
/* dummy variable */
void *nothing;
@@ -40,10 +40,10 @@ enum
PROP_0,
};
-G_DEFINE_TYPE (GESTimelineSource, ges_timeline_source, GES_TYPE_CLIP);
+G_DEFINE_TYPE (GESSourceClip, ges_source_clip, GES_TYPE_CLIP);
static void
-ges_timeline_source_get_property (GObject * object, guint property_id,
+ges_source_clip_get_property (GObject * object, guint property_id,
GValue * value, GParamSpec * pspec)
{
switch (property_id) {
@@ -53,7 +53,7 @@ ges_timeline_source_get_property (GObject * object, guint property_id,
}
static void
-ges_timeline_source_set_property (GObject * object, guint property_id,
+ges_source_clip_set_property (GObject * object, guint property_id,
const GValue * value, GParamSpec * pspec)
{
switch (property_id) {
@@ -63,29 +63,29 @@ ges_timeline_source_set_property (GObject * object, guint property_id,
}
static void
-ges_timeline_source_finalize (GObject * object)
+ges_source_clip_finalize (GObject * object)
{
- G_OBJECT_CLASS (ges_timeline_source_parent_class)->finalize (object);
+ G_OBJECT_CLASS (ges_source_clip_parent_class)->finalize (object);
}
static void
-ges_timeline_source_class_init (GESTimelineSourceClass * klass)
+ges_source_clip_class_init (GESSourceClipClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (GESTimelineSourcePrivate));
+ g_type_class_add_private (klass, sizeof (GESSourceClipPrivate));
- object_class->get_property = ges_timeline_source_get_property;
- object_class->set_property = ges_timeline_source_set_property;
- object_class->finalize = ges_timeline_source_finalize;
+ object_class->get_property = ges_source_clip_get_property;
+ object_class->set_property = ges_source_clip_set_property;
+ object_class->finalize = ges_source_clip_finalize;
/* All subclasses should have snapping enabled */
GES_CLIP_CLASS (klass)->snaps = TRUE;
}
static void
-ges_timeline_source_init (GESTimelineSource * self)
+ges_source_clip_init (GESSourceClip * self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- GES_TYPE_TIMELINE_SOURCE, GESTimelineSourcePrivate);
+ GES_TYPE_SOURCE_CLIP, GESSourceClipPrivate);
}
diff --git a/ges/ges-timeline-source.h b/ges/ges-source-clip.h
similarity index 57%
rename from ges/ges-timeline-source.h
rename to ges/ges-source-clip.h
index 81c7e6f713..6d4c0806a3 100644
--- a/ges/ges-timeline-source.h
+++ b/ges/ges-source-clip.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _GES_TIMELINE_SOURCE
-#define _GES_TIMELINE_SOURCE
+#ifndef _GES_SOURCE_CLIP
+#define _GES_SOURCE_CLIP
#include
#include
@@ -28,46 +28,46 @@
G_BEGIN_DECLS
-#define GES_TYPE_TIMELINE_SOURCE ges_timeline_source_get_type()
+#define GES_TYPE_SOURCE_CLIP ges_source_clip_get_type()
-#define GES_TIMELINE_SOURCE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_SOURCE, GESTimelineSource))
+#define GES_SOURCE_CLIP(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_SOURCE_CLIP, GESSourceClip))
-#define GES_TIMELINE_SOURCE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_SOURCE, GESTimelineSourceClass))
+#define GES_SOURCE_CLIP_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_SOURCE_CLIP, GESSourceClipClass))
-#define GES_IS_TIMELINE_SOURCE(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_SOURCE))
+#define GES_IS_SOURCE_CLIP(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_SOURCE_CLIP))
-#define GES_IS_TIMELINE_SOURCE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_SOURCE))
+#define GES_IS_SOURCE_CLIP_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_SOURCE_CLIP))
-#define GES_TIMELINE_SOURCE_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_SOURCE, GESTimelineSourceClass))
+#define GES_SOURCE_CLIP_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_SOURCE_CLIP, GESSourceClipClass))
-typedef struct _GESTimelineSourcePrivate GESTimelineSourcePrivate;
+typedef struct _GESSourceClipPrivate GESSourceClipPrivate;
/**
- * GESTimelineSource:
+ * GESSourceClip:
*
* Base class for sources of a #GESTimelineLayer
*/
-struct _GESTimelineSource {
+struct _GESSourceClip {
GESClip parent;
/*< private >*/
- GESTimelineSourcePrivate *priv;
+ GESSourceClipPrivate *priv;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
/**
- * GESTimelineSourceClass:
+ * GESSourceClipClass:
*/
-struct _GESTimelineSourceClass {
+struct _GESSourceClipClass {
/*< private >*/
GESClipClass parent_class;
@@ -75,9 +75,9 @@ struct _GESTimelineSourceClass {
gpointer _ges_reserved[GES_PADDING];
};
-GType ges_timeline_source_get_type (void);
+GType ges_source_clip_get_type (void);
G_END_DECLS
-#endif /* _GES_TIMELINE_SOURCE */
+#endif /* _GES_SOURCE_CLIP */
diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c
index 8f923be7d6..870270d881 100644
--- a/ges/ges-timeline-layer.c
+++ b/ges/ges-timeline-layer.c
@@ -33,7 +33,7 @@
#include "ges-internal.h"
#include "ges-timeline-layer.h"
#include "ges.h"
-#include "ges-timeline-source.h"
+#include "ges-source-clip.h"
static void ges_meta_container_interface_init
(GESMetaContainerInterface * iface);
diff --git a/ges/ges-timeline-test-source.c b/ges/ges-timeline-test-source.c
index 1335497dde..69db39fe49 100644
--- a/ges/ges-timeline-test-source.c
+++ b/ges/ges-timeline-test-source.c
@@ -31,14 +31,14 @@
#include "ges-internal.h"
#include "ges-timeline-test-source.h"
-#include "ges-timeline-source.h"
+#include "ges-source-clip.h"
#include "ges-track-object.h"
#include "ges-track-video-test-source.h"
#include "ges-track-audio-test-source.h"
#include
G_DEFINE_TYPE (GESTimelineTestSource, ges_timeline_test_source,
- GES_TYPE_TIMELINE_SOURCE);
+ GES_TYPE_SOURCE_CLIP);
struct _GESTimelineTestSourcePrivate
{
diff --git a/ges/ges-timeline-test-source.h b/ges/ges-timeline-test-source.h
index 797a6f715d..4320a2ae96 100644
--- a/ges/ges-timeline-test-source.h
+++ b/ges/ges-timeline-test-source.h
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
G_BEGIN_DECLS
@@ -55,7 +55,7 @@ typedef struct _GESTimelineTestSourcePrivate GESTimelineTestSourcePrivate;
struct _GESTimelineTestSource {
- GESTimelineSource parent;
+ GESSourceClip parent;
/*< private >*/
GESTimelineTestSourcePrivate *priv;
@@ -70,7 +70,7 @@ struct _GESTimelineTestSource {
struct _GESTimelineTestSourceClass {
/*< private >*/
- GESTimelineSourceClass parent_class;
+ GESSourceClipClass parent_class;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
diff --git a/ges/ges-timeline-title-source.c b/ges/ges-timeline-title-source.c
index 86861197b5..8b147e4514 100644
--- a/ges/ges-timeline-title-source.c
+++ b/ges/ges-timeline-title-source.c
@@ -28,13 +28,13 @@
#include "ges-internal.h"
#include "ges-timeline-title-source.h"
-#include "ges-timeline-source.h"
+#include "ges-source-clip.h"
#include "ges-track-object.h"
#include "ges-track-title-source.h"
#include
G_DEFINE_TYPE (GESTimelineTitleSource, ges_timeline_title_source,
- GES_TYPE_TIMELINE_SOURCE);
+ GES_TYPE_SOURCE_CLIP);
#define DEFAULT_TEXT ""
#define DEFAULT_FONT_DESC "Serif 36"
diff --git a/ges/ges-timeline-title-source.h b/ges/ges-timeline-title-source.h
index 9841650d72..10b4a48bc7 100644
--- a/ges/ges-timeline-title-source.h
+++ b/ges/ges-timeline-title-source.h
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
#include
G_BEGIN_DECLS
@@ -54,7 +54,7 @@ typedef struct _GESTimelineTitleSourcePrivate GESTimelineTitleSourcePrivate;
*/
struct _GESTimelineTitleSource {
- GESTimelineSource parent;
+ GESSourceClip parent;
/*< private >*/
GESTimelineTitleSourcePrivate *priv;
@@ -65,7 +65,7 @@ struct _GESTimelineTitleSource {
struct _GESTimelineTitleSourceClass {
/*< private >*/
- GESTimelineSourceClass parent_class;
+ GESSourceClipClass parent_class;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
diff --git a/ges/ges-track-effect.c b/ges/ges-track-effect.c
index 6a5752301b..89836a1ac6 100644
--- a/ges/ges-track-effect.c
+++ b/ges/ges-track-effect.c
@@ -19,7 +19,7 @@
/**
* SECTION:ges-track-effect
- * @short_description: adds an effect to a stream in a GESTimelineSource or a
+ * @short_description: adds an effect to a stream in a GESSourceClip or a
* #GESTimelineLayer
*/
diff --git a/ges/ges-track-parse-launch-effect.c b/ges/ges-track-parse-launch-effect.c
index ab3a93add3..0e51853998 100644
--- a/ges/ges-track-parse-launch-effect.c
+++ b/ges/ges-track-parse-launch-effect.c
@@ -20,7 +20,7 @@
/**
* SECTION:ges-track-parse-launch-effect
* @short_description: adds an effect build from a parse-launch style
- * bin description to a stream in a #GESTimelineSource or a #GESTimelineLayer
+ * bin description to a stream in a #GESSourceClip or a #GESTimelineLayer
*/
#include "ges-internal.h"
diff --git a/ges/ges-types.h b/ges/ges-types.h
index 78962722a6..6d5afc3848 100644
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -29,8 +29,8 @@
/* Type definitions */
-typedef struct _GESCustomTimelineSource GESCustomTimelineSource;
-typedef struct _GESCustomTimelineSourceClass GESCustomTimelineSourceClass;
+typedef struct _GESCustomSourceClip GESCustomSourceClip;
+typedef struct _GESCustomSourceClipClass GESCustomSourceClipClass;
typedef struct _GESSimpleTimelineLayer GESSimpleTimelineLayer;
typedef struct _GESSimpleTimelineLayerClass GESSimpleTimelineLayerClass;
@@ -53,8 +53,8 @@ typedef struct _GESOperationClipClass GESOperationClipClass;
typedef struct _GESTimelinePipeline GESTimelinePipeline;
typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass;
-typedef struct _GESTimelineSource GESTimelineSource;
-typedef struct _GESTimelineSourceClass GESTimelineSourceClass;
+typedef struct _GESSourceClip GESSourceClip;
+typedef struct _GESSourceClipClass GESSourceClipClass;
typedef struct _GESEffectClip GESEffectClip;
typedef struct _GESEffectClipClass GESEffectClipClass;
diff --git a/ges/ges-uri-clip.c b/ges/ges-uri-clip.c
index 57b357a0a1..95db7bbe86 100644
--- a/ges/ges-uri-clip.c
+++ b/ges/ges-uri-clip.c
@@ -28,7 +28,7 @@
#include "ges-internal.h"
#include "ges-uri-clip.h"
-#include "ges-timeline-source.h"
+#include "ges-source-clip.h"
#include "ges-track-filesource.h"
#include "ges-uri-asset.h"
#include "ges-asset-track-object.h"
@@ -41,7 +41,7 @@ static void ges_extractable_interface_init (GESExtractableInterface * iface);
#define parent_class ges_uri_clip_parent_class
G_DEFINE_TYPE_WITH_CODE (GESUriClip, ges_uri_clip,
- GES_TYPE_TIMELINE_SOURCE,
+ GES_TYPE_SOURCE_CLIP,
G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE,
ges_extractable_interface_init));
diff --git a/ges/ges-uri-clip.h b/ges/ges-uri-clip.h
index 3d9ed77e6a..f1db8cb3fe 100644
--- a/ges/ges-uri-clip.h
+++ b/ges/ges-uri-clip.h
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
#include
G_BEGIN_DECLS
@@ -48,7 +48,7 @@ G_BEGIN_DECLS
typedef struct _GESUriClipPrivate GESUriClipPrivate;
struct _GESUriClip {
- GESTimelineSource parent;
+ GESSourceClip parent;
/*< private >*/
GESUriClipPrivate *priv;
@@ -63,7 +63,7 @@ struct _GESUriClip {
struct _GESUriClipClass {
/*< private >*/
- GESTimelineSourceClass parent_class;
+ GESSourceClipClass parent_class;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
diff --git a/ges/ges.h b/ges/ges.h
index 8e0be0aa1c..06f5428f83 100644
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -32,7 +32,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -42,7 +42,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/tests/check/ges/basic.c b/tests/check/ges/basic.c
index e6432bf0d3..90ed262fb3 100644
--- a/tests/check/ges/basic.c
+++ b/tests/check/ges/basic.c
@@ -54,7 +54,7 @@ GST_START_TEST (test_ges_scenario)
GESTimeline *timeline;
GESTimelineLayer *layer, *tmp_layer;
GESTrack *track;
- GESCustomTimelineSource *source;
+ GESCustomSourceClip *source;
GESTrackObject *trackobject;
GList *trackobjects, *tmp, *layers, *tracks;
@@ -96,7 +96,7 @@ GST_START_TEST (test_ges_scenario)
/* Create a source and add it to the Layer */
GST_DEBUG ("Creating a source");
- source = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ source = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (source != NULL);
/* The source will be floating before added to the layer... */
@@ -183,7 +183,7 @@ GST_START_TEST (test_ges_timeline_add_layer)
GESTimeline *timeline;
GESTimelineLayer *layer, *tmp_layer;
GESTrack *track;
- GESCustomTimelineSource *s1, *s2, *s3;
+ GESCustomSourceClip *s1, *s2, *s3;
GList *trackobjects, *tmp, *layers;
GESTrackObject *trackobject;
@@ -211,7 +211,7 @@ GST_START_TEST (test_ges_timeline_add_layer)
/* Create a source and add it to the Layer */
GST_DEBUG ("Creating a source");
- s1 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s1 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s1 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s1)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s1));
@@ -220,7 +220,7 @@ GST_START_TEST (test_ges_timeline_add_layer)
g_object_unref (tmp_layer);
GST_DEBUG ("Creating a source");
- s2 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s2 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s2 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s2)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s2));
@@ -229,7 +229,7 @@ GST_START_TEST (test_ges_timeline_add_layer)
g_object_unref (tmp_layer);
GST_DEBUG ("Creating a source");
- s3 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s3 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s3 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s3)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s3));
@@ -306,7 +306,7 @@ GST_START_TEST (test_ges_timeline_add_layer_first)
GESTimeline *timeline;
GESTimelineLayer *layer, *tmp_layer;
GESTrack *track;
- GESCustomTimelineSource *s1, *s2, *s3;
+ GESCustomSourceClip *s1, *s2, *s3;
GList *trackobjects, *tmp, *layers;
ges_init ();
@@ -326,7 +326,7 @@ GST_START_TEST (test_ges_timeline_add_layer_first)
/* Create a source and add it to the Layer */
GST_DEBUG ("Creating a source");
- s1 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s1 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s1 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s1)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s1));
@@ -334,7 +334,7 @@ GST_START_TEST (test_ges_timeline_add_layer_first)
g_object_unref (tmp_layer);
GST_DEBUG ("Creating a source");
- s2 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s2 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s2 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s2)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s2));
@@ -342,7 +342,7 @@ GST_START_TEST (test_ges_timeline_add_layer_first)
g_object_unref (tmp_layer);
GST_DEBUG ("Creating a source");
- s3 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s3 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s3 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s3)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s3));
@@ -416,7 +416,7 @@ GST_START_TEST (test_ges_timeline_remove_track)
GESTimeline *timeline;
GESTimelineLayer *layer, *tmp_layer;
GESTrack *track;
- GESCustomTimelineSource *s1, *s2, *s3;
+ GESCustomSourceClip *s1, *s2, *s3;
GESTrackObject *t1, *t2, *t3;
GList *trackobjects, *tmp, *layers;
@@ -437,7 +437,7 @@ GST_START_TEST (test_ges_timeline_remove_track)
/* Create a source and add it to the Layer */
GST_DEBUG ("Creating a source");
- s1 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s1 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s1 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s1)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s1));
@@ -445,7 +445,7 @@ GST_START_TEST (test_ges_timeline_remove_track)
g_object_unref (tmp_layer);
GST_DEBUG ("Creating a source");
- s2 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s2 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s2 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s2)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s2));
@@ -453,7 +453,7 @@ GST_START_TEST (test_ges_timeline_remove_track)
g_object_unref (tmp_layer);
GST_DEBUG ("Creating a source");
- s3 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s3 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s3 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s3)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s3));
@@ -559,7 +559,7 @@ GST_END_TEST;
typedef struct
{
- GESCustomTimelineSource **o1, **o2, **o3;
+ GESCustomSourceClip **o1, **o2, **o3;
GESTrack **tr1, **tr2;
} SelectTracksData;
@@ -584,7 +584,7 @@ GST_START_TEST (test_ges_timeline_multiple_tracks)
GESTimeline *timeline;
GESTimelineLayer *layer, *tmp_layer;
GESTrack *track1, *track2;
- GESCustomTimelineSource *s1, *s2, *s3;
+ GESCustomSourceClip *s1, *s2, *s3;
GESTrackObject *t1, *t2, *t3;
GList *trackobjects, *tmp, *layers;
SelectTracksData st_data = { &s1, &s2, &s3, &track1, &track2 };
@@ -624,7 +624,7 @@ GST_START_TEST (test_ges_timeline_multiple_tracks)
/* Create a source and add it to the Layer */
GST_DEBUG ("Creating a source");
- s1 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s1 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s1 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s1)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s1));
@@ -632,7 +632,7 @@ GST_START_TEST (test_ges_timeline_multiple_tracks)
g_object_unref (tmp_layer);
GST_DEBUG ("Creating a source");
- s2 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s2 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s2 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s2)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s2));
@@ -640,7 +640,7 @@ GST_START_TEST (test_ges_timeline_multiple_tracks)
g_object_unref (tmp_layer);
GST_DEBUG ("Creating a source");
- s3 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ s3 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s3 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s3)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s3));
diff --git a/tests/check/ges/clip.c b/tests/check/ges/clip.c
index 71fc814ff6..7d39db3329 100644
--- a/tests/check/ges/clip.c
+++ b/tests/check/ges/clip.c
@@ -50,8 +50,7 @@ GST_START_TEST (test_object_properties)
track = ges_track_new (GES_TRACK_TYPE_CUSTOM, gst_caps_ref (GST_CAPS_ANY));
fail_unless (track != NULL);
- object =
- (GESClip *) ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ object = (GESClip *) ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (object != NULL);
/* Set some properties */
@@ -117,8 +116,7 @@ GST_START_TEST (test_object_properties_unlocked)
track = ges_track_new (GES_TRACK_TYPE_CUSTOM, gst_caps_ref (GST_CAPS_ANY));
fail_unless (track != NULL);
- object =
- (GESClip *) ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ object = (GESClip *) ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (object != NULL);
/* Set some properties */
@@ -190,8 +188,7 @@ GST_START_TEST (test_split_object)
track = ges_track_new (GES_TRACK_TYPE_CUSTOM, gst_caps_ref (GST_CAPS_ANY));
fail_unless (track != NULL);
- object =
- (GESClip *) ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ object = (GESClip *) ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (object != NULL);
/* Set some properties */
diff --git a/tests/check/ges/layer.c b/tests/check/ges/layer.c
index 0b628c7f82..2726bb7e9e 100644
--- a/tests/check/ges/layer.c
+++ b/tests/check/ges/layer.c
@@ -69,8 +69,7 @@ GST_START_TEST (test_layer_properties)
fail_unless (track != NULL);
fail_unless (ges_timeline_add_track (timeline, track));
- object =
- (GESClip *) ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ object = (GESClip *) ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (object != NULL);
/* Set some properties */
@@ -159,16 +158,13 @@ GST_START_TEST (test_layer_priorities)
fail_unless (track != NULL);
fail_unless (ges_timeline_add_track (timeline, track));
- object1 =
- GES_CLIP (ges_custom_timeline_source_new (my_fill_track_func, NULL));
+ object1 = GES_CLIP (ges_custom_source_clip_new (my_fill_track_func, NULL));
ges_clip_set_supported_formats (object1,
GES_TRACK_TYPE_AUDIO | GES_TRACK_TYPE_VIDEO);
- object2 =
- GES_CLIP (ges_custom_timeline_source_new (my_fill_track_func, NULL));
+ object2 = GES_CLIP (ges_custom_source_clip_new (my_fill_track_func, NULL));
ges_clip_set_supported_formats (object2,
GES_TRACK_TYPE_AUDIO | GES_TRACK_TYPE_VIDEO);
- object3 =
- GES_CLIP (ges_custom_timeline_source_new (my_fill_track_func, NULL));
+ object3 = GES_CLIP (ges_custom_source_clip_new (my_fill_track_func, NULL));
ges_clip_set_supported_formats (object3,
GES_TRACK_TYPE_AUDIO | GES_TRACK_TYPE_VIDEO);
fail_unless (object1 != NULL);
diff --git a/tests/check/ges/simplelayer.c b/tests/check/ges/simplelayer.c
index 3f846afed9..7b842e823d 100644
--- a/tests/check/ges/simplelayer.c
+++ b/tests/check/ges/simplelayer.c
@@ -66,7 +66,7 @@ GST_START_TEST (test_gsl_add)
GESTimeline *timeline;
GESTimelineLayer *layer;
GESTrack *track;
- GESCustomTimelineSource *source;
+ GESCustomSourceClip *source;
GESClip *source2;
gint result;
@@ -80,7 +80,7 @@ GST_START_TEST (test_gsl_add)
track = ges_track_new (GES_TRACK_TYPE_CUSTOM, gst_caps_ref (GST_CAPS_ANY));
fail_unless (ges_timeline_add_track (timeline, track));
- source = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ source = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (source != NULL);
g_object_set (source, "duration", GST_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (_DURATION (source), GST_SECOND);
@@ -139,7 +139,7 @@ GST_START_TEST (test_gsl_move_simple)
GESTimeline *timeline;
GESTimelineLayer *layer;
GESTrack *track;
- GESCustomTimelineSource *source1, *source2;
+ GESCustomSourceClip *source1, *source2;
siginfo info = { 0, 0 };
ges_init ();
@@ -154,10 +154,10 @@ GST_START_TEST (test_gsl_move_simple)
(object_moved_cb), &info);
/* Create two 1s sources */
- source1 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ source1 = ges_custom_source_clip_new (my_fill_track_func, NULL);
g_object_set (source1, "duration", GST_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (_DURATION (source1), GST_SECOND);
- source2 = ges_custom_timeline_source_new (my_fill_track_func, NULL);
+ source2 = ges_custom_source_clip_new (my_fill_track_func, NULL);
g_object_set (source2, "duration", GST_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (_DURATION (source2), GST_SECOND);
@@ -235,7 +235,7 @@ GST_START_TEST (test_gsl_with_transitions)
GESTimeline *timeline;
GESTimelineLayer *layer;
GESTrack *track;
- GESCustomTimelineSource *source1, *source2, *source3, *source4;
+ GESCustomSourceClip *source1, *source2, *source3, *source4;
GESStandardTransitionClip *tr1, *tr2, *tr3, *tr4, *tr5;
GESSimpleTimelineLayer *gstl;
gboolean valid;
@@ -263,7 +263,7 @@ GST_START_TEST (test_gsl_with_transitions)
#define ELEMENT "videotestsrc"
/* Create four 1s sources */
- source1 = ges_custom_timeline_source_new (arbitrary_fill_track_func,
+ source1 = ges_custom_source_clip_new (arbitrary_fill_track_func,
(gpointer) ELEMENT);
g_object_set (source1, "duration", GST_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (_DURATION (source1), GST_SECOND);
@@ -271,18 +271,18 @@ GST_START_TEST (test_gsl_with_transitions)
/* make this source taller than the others, so we can check that
* gstlrecalculate handles this properly */
- source2 = ges_custom_timeline_source_new (arbitrary_fill_track_func,
+ source2 = ges_custom_source_clip_new (arbitrary_fill_track_func,
(gpointer) ELEMENT);
g_object_set (source2, "duration", GST_SECOND, "start", (guint64) 42, NULL);
GES_CLIP (source2)->height = 4;
fail_unless_equals_uint64 (_DURATION (source2), GST_SECOND);
- source3 = ges_custom_timeline_source_new (arbitrary_fill_track_func,
+ source3 = ges_custom_source_clip_new (arbitrary_fill_track_func,
(gpointer) ELEMENT);
g_object_set (source3, "duration", GST_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (_DURATION (source3), GST_SECOND);
- source4 = ges_custom_timeline_source_new (arbitrary_fill_track_func,
+ source4 = ges_custom_source_clip_new (arbitrary_fill_track_func,
(gpointer) ELEMENT);
g_object_set (source4, "duration", GST_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (_DURATION (source4), GST_SECOND);
diff --git a/tests/check/ges/timelineedition.c b/tests/check/ges/timelineedition.c
index 075d1ec98c..e1125d688d 100644
--- a/tests/check/ges/timelineedition.c
+++ b/tests/check/ges/timelineedition.c
@@ -43,7 +43,7 @@ my_fill_track_func (GESClip * object,
static inline GESClip *
create_custom_clip (void)
{
- return GES_CLIP (ges_custom_timeline_source_new (my_fill_track_func, NULL));
+ return GES_CLIP (ges_custom_source_clip_new (my_fill_track_func, NULL));
}
#define CHECK_OBJECT_PROPS(obj, start, inpoint, duration) {\