mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename GESTrackTransition to GESTransition

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

2
android/ges.mk
View file

@ -31,7 +31,7 @@ LOCAL_SRC_FILES := \
ges-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-transition.c \
ges-track-audio-transition.c \ ges-track-audio-transition.c \
ges-track-video-transition.c \ ges-track-video-transition.c \
ges-video-test-source.c \ ges-video-test-source.c \

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

@ -68,7 +68,7 @@ platform as well as Windows. It is released under the GNU Library General Public
<xi:include href="xml/ges-audio-test-source.xml"/> <xi:include href="xml/ges-audio-test-source.xml"/>
<xi:include href="xml/ges-video-test-source.xml"/> <xi:include href="xml/ges-video-test-source.xml"/>
<xi:include href="xml/ges-text-overlay.xml"/> <xi:include href="xml/ges-text-overlay.xml"/>
<xi:include href="xml/ges-track-transition.xml"/> <xi:include href="xml/ges-transition.xml"/>
<xi:include href="xml/ges-track-video-transition.xml"/> <xi:include href="xml/ges-track-video-transition.xml"/>
<xi:include href="xml/ges-track-audio-transition.xml"/> <xi:include href="xml/ges-track-audio-transition.xml"/>
<xi:include href="xml/ges-image-source.xml"/> <xi:include href="xml/ges-image-source.xml"/>

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

@ -195,19 +195,19 @@ ges_image_source_get_type
</SECTION> </SECTION>
<SECTION> <SECTION>
<FILE>ges-track-transition</FILE> <FILE>ges-transition</FILE>
<TITLE>GESTrackTransition</TITLE> <TITLE>GESTransition</TITLE>
GESTrackTransition GESTransition
GESTrackTransitionClass GESTransitionClass
<SUBSECTION Standard> <SUBSECTION Standard>
GESTrackTransitionPrivate GESTransitionPrivate
GES_IS_TRACK_TRANSITION GES_IS_TRANSITION
GES_IS_TRACK_TRANSITION_CLASS GES_IS_TRANSITION_CLASS
GES_TRACK_TRANSITION GES_TRANSITION
GES_TRACK_TRANSITION_CLASS GES_TRANSITION_CLASS
GES_TRACK_TRANSITION_GET_CLASS GES_TRANSITION_GET_CLASS
GES_TYPE_TRACK_TRANSITION GES_TYPE_TRANSITION
ges_track_transition_get_type ges_transition_get_type
</SECTION> </SECTION>
<SECTION> <SECTION>

2
docs/libs/ges.types
View file

@ -33,7 +33,7 @@ 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
ges_track_transition_get_type ges_transition_get_type
%ges_track_type_get_type %ges_track_type_get_type
ges_video_test_source_get_type ges_video_test_source_get_type
ges_track_video_transition_get_type ges_track_video_transition_get_type

4
ges/Makefile.am
View file

@ -35,7 +35,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-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-transition.c \
ges-track-audio-transition.c \ ges-track-audio-transition.c \
ges-track-video-transition.c \ ges-track-video-transition.c \
ges-video-test-source.c \ ges-video-test-source.c \
@ -91,7 +91,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-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-transition.h \
ges-track-audio-transition.h \ ges-track-audio-transition.h \
ges-track-video-transition.h \ ges-track-video-transition.h \
ges-video-test-source.h \ ges-video-test-source.h \

2
ges/ges-timeline.c
View file

@ -754,7 +754,7 @@ _create_auto_transition_from_transitions (GESTimeline * timeline,
else if (_START (maybe_transition) != _START (next) || else if (_START (maybe_transition) != _START (next) ||
_DURATION (maybe_transition) != transition_duration) _DURATION (maybe_transition) != transition_duration)
continue; continue;
else if (GES_IS_TRACK_TRANSITION (maybe_transition)) else if (GES_IS_TRANSITION (maybe_transition))
/* Use that transition */ /* Use that transition */
/* TODO We should make sure that the transition contains only /* TODO We should make sure that the transition contains only
* TrackElement-s in @track and if it is not the case properly unlink the * TrackElement-s in @track and if it is not the case properly unlink the

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

@ -30,7 +30,7 @@
#include <gst/controller/gstdirectcontrolbinding.h> #include <gst/controller/gstdirectcontrolbinding.h>
G_DEFINE_TYPE (GESTrackAudioTransition, ges_track_audio_transition, G_DEFINE_TYPE (GESTrackAudioTransition, ges_track_audio_transition,
GES_TYPE_TRACK_TRANSITION); GES_TYPE_TRANSITION);
struct _GESTrackAudioTransitionPrivate struct _GESTrackAudioTransitionPrivate
{ {

6
ges/ges-track-audio-transition.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-track-transition.h> #include <ges/ges-transition.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -52,7 +52,7 @@ typedef struct _GESTrackAudioTransitionPrivate GESTrackAudioTransitionPrivate;
*/ */
struct _GESTrackAudioTransition { struct _GESTrackAudioTransition {
GESTrackTransition parent; GESTransition parent;
/*< private >*/ /*< private >*/
GESTrackAudioTransitionPrivate *priv; GESTrackAudioTransitionPrivate *priv;
@ -62,7 +62,7 @@ struct _GESTrackAudioTransition {
}; };
struct _GESTrackAudioTransitionClass { struct _GESTrackAudioTransitionClass {
GESTrackTransitionClass parent_class; GESTransitionClass parent_class;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];

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

@ -29,7 +29,7 @@
#include <gst/controller/gstdirectcontrolbinding.h> #include <gst/controller/gstdirectcontrolbinding.h>
G_DEFINE_TYPE (GESTrackVideoTransition, ges_track_video_transition, G_DEFINE_TYPE (GESTrackVideoTransition, ges_track_video_transition,
GES_TYPE_TRACK_TRANSITION); GES_TYPE_TRANSITION);
static inline void static inline void
ges_track_video_transition_set_border_internal (GESTrackVideoTransition * self, ges_track_video_transition_set_border_internal (GESTrackVideoTransition * self,

6
ges/ges-track-video-transition.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-track-transition.h> #include <ges/ges-transition.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -51,7 +51,7 @@ typedef struct _GESTrackVideoTransitionPrivate GESTrackVideoTransitionPrivate;
*/ */
struct _GESTrackVideoTransition { struct _GESTrackVideoTransition {
GESTrackTransition parent; GESTransition parent;
/*< private >*/ /*< private >*/
@ -68,7 +68,7 @@ struct _GESTrackVideoTransition {
*/ */
struct _GESTrackVideoTransitionClass { struct _GESTrackVideoTransitionClass {
GESTrackTransitionClass parent_class; GESTransitionClass parent_class;
/*< private >*/ /*< private >*/
/* Padding for API extension */ /* Padding for API extension */

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

@ -304,7 +304,7 @@ ges_tl_transition_create_track_element (GESClip * obj, GESTrackType type)
GESTrackElement *res = NULL; GESTrackElement *res = NULL;
GESTrackType supportedformats; GESTrackType supportedformats;
GST_DEBUG ("Creating a GESTrackTransition"); GST_DEBUG ("Creating a GESTransition");
supportedformats = ges_clip_get_supported_formats (obj); supportedformats = ges_clip_get_supported_formats (obj);
if (type == GES_TRACK_TYPE_VIDEO) { if (type == GES_TRACK_TYPE_VIDEO) {

15
ges/ges-track-transition.c → ges/ges-transition.c
View file

@ -19,7 +19,7 @@
*/ */
/** /**
* SECTION:ges-track-transition * SECTION:ges-transition
* @short_description: base class for audio and video transitions * @short_description: base class for audio and video transitions
* *
*/ */
@ -27,10 +27,9 @@
#include <ges/ges.h> #include <ges/ges.h>
#include "ges-internal.h" #include "ges-internal.h"
G_DEFINE_ABSTRACT_TYPE (GESTrackTransition, ges_track_transition, G_DEFINE_ABSTRACT_TYPE (GESTransition, ges_transition, GES_TYPE_OPERATION);
GES_TYPE_OPERATION);
struct _GESTrackTransitionPrivate struct _GESTransitionPrivate
{ {
/* Dummy variable */ /* Dummy variable */
void *nothing; void *nothing;
@ -38,14 +37,14 @@ struct _GESTrackTransitionPrivate
static void static void
ges_track_transition_class_init (GESTrackTransitionClass * klass) ges_transition_class_init (GESTransitionClass * klass)
{ {
g_type_class_add_private (klass, sizeof (GESTrackTransitionPrivate)); g_type_class_add_private (klass, sizeof (GESTransitionPrivate));
} }
static void static void
ges_track_transition_init (GESTrackTransition * self) ges_transition_init (GESTransition * self)
{ {
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TRACK_TRANSITION, GESTrackTransitionPrivate); GES_TYPE_TRANSITION, GESTransitionPrivate);
} }

46
ges/ges-track-transition.h → ges/ges-transition.h
View file

@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _GES_TRACK_TRANSITION #ifndef _GES_TRANSITION
#define _GES_TRACK_TRANSITION #define _GES_TRANSITION
#include <glib-object.h> #include <glib-object.h>
#include <gst/gst.h> #include <gst/gst.h>
@ -29,50 +29,50 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GES_TYPE_TRACK_TRANSITION ges_track_transition_get_type() #define GES_TYPE_TRANSITION ges_transition_get_type()
#define GES_TRACK_TRANSITION(obj) \ #define GES_TRANSITION(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_TRANSITION,\ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRANSITION,\
GESTrackTransition)) GESTransition))
#define GES_TRACK_TRANSITION_CLASS(klass) \ #define GES_TRANSITION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_TRANSITION,\ (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRANSITION,\
GESTrackTransitionClass)) GESTransitionClass))
#define GES_IS_TRACK_TRANSITION(obj) \ #define GES_IS_TRANSITION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_TRANSITION)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRANSITION))
#define GES_IS_TRACK_TRANSITION_CLASS(klass) \ #define GES_IS_TRANSITION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_TRANSITION)) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRANSITION))
#define GES_TRACK_TRANSITION_GET_CLASS(obj) \ #define GES_TRANSITION_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_TRANSITION,\ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRANSITION,\
GESTrackTransitionClass)) GESTransitionClass))
typedef struct _GESTrackTransitionPrivate GESTrackTransitionPrivate; typedef struct _GESTransitionPrivate GESTransitionPrivate;
/** /**
* GESTrackTransition: * GESTransition:
* *
* Base class for media transitions. * Base class for media transitions.
*/ */
struct _GESTrackTransition struct _GESTransition
{ {
/*< private >*/ /*< private >*/
GESOperation parent; GESOperation parent;
GESTrackTransitionPrivate *priv; GESTransitionPrivate *priv;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
/** /**
* GESTrackTransitionClass: * GESTransitionClass:
*/ */
struct _GESTrackTransitionClass { struct _GESTransitionClass {
/*< private >*/ /*< private >*/
GESOperationClass parent_class; GESOperationClass parent_class;
@ -81,7 +81,7 @@ struct _GESTrackTransitionClass {
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
GType ges_track_transition_get_type (void); GType ges_transition_get_type (void);
G_END_DECLS G_END_DECLS

4
ges/ges-types.h
View file

@ -107,8 +107,8 @@ typedef struct _GESUriSourceClass GESUriSourceClass;
typedef struct _GESImageSource GESImageSource; typedef struct _GESImageSource GESImageSource;
typedef struct _GESImageSourceClass GESImageSourceClass; typedef struct _GESImageSourceClass GESImageSourceClass;
typedef struct _GESTrackTransition GESTrackTransition; typedef struct _GESTransition GESTransition;
typedef struct _GESTrackTransitionClass GESTrackTransitionClass; typedef struct _GESTransitionClass GESTransitionClass;
typedef struct _GESTrackAudioTransition GESTrackAudioTransition; typedef struct _GESTrackAudioTransition GESTrackAudioTransition;
typedef struct _GESTrackAudioTransitionClass typedef struct _GESTrackAudioTransitionClass

2
ges/ges.h
View file

@ -66,7 +66,7 @@
#include <ges/ges-audio-test-source.h> #include <ges/ges-audio-test-source.h>
#include <ges/ges-title-source.h> #include <ges/ges-title-source.h>
#include <ges/ges-text-overlay.h> #include <ges/ges-text-overlay.h>
#include <ges/ges-track-transition.h> #include <ges/ges-transition.h>
#include <ges/ges-track-video-transition.h> #include <ges/ges-track-video-transition.h>
#include <ges/ges-track-audio-transition.h> #include <ges/ges-track-audio-transition.h>
#include <ges/ges-base-effect.h> #include <ges/ges-base-effect.h>