Commit d151f62a authored by Thibault Saunier's avatar Thibault Saunier

Rename GESTimelineOperation to GESOperationClip

parent dbc83d5d
......@@ -18,7 +18,7 @@ LOCAL_SRC_FILES := \
ges-timeline-pipeline.c \
ges-timeline-source.c \
ges-uri-clip.c \
ges-timeline-operation.c \
ges-operation-clip.c \
ges-transition-clip.c \
ges-standard-transition-clip.c \
ges-timeline-test-source.c \
......
......@@ -39,7 +39,7 @@ platform as well as Windows. It is released under the GNU Library General Public
<xi:include href="xml/ges-timeline-element.xml"/>
<xi:include href="xml/ges-clip.xml"/>
<xi:include href="xml/ges-timeline-source.xml"/>
<xi:include href="xml/ges-timeline-operation.xml"/>
<xi:include href="xml/ges-operation-clip.xml"/>
<xi:include href="xml/ges-timeline-overlay.xml"/>
<xi:include href="xml/ges-effect-clip.xml"/>
<xi:include href="xml/ges-track.xml"/>
......
......@@ -463,19 +463,19 @@ GES_TYPE_URI_CLIP
</SECTION>
<SECTION>
<FILE>ges-timeline-operation</FILE>
<TITLE>GESTimelineOperation</TITLE>
GESTimelineOperation
<FILE>ges-operation-clip</FILE>
<TITLE>GESOperationClip</TITLE>
GESOperationClip
<SUBSECTION Standard>
GESTimelineOperationClass
GESTimelineOperationPrivate
GES_TIMELINE_OPERATION
GES_IS_TIMELINE_OPERATION
GES_TYPE_TIMELINE_OPERATION
ges_timeline_operation_get_type
GES_TIMELINE_OPERATION_CLASS
GES_IS_TIMELINE_OPERATION_CLASS
GES_TIMELINE_OPERATION_GET_CLASS
GESOperationClipClass
GESOperationClipPrivate
GES_OPERATION_CLIP
GES_IS_OPERATION_CLIP
GES_TYPE_OPERATION_CLIP
ges_operation_clip_get_type
GES_OPERATION_CLIP_CLASS
GES_IS_OPERATION_CLIP_CLASS
GES_OPERATION_CLIP_GET_CLASS
</SECTION>
<SECTION>
......
......@@ -9,7 +9,7 @@ ges_simple_timeline_layer_get_type
ges_timeline_get_type
ges_timeline_layer_get_type
ges_clip_get_type
ges_timeline_operation_get_type
ges_operation_clip_get_type
ges_timeline_overlay_get_type
ges_timeline_pipeline_get_type
ges_timeline_source_get_type
......
......@@ -22,7 +22,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-effect-clip.c \
ges-standard-effect-clip.c \
ges-uri-clip.c \
ges-timeline-operation.c \
ges-operation-clip.c \
ges-transition-clip.c \
ges-standard-transition-clip.c \
ges-timeline-test-source.c \
......@@ -76,7 +76,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-uri-clip.h \
ges-effect-clip.h \
ges-standard-effect-clip.h \
ges-timeline-operation.h \
ges-operation-clip.h \
ges-transition-clip.h \
ges-standard-transition-clip.h \
ges-timeline-test-source.h \
......
......@@ -34,7 +34,7 @@
#include "ges-types.h"
G_DEFINE_ABSTRACT_TYPE (GESEffectClip, ges_effect_clip,
GES_TYPE_TIMELINE_OPERATION);
GES_TYPE_OPERATION_CLIP);
struct _GESEffectClipPrivate
{
......
......@@ -49,7 +49,7 @@ typedef struct _GESEffectClipPrivate GESEffectClipPrivate;
*/
struct _GESEffectClip {
/*< private >*/
GESTimelineOperation parent;
GESOperationClip parent;
GESEffectClipPrivate *priv;
......@@ -64,7 +64,7 @@ struct _GESEffectClip {
struct _GESEffectClipClass {
/*< private >*/
GESTimelineOperationClass parent_class;
GESOperationClipClass parent_class;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
......
......@@ -19,7 +19,7 @@
*/
/**
* SECTION:ges-timeline-operation
* SECTION:ges-operation-clip
* @short_description: Base Class for operations in a GESTimelineLayer
*
* Operations are any kind of object that both outputs AND consumes data.
......@@ -27,25 +27,24 @@
#include "ges.h"
#include "ges-internal.h"
#include "ges-timeline-operation.h"
#include "ges-operation-clip.h"
G_DEFINE_ABSTRACT_TYPE (GESTimelineOperation, ges_timeline_operation,
GES_TYPE_CLIP);
G_DEFINE_ABSTRACT_TYPE (GESOperationClip, ges_operation_clip, GES_TYPE_CLIP);
struct _GESTimelineOperationPrivate
struct _GESOperationClipPrivate
{
void *nada;
};
static void
ges_timeline_operation_class_init (GESTimelineOperationClass * klass)
ges_operation_clip_class_init (GESOperationClipClass * klass)
{
g_type_class_add_private (klass, sizeof (GESTimelineOperationPrivate));
g_type_class_add_private (klass, sizeof (GESOperationClipPrivate));
}
static void
ges_timeline_operation_init (GESTimelineOperation * self)
ges_operation_clip_init (GESOperationClip * self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TIMELINE_OPERATION, GESTimelineOperationPrivate);
GES_TYPE_OPERATION_CLIP, GESOperationClipPrivate);
}
......@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef _GES_TIMELINE_OPERATION
#define _GES_TIMELINE_OPERATION
#ifndef _GES_OPERATION_CLIP
#define _GES_OPERATION_CLIP
#include <glib-object.h>
#include <gst/gst.h>
......@@ -28,44 +28,44 @@
G_BEGIN_DECLS
#define GES_TYPE_TIMELINE_OPERATION ges_timeline_operation_get_type()
#define GES_TYPE_OPERATION_CLIP ges_operation_clip_get_type()
#define GES_TIMELINE_OPERATION(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_OPERATION, GESTimelineOperation))
#define GES_OPERATION_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_OPERATION_CLIP, GESOperationClip))
#define GES_TIMELINE_OPERATION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_OPERATION, GESTimelineOperationClass))
#define GES_OPERATION_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_OPERATION_CLIP, GESOperationClipClass))
#define GES_IS_TIMELINE_OPERATION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_OPERATION))
#define GES_IS_OPERATION_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_OPERATION_CLIP))
#define GES_IS_TIMELINE_OPERATION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_OPERATION))
#define GES_IS_OPERATION_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_OPERATION_CLIP))
#define GES_TIMELINE_OPERATION_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_OPERATION, GESTimelineOperationClass))
#define GES_OPERATION_CLIP_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_OPERATION_CLIP, GESOperationClipClass))
typedef struct _GESTimelineOperationPrivate GESTimelineOperationPrivate;
typedef struct _GESOperationClipPrivate GESOperationClipPrivate;
/**
* GESTimelineOperation:
* GESOperationClip:
*
* The GESTimelineOperation subclass. Subclasses can access these fields.
* The GESOperationClip subclass. Subclasses can access these fields.
*/
struct _GESTimelineOperation {
struct _GESOperationClip {
/*< private >*/
GESClip parent;
GESTimelineOperationPrivate *priv;
GESOperationClipPrivate *priv;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
/**
* GESTimelineOperationClass:
* GESOperationClipClass:
*/
struct _GESTimelineOperationClass {
struct _GESOperationClipClass {
/*< private >*/
GESClipClass parent_class;
......@@ -74,9 +74,9 @@ struct _GESTimelineOperationClass {
gpointer _ges_reserved[GES_PADDING];
};
GType ges_timeline_operation_get_type (void);
GType ges_operation_clip_get_type (void);
G_END_DECLS
#endif /* _GES_TIMELINE_OPERATION */
#endif /* _GES_OPERATION_CLIP */
......@@ -31,11 +31,11 @@
*/
#include "ges-internal.h"
#include "ges-timeline-operation.h"
#include "ges-operation-clip.h"
#include "ges-timeline-overlay.h"
G_DEFINE_ABSTRACT_TYPE (GESTimelineOverlay, ges_timeline_overlay,
GES_TYPE_TIMELINE_OPERATION);
GES_TYPE_OPERATION_CLIP);
struct _GESTimelineOverlayPrivate
{
......
......@@ -23,7 +23,7 @@
#include <glib-object.h>
#include <ges/ges-types.h>
#include <ges/ges-timeline-operation.h>
#include <ges/ges-operation-clip.h>
G_BEGIN_DECLS
......@@ -52,7 +52,7 @@ typedef struct _GESTimelineOverlayPrivate GESTimelineOverlayPrivate;
struct _GESTimelineOverlay {
/*< private >*/
GESTimelineOperation parent;
GESOperationClip parent;
GESTimelineOverlayPrivate *priv;
......@@ -66,7 +66,7 @@ struct _GESTimelineOverlay {
*/
struct _GESTimelineOverlayClass {
GESTimelineOperationClass parent_class;
GESOperationClipClass parent_class;
/*< private >*/
/* Padding for API extension */
......
......@@ -33,7 +33,7 @@ struct _GESTransitionClipPrivate
};
G_DEFINE_ABSTRACT_TYPE (GESTransitionClip, ges_transition_clip,
GES_TYPE_TIMELINE_OPERATION);
GES_TYPE_OPERATION_CLIP);
static void
ges_transition_clip_class_init (GESTransitionClipClass * klass)
......
......@@ -21,7 +21,7 @@
#ifndef _GES_TRANSITION_CLIP
#define _GES_TRANSITION_CLIP
#include "ges-timeline-operation.h"
#include "ges-operation-clip.h"
#include <glib-object.h>
#include <ges/ges-types.h>
......@@ -52,7 +52,7 @@ typedef struct _GESTransitionClipPrivate GESTransitionClipPrivate;
*/
struct _GESTransitionClip {
/*< private >*/
GESTimelineOperation parent;
GESOperationClip parent;
/*< private >*/
GESTransitionClipPrivate *priv;
......@@ -68,7 +68,7 @@ struct _GESTransitionClip {
struct _GESTransitionClipClass {
/*< private >*/
GESTimelineOperationClass parent_class;
GESOperationClipClass parent_class;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
......
......@@ -47,8 +47,8 @@ typedef struct _GESTimelineElement GESTimelineElement;
typedef struct _GESClip GESClip;
typedef struct _GESClipClass GESClipClass;
typedef struct _GESTimelineOperation GESTimelineOperation;
typedef struct _GESTimelineOperationClass GESTimelineOperationClass;
typedef struct _GESOperationClip GESOperationClip;
typedef struct _GESOperationClipClass GESOperationClipClass;
typedef struct _GESTimelinePipeline GESTimelinePipeline;
typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass;
......
......@@ -35,7 +35,7 @@
#include <ges/ges-timeline-source.h>
#include <ges/ges-timeline-test-source.h>
#include <ges/ges-timeline-title-source.h>
#include <ges/ges-timeline-operation.h>
#include <ges/ges-operation-clip.h>
#include <ges/ges-effect-clip.h>
#include <ges/ges-timeline-overlay.h>
#include <ges/ges-timeline-text-overlay.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment