mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename GESTrackOperation to GESOperation

Browse source
This commit is contained in:
Thibault Saunier 2013-01-27 12:27:19 -03:00
parent ac456f74d7
commit f7170a6a83
15 changed files with 61 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/ges.mk
View file

@ -28,7 +28,7 @@ LOCAL_SRC_FILES := \
ges-track.c \ ges-track.c \
ges-track-element.c \ ges-track-element.c \
ges-source.c \ ges-source.c \
ges-track-operation.c \ ges-operation.c \
ges-uri-source.c \ ges-uri-source.c \
ges-image-source.c \ ges-image-source.c \
ges-track-transition.c \ ges-track-transition.c \

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

@ -46,7 +46,7 @@ platform as well as Windows. It is released under the GNU Library General Public
<xi:include href="xml/ges-track-element.xml"/> <xi:include href="xml/ges-track-element.xml"/>
<xi:include href="xml/ges-source.xml"/> <xi:include href="xml/ges-source.xml"/>
<xi:include href="xml/ges-base-effect.xml"/> <xi:include href="xml/ges-base-effect.xml"/>
<xi:include href="xml/ges-track-operation.xml"/> <xi:include href="xml/ges-operation.xml"/>
<xi:include href="xml/ges-base-transition-clip.xml"/> <xi:include href="xml/ges-base-transition-clip.xml"/>
<xi:include href="xml/ges-asset.xml"/> <xi:include href="xml/ges-asset.xml"/>
</chapter> </chapter>

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

@ -145,19 +145,19 @@ ges_source_get_type
</SECTION> </SECTION>
<SECTION> <SECTION>
<FILE>ges-track-operation</FILE> <FILE>ges-operation</FILE>
<TITLE>GESTrackOperation</TITLE> <TITLE>GESOperation</TITLE>
GESTrackOperation GESOperation
GESTrackOperationClass GESOperationClass
<SUBSECTION Standard> <SUBSECTION Standard>
GESTrackOperationPrivate GESOperationPrivate
ges_track_operation_get_type ges_operation_get_type
GES_IS_TRACK_OPERATION GES_IS_OPERATION
GES_IS_TRACK_OPERATION_CLASS GES_IS_OPERATION_CLASS
GES_TRACK_OPERATION GES_OPERATION
GES_TRACK_OPERATION_CLASS GES_OPERATION_CLASS
GES_TRACK_OPERATION_GET_CLASS GES_OPERATION_GET_CLASS
GES_TYPE_TRACK_OPERATION GES_TYPE_OPERATION
</SECTION> </SECTION>
<SECTION> <SECTION>

2
docs/libs/ges.types
View file

@ -29,7 +29,7 @@ ges_image_source_get_type
ges_track_element_get_type ges_track_element_get_type
ges_base_effect_get_type ges_base_effect_get_type
ges_effect_get_type ges_effect_get_type
ges_track_operation_get_type ges_operation_get_type
ges_source_get_type ges_source_get_type
ges_text_overlay_get_type ges_text_overlay_get_type
ges_title_source_get_type ges_title_source_get_type

4
ges/Makefile.am
View file

@ -32,7 +32,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-track.c \ ges-track.c \
ges-track-element.c \ ges-track-element.c \
ges-source.c \ ges-source.c \
ges-track-operation.c \ ges-operation.c \
ges-uri-source.c \ ges-uri-source.c \
ges-image-source.c \ ges-image-source.c \
ges-track-transition.c \ ges-track-transition.c \
@ -88,7 +88,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-track.h \ ges-track.h \
ges-track-element.h \ ges-track-element.h \
ges-source.h \ ges-source.h \
ges-track-operation.h \ ges-operation.h \
ges-uri-source.h \ ges-uri-source.h \
ges-image-source.h \ ges-image-source.h \
ges-track-transition.h \ ges-track-transition.h \

3
ges/ges-base-effect.c
View file

@ -30,8 +30,7 @@
#include "ges-track-element.h" #include "ges-track-element.h"
#include "ges-base-effect.h" #include "ges-base-effect.h"
G_DEFINE_ABSTRACT_TYPE (GESBaseEffect, ges_base_effect, G_DEFINE_ABSTRACT_TYPE (GESBaseEffect, ges_base_effect, GES_TYPE_OPERATION);
GES_TYPE_TRACK_OPERATION);
static GHashTable *ges_base_effect_get_props_hashtable (GESTrackElement * self); static GHashTable *ges_base_effect_get_props_hashtable (GESTrackElement * self);
guint pspec_hash (gconstpointer key_spec); guint pspec_hash (gconstpointer key_spec);

6
ges/ges-base-effect.h
View file

@ -22,7 +22,7 @@
#include <glib-object.h> #include <glib-object.h>
#include <ges/ges-types.h> #include <ges/ges-types.h>
#include <ges/ges-track-operation.h> #include <ges/ges-operation.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -47,7 +47,7 @@ typedef struct _GESBaseEffectPrivate GESBaseEffectPrivate;
struct _GESBaseEffect struct _GESBaseEffect
{ {
/*< private > */ /*< private > */
GESTrackOperation parent; GESOperation parent;
GESBaseEffectPrivate *priv; GESBaseEffectPrivate *priv;
/* Padding for API extension */ /* Padding for API extension */
@ -62,7 +62,7 @@ struct _GESBaseEffect
struct _GESBaseEffectClass struct _GESBaseEffectClass
{ {
/*< private > */ /*< private > */
GESTrackOperationClass parent_class; GESOperationClass parent_class;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];

17
ges/ges-track-operation.c → ges/ges-operation.c
View file

@ -19,36 +19,35 @@
*/ */
/** /**
* SECTION:ges-track-operation * SECTION:ges-operation
* @short_description: Base Class for effects and overlays * @short_description: Base Class for effects and overlays
*/ */
#include "ges-internal.h" #include "ges-internal.h"
#include "ges-track-element.h" #include "ges-track-element.h"
#include "ges-track-operation.h" #include "ges-operation.h"
G_DEFINE_ABSTRACT_TYPE (GESTrackOperation, ges_track_operation, G_DEFINE_ABSTRACT_TYPE (GESOperation, ges_operation, GES_TYPE_TRACK_ELEMENT);
GES_TYPE_TRACK_ELEMENT);
struct _GESTrackOperationPrivate struct _GESOperationPrivate
{ {
/* Dummy variable */ /* Dummy variable */
void *nothing; void *nothing;
}; };
static void static void
ges_track_operation_class_init (GESTrackOperationClass * klass) ges_operation_class_init (GESOperationClass * klass)
{ {
GESTrackElementClass *track_class = GES_TRACK_ELEMENT_CLASS (klass); GESTrackElementClass *track_class = GES_TRACK_ELEMENT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GESTrackOperationPrivate)); g_type_class_add_private (klass, sizeof (GESOperationPrivate));
track_class->gnlobject_factorytype = "gnloperation"; track_class->gnlobject_factorytype = "gnloperation";
} }
static void static void
ges_track_operation_init (GESTrackOperation * self) ges_operation_init (GESOperation * self)
{ {
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TRACK_OPERATION, GESTrackOperationPrivate); GES_TYPE_OPERATION, GESOperationPrivate);
} }

42
ges/ges-track-operation.h → ges/ges-operation.h
View file

