mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 15:22:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename GESTimelineOperation to GESOperationClip

Browse source
This commit is contained in:
Thibault Saunier 2013-01-17 00:26:35 -03:00
parent dbc83d5d86
commit d151f62aa9
15 changed files with 62 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/ges.mk
View file

@ -18,7 +18,7 @@ LOCAL_SRC_FILES := \
ges-timeline-pipeline.c \ ges-timeline-pipeline.c \
ges-timeline-source.c \ ges-timeline-source.c \
ges-uri-clip.c \ ges-uri-clip.c \
ges-timeline-operation.c \ ges-operation-clip.c \
ges-transition-clip.c \ ges-transition-clip.c \
ges-standard-transition-clip.c \ ges-standard-transition-clip.c \
ges-timeline-test-source.c \ ges-timeline-test-source.c \

2
docs/libs/ges-docs.sgml
View file

@ -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-timeline-element.xml"/>
<xi:include href="xml/ges-clip.xml"/> <xi:include href="xml/ges-clip.xml"/>
<xi:include href="xml/ges-timeline-source.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-timeline-overlay.xml"/>
<xi:include href="xml/ges-effect-clip.xml"/> <xi:include href="xml/ges-effect-clip.xml"/>
<xi:include href="xml/ges-track.xml"/> <xi:include href="xml/ges-track.xml"/>

24
docs/libs/ges-sections.txt
View file

@ -463,19 +463,19 @@ GES_TYPE_URI_CLIP
</SECTION> </SECTION>
<SECTION> <SECTION>
<FILE>ges-timeline-operation</FILE> <FILE>ges-operation-clip</FILE>
<TITLE>GESTimelineOperation</TITLE> <TITLE>GESOperationClip</TITLE>
GESTimelineOperation GESOperationClip
<SUBSECTION Standard> <SUBSECTION Standard>
GESTimelineOperationClass GESOperationClipClass
GESTimelineOperationPrivate GESOperationClipPrivate
GES_TIMELINE_OPERATION GES_OPERATION_CLIP
GES_IS_TIMELINE_OPERATION GES_IS_OPERATION_CLIP
GES_TYPE_TIMELINE_OPERATION GES_TYPE_OPERATION_CLIP
ges_timeline_operation_get_type ges_operation_clip_get_type
GES_TIMELINE_OPERATION_CLASS GES_OPERATION_CLIP_CLASS
GES_IS_TIMELINE_OPERATION_CLASS GES_IS_OPERATION_CLIP_CLASS
GES_TIMELINE_OPERATION_GET_CLASS GES_OPERATION_CLIP_GET_CLASS
</SECTION> </SECTION>
<SECTION> <SECTION>

2
docs/libs/ges.types
View file

@ -9,7 +9,7 @@ ges_simple_timeline_layer_get_type
ges_timeline_get_type ges_timeline_get_type
ges_timeline_layer_get_type ges_timeline_layer_get_type
ges_clip_get_type ges_clip_get_type
ges_timeline_operation_get_type ges_operation_clip_get_type
ges_timeline_overlay_get_type ges_timeline_overlay_get_type
ges_timeline_pipeline_get_type ges_timeline_pipeline_get_type
ges_timeline_source_get_type ges_timeline_source_get_type

4
ges/Makefile.am
View file

@ -22,7 +22,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-effect-clip.c \ ges-effect-clip.c \
ges-standard-effect-clip.c \ ges-standard-effect-clip.c \
ges-uri-clip.c \ ges-uri-clip.c \
ges-timeline-operation.c \ ges-operation-clip.c \
ges-transition-clip.c \ ges-transition-clip.c \
ges-standard-transition-clip.c \ ges-standard-transition-clip.c \
ges-timeline-test-source.c \ ges-timeline-test-source.c \
@ -76,7 +76,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-uri-clip.h \ ges-uri-clip.h \
ges-effect-clip.h \ ges-effect-clip.h \
ges-standard-effect-clip.h \ ges-standard-effect-clip.h \
ges-timeline-operation.h \ ges-operation-clip.h \
ges-transition-clip.h \ ges-transition-clip.h \
ges-standard-transition-clip.h \ ges-standard-transition-clip.h \
ges-timeline-test-source.h \ ges-timeline-test-source.h \

2
ges/ges-effect-clip.c
View file