@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _GES_TRACK_OPERATION #ifndef _GES_OPERATION
#define _GES_TRACK_OPERATION #define _GES_OPERATION
#include <glib-object.h> #include <glib-object.h>
#include <gst/gst.h> #include <gst/gst.h>
@ -28,46 +28,46 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GES_TYPE_TRACK_OPERATION ges_track_operation_get_type() #define GES_TYPE_OPERATION ges_operation_get_type()
#define GES_TRACK_OPERATION(obj) \ #define GES_OPERATION(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_OPERATION, GESTrackOperation)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_OPERATION, GESOperation))
#define GES_TRACK_OPERATION_CLASS(klass) \ #define GES_OPERATION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_OPERATION, GESTrackOperationClass)) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_OPERATION, GESOperationClass))
#define GES_IS_TRACK_OPERATION(obj) \ #define GES_IS_OPERATION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_OPERATION)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_OPERATION))
#define GES_IS_TRACK_OPERATION_CLASS(klass) \ #define GES_IS_OPERATION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_OPERATION)) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_OPERATION))
#define GES_TRACK_OPERATION_GET_CLASS(obj) \ #define GES_OPERATION_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_OPERATION, GESTrackOperationClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_OPERATION, GESOperationClass))
typedef struct _GESTrackOperationPrivate GESTrackOperationPrivate; typedef struct _GESOperationPrivate GESOperationPrivate;
/** /**
* GESTrackOperation: * GESOperation:
* *
* Base class for overlays, transitions, and effects * Base class for overlays, transitions, and effects
*/ */
struct _GESTrackOperation { struct _GESOperation {
/*< private >*/ /*< private >*/
GESTrackElement parent; GESTrackElement parent;
GESTrackOperationPrivate *priv; GESOperationPrivate *priv;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
/** /**
* GESTrackOperationClass: * GESOperationClass:
*/ */
struct _GESTrackOperationClass { struct _GESOperationClass {
/*< private >*/ /*< private >*/
GESTrackElementClass parent_class; GESTrackElementClass parent_class;
@ -76,8 +76,8 @@ struct _GESTrackOperationClass {
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
GType ges_track_operation_get_type (void); GType ges_operation_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* _GES_TRACK_OPERATION */ #endif /* _GES_OPERATION */

2
ges/ges-text-overlay.c
View file

@ -30,7 +30,7 @@
#include "ges-title-source.h" #include "ges-title-source.h"
#include "ges-text-overlay.h" #include "ges-text-overlay.h"
G_DEFINE_TYPE (GESTextOverlay, ges_text_overlay, GES_TYPE_TRACK_OPERATION); G_DEFINE_TYPE (GESTextOverlay, ges_text_overlay, GES_TYPE_OPERATION);
struct _GESTextOverlayPrivate struct _GESTextOverlayPrivate
{ {

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

@ -24,7 +24,7 @@
#include <glib-object.h> #include <glib-object.h>
#include <ges/ges-types.h> #include <ges/ges-types.h>
#include <ges/ges-title-source.h> #include <ges/ges-title-source.h>
#include <ges/ges-track-operation.h> #include <ges/ges-operation.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GES_TYPE_TEXT_OVERLAY ges_text_overlay_get_type() #define GES_TYPE_TEXT_OVERLAY ges_text_overlay_get_type()
@ -45,7 +45,7 @@ typedef struct _GESTextOverlayPrivate GESTextOverlayPrivate;
*/ */
struct _GESTextOverlay struct _GESTextOverlay
{ {
GESTrackOperation parent; GESOperation parent;
/*< private > */ /*< private > */
GESTextOverlayPrivate *priv; GESTextOverlayPrivate *priv;
@ -56,7 +56,7 @@ struct _GESTextOverlay
struct _GESTextOverlayClass struct _GESTextOverlayClass
{ {
GESTrackOperationClass parent_class; GESOperationClass parent_class;
/*< private > */ /*< private > */

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

@ -28,7 +28,7 @@
#include "ges-internal.h" #include "ges-internal.h"
G_DEFINE_ABSTRACT_TYPE (GESTrackTransition, ges_track_transition, G_DEFINE_ABSTRACT_TYPE (GESTrackTransition, ges_track_transition,
GES_TYPE_TRACK_OPERATION); GES_TYPE_OPERATION);
struct _GESTrackTransitionPrivate struct _GESTrackTransitionPrivate
{ {

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

@ -25,7 +25,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstinterpolationcontrolsource.h> #include <gst/controller/gstinterpolationcontrolsource.h>
#include <ges/ges-types.h> #include <ges/ges-types.h>
#include <ges/ges-track-operation.h> #include <ges/ges-operation.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -60,7 +60,7 @@ typedef struct _GESTrackTransitionPrivate GESTrackTransitionPrivate;
struct _GESTrackTransition struct _GESTrackTransition
{ {
/*< private >*/ /*< private >*/
GESTrackOperation parent; GESOperation parent;
GESTrackTransitionPrivate *priv; GESTrackTransitionPrivate *priv;
@ -74,7 +74,7 @@ struct _GESTrackTransition
struct _GESTrackTransitionClass { struct _GESTrackTransitionClass {
/*< private >*/ /*< private >*/
GESTrackOperationClass parent_class; GESOperationClass parent_class;
/*< private >*/ /*< private >*/
/* Padding for API extension */ /* Padding for API extension */

4
ges/ges-types.h
View file

@ -92,8 +92,8 @@ typedef struct _GESTrackElementClass GESTrackElementClass;
typedef struct _GESSource GESSource; typedef struct _GESSource GESSource;
typedef struct _GESSourceClass GESSourceClass; typedef struct _GESSourceClass GESSourceClass;
typedef struct _GESTrackOperation GESTrackOperation; typedef struct _GESOperation GESOperation;
typedef struct _GESTrackOperationClass GESTrackOperationClass; typedef struct _GESOperationClass GESOperationClass;
typedef struct _GESBaseEffect GESBaseEffect; typedef struct _GESBaseEffect GESBaseEffect;
typedef struct _GESBaseEffectClass GESBaseEffectClass; typedef struct _GESBaseEffectClass GESBaseEffectClass;

2
ges/ges.h
View file

@ -58,7 +58,7 @@
#include <ges/ges-track.h> #include <ges/ges-track.h>
#include <ges/ges-track-element.h> #include <ges/ges-track-element.h>
#include <ges/ges-source.h> #include <ges/ges-source.h>
#include <ges/ges-track-operation.h> #include <ges/ges-operation.h>
#include <ges/ges-uri-source.h> #include <ges/ges-uri-source.h>
#include <ges/ges-image-source.h> #include <ges/ges-image-source.h>