@ -34,7 +34,7 @@
#include "ges-types.h" #include "ges-types.h"
G_DEFINE_ABSTRACT_TYPE (GESEffectClip, ges_effect_clip, G_DEFINE_ABSTRACT_TYPE (GESEffectClip, ges_effect_clip,
GES_TYPE_TIMELINE_OPERATION); GES_TYPE_OPERATION_CLIP);
struct _GESEffectClipPrivate struct _GESEffectClipPrivate
{ {

4
ges/ges-effect-clip.h
View file

@ -49,7 +49,7 @@ typedef struct _GESEffectClipPrivate GESEffectClipPrivate;
*/ */
struct _GESEffectClip { struct _GESEffectClip {
/*< private >*/ /*< private >*/
GESTimelineOperation parent; GESOperationClip parent;
GESEffectClipPrivate *priv; GESEffectClipPrivate *priv;
@ -64,7 +64,7 @@ struct _GESEffectClip {
struct _GESEffectClipClass { struct _GESEffectClipClass {
/*< private >*/ /*< private >*/
GESTimelineOperationClass parent_class; GESOperationClipClass parent_class;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];

17
ges/ges-timeline-operation.c → ges/ges-operation-clip.c
View file

@ -19,7 +19,7 @@
*/ */
/** /**
* SECTION:ges-timeline-operation * SECTION:ges-operation-clip
* @short_description: Base Class for operations in a GESTimelineLayer * @short_description: Base Class for operations in a GESTimelineLayer
* *
* Operations are any kind of object that both outputs AND consumes data. * Operations are any kind of object that both outputs AND consumes data.
@ -27,25 +27,24 @@
#include "ges.h" #include "ges.h"
#include "ges-internal.h" #include "ges-internal.h"
#include "ges-timeline-operation.h" #include "ges-operation-clip.h"
G_DEFINE_ABSTRACT_TYPE (GESTimelineOperation, ges_timeline_operation, G_DEFINE_ABSTRACT_TYPE (GESOperationClip, ges_operation_clip, GES_TYPE_CLIP);
GES_TYPE_CLIP);
struct _GESTimelineOperationPrivate struct _GESOperationClipPrivate
{ {
void *nada; void *nada;
}; };
static void 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 static void
ges_timeline_operation_init (GESTimelineOperation * self) ges_operation_clip_init (GESOperationClip * self)
{ {
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TIMELINE_OPERATION, GESTimelineOperationPrivate); GES_TYPE_OPERATION_CLIP, GESOperationClipPrivate);
} }

44
ges/ges-timeline-operation.h → ges/ges-operation-clip.h
View file

@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _GES_TIMELINE_OPERATION #ifndef _GES_OPERATION_CLIP
#define _GES_TIMELINE_OPERATION #define _GES_OPERATION_CLIP
#include <glib-object.h> #include <glib-object.h>
#include <gst/gst.h> #include <gst/gst.h>
@ -28,44 +28,44 @@
G_BEGIN_DECLS 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) \ #define GES_OPERATION_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_OPERATION, GESTimelineOperation)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_OPERATION_CLIP, GESOperationClip))
#define GES_TIMELINE_OPERATION_CLASS(klass) \ #define GES_OPERATION_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_OPERATION, GESTimelineOperationClass)) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_OPERATION_CLIP, GESOperationClipClass))
#define GES_IS_TIMELINE_OPERATION(obj) \ #define GES_IS_OPERATION_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_OPERATION)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_OPERATION_CLIP))
#define GES_IS_TIMELINE_OPERATION_CLASS(klass) \ #define GES_IS_OPERATION_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_OPERATION)) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_OPERATION_CLIP))
#define GES_TIMELINE_OPERATION_GET_CLASS(obj) \ #define GES_OPERATION_CLIP_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_OPERATION, GESTimelineOperationClass)) (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 >*/ /*< private >*/
GESClip parent; GESClip parent;
GESTimelineOperationPrivate *priv; GESOperationClipPrivate *priv;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
/** /**
* GESTimelineOperationClass: * GESOperationClipClass:
*/ */
struct _GESTimelineOperationClass { struct _GESOperationClipClass {
/*< private >*/ /*< private >*/
GESClipClass parent_class; GESClipClass parent_class;
@ -74,9 +74,9 @@ struct _GESTimelineOperationClass {
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
GType ges_timeline_operation_get_type (void); GType ges_operation_clip_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* _GES_TIMELINE_OPERATION */ #endif /* _GES_OPERATION_CLIP */

4
ges/ges-timeline-overlay.c
View file

@ -31,11 +31,11 @@
*/ */
#include "ges-internal.h" #include "ges-internal.h"
#include "ges-timeline-operation.h" #include "ges-operation-clip.h"
#include "ges-timeline-overlay.h" #include "ges-timeline-overlay.h"
G_DEFINE_ABSTRACT_TYPE (GESTimelineOverlay, ges_timeline_overlay, G_DEFINE_ABSTRACT_TYPE (GESTimelineOverlay, ges_timeline_overlay,
GES_TYPE_TIMELINE_OPERATION); GES_TYPE_OPERATION_CLIP);
struct _GESTimelineOverlayPrivate struct _GESTimelineOverlayPrivate
{ {

6
ges/ges-timeline-overlay.h
View file

@ -23,7 +23,7 @@
#include <glib-object.h> #include <glib-object.h>
#include <ges/ges-types.h> #include <ges/ges-types.h>
#include <ges/ges-timeline-operation.h> #include <ges/ges-operation-clip.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -52,7 +52,7 @@ typedef struct _GESTimelineOverlayPrivate GESTimelineOverlayPrivate;
struct _GESTimelineOverlay { struct _GESTimelineOverlay {
/*< private >*/ /*< private >*/
GESTimelineOperation parent; GESOperationClip parent;
GESTimelineOverlayPrivate *priv; GESTimelineOverlayPrivate *priv;
@ -66,7 +66,7 @@ struct _GESTimelineOverlay {
*/ */
struct _GESTimelineOverlayClass { struct _GESTimelineOverlayClass {
GESTimelineOperationClass parent_class; GESOperationClipClass parent_class;
/*< private >*/ /*< private >*/
/* Padding for API extension */ /* Padding for API extension */

2
ges/ges-transition-clip.c
View file

@ -33,7 +33,7 @@ struct _GESTransitionClipPrivate
}; };
G_DEFINE_ABSTRACT_TYPE (GESTransitionClip, ges_transition_clip, G_DEFINE_ABSTRACT_TYPE (GESTransitionClip, ges_transition_clip,
GES_TYPE_TIMELINE_OPERATION); GES_TYPE_OPERATION_CLIP);
static void static void
ges_transition_clip_class_init (GESTransitionClipClass * klass) ges_transition_clip_class_init (GESTransitionClipClass * klass)

6
ges/ges-transition-clip.h
View file

@ -21,7 +21,7 @@
#ifndef _GES_TRANSITION_CLIP #ifndef _GES_TRANSITION_CLIP
#define _GES_TRANSITION_CLIP #define _GES_TRANSITION_CLIP
#include "ges-timeline-operation.h" #include "ges-operation-clip.h"
#include <glib-object.h> #include <glib-object.h>
#include <ges/ges-types.h> #include <ges/ges-types.h>
@ -52,7 +52,7 @@ typedef struct _GESTransitionClipPrivate GESTransitionClipPrivate;
*/ */
struct _GESTransitionClip { struct _GESTransitionClip {
/*< private >*/ /*< private >*/
GESTimelineOperation parent; GESOperationClip parent;
/*< private >*/ /*< private >*/
GESTransitionClipPrivate *priv; GESTransitionClipPrivate *priv;
@ -68,7 +68,7 @@ struct _GESTransitionClip {
struct _GESTransitionClipClass { struct _GESTransitionClipClass {
/*< private >*/ /*< private >*/
GESTimelineOperationClass parent_class; GESOperationClipClass parent_class;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];

4
ges/ges-types.h
View file

@ -47,8 +47,8 @@ typedef struct _GESTimelineElement GESTimelineElement;
typedef struct _GESClip GESClip; typedef struct _GESClip GESClip;
typedef struct _GESClipClass GESClipClass; typedef struct _GESClipClass GESClipClass;
typedef struct _GESTimelineOperation GESTimelineOperation; typedef struct _GESOperationClip GESOperationClip;
typedef struct _GESTimelineOperationClass GESTimelineOperationClass; typedef struct _GESOperationClipClass GESOperationClipClass;
typedef struct _GESTimelinePipeline GESTimelinePipeline; typedef struct _GESTimelinePipeline GESTimelinePipeline;
typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass; typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass;

2
ges/ges.h
View file

@ -35,7 +35,7 @@
#include <ges/ges-timeline-source.h> #include <ges/ges-timeline-source.h>
#include <ges/ges-timeline-test-source.h> #include <ges/ges-timeline-test-source.h>
#include <ges/ges-timeline-title-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-effect-clip.h>
#include <ges/ges-timeline-overlay.h> #include <ges/ges-timeline-overlay.h>
#include <ges/ges-timeline-text-overlay.h> #include <ges/ges-timeline-text-overlay.h>