mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename GESTransitionClip to GESBaseTransitionClip

Browse source
This commit is contained in:
Thibault Saunier 2013-01-25 11:26:14 -03:00
parent e48b959dde
commit 4300876b0d
14 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/ges.mk
View file

@ -19,7 +19,7 @@ LOCAL_SRC_FILES := \
ges-source-clip.c \ ges-source-clip.c \
ges-uri-clip.c \ ges-uri-clip.c \
ges-operation-clip.c \ ges-operation-clip.c \
ges-transition-clip.c \ ges-base-transition-clip.c \
ges-standard-transition-clip.c \ ges-standard-transition-clip.c \
ges-test-clip.c \ ges-test-clip.c \
ges-title-clip.c \ ges-title-clip.c \

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

@ -47,7 +47,7 @@ platform as well as Windows. It is released under the GNU Library General Public
<xi:include href="xml/ges-track-source.xml"/> <xi:include href="xml/ges-track-source.xml"/>
<xi:include href="xml/ges-track-effect.xml"/> <xi:include href="xml/ges-track-effect.xml"/>
<xi:include href="xml/ges-track-operation.xml"/> <xi:include href="xml/ges-track-operation.xml"/>
<xi:include href="xml/ges-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

@ -498,19 +498,19 @@ GES_TYPE_OVERLAY_CLIP
</SECTION> </SECTION>
<SECTION> <SECTION>
<FILE>ges-transition-clip</FILE> <FILE>ges-base-transition-clip</FILE>
<TITLE>GESTransitionClip</TITLE> <TITLE>GESBaseTransitionClip</TITLE>
GESTransitionClip GESBaseTransitionClip
<SUBSECTION Standard> <SUBSECTION Standard>
GESTransitionClipClass GESBaseTransitionClipClass
GESTransitionClipPrivate GESBaseTransitionClipPrivate
GES_TRANSITION_CLIP GES_BASE_TRANSITION_CLIP
GES_IS_TRANSITION_CLIP GES_IS_BASE_TRANSITION_CLIP
GES_TYPE_TRANSITION_CLIP GES_TYPE_BASE_TRANSITION_CLIP
ges_transition_clip_get_type ges_base_transition_clip_get_type
GES_TRANSITION_CLIP_CLASS GES_BASE_TRANSITION_CLIP_CLASS
GES_IS_TRANSITION_CLIP_CLASS GES_IS_BASE_TRANSITION_CLIP_CLASS
GES_TRANSITION_CLIP_GET_CLASS GES_BASE_TRANSITION_CLIP_GET_CLASS
</SECTION> </SECTION>
<SECTION> <SECTION>

2
docs/libs/ges.types
View file

@ -14,7 +14,7 @@ ges_overlay_clip_get_type
ges_timeline_pipeline_get_type ges_timeline_pipeline_get_type
ges_source_clip_get_type ges_source_clip_get_type
ges_test_clip_get_type ges_test_clip_get_type
ges_transition_clip_get_type ges_base_transition_clip_get_type
ges_standard_transition_clip_get_type ges_standard_transition_clip_get_type
ges_effect_clip_get_type ges_effect_clip_get_type
ges_standard_effect_clip_get_type ges_standard_effect_clip_get_type

4
ges/Makefile.am
View file

@ -23,7 +23,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-standard-effect-clip.c \ ges-standard-effect-clip.c \
ges-uri-clip.c \ ges-uri-clip.c \
ges-operation-clip.c \ ges-operation-clip.c \
ges-transition-clip.c \ ges-base-transition-clip.c \
ges-standard-transition-clip.c \ ges-standard-transition-clip.c \
ges-test-clip.c \ ges-test-clip.c \
ges-title-clip.c \ ges-title-clip.c \
@ -77,7 +77,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-effect-clip.h \ ges-effect-clip.h \
ges-standard-effect-clip.h \ ges-standard-effect-clip.h \
ges-operation-clip.h \ ges-operation-clip.h \
ges-transition-clip.h \ ges-base-transition-clip.h \
ges-standard-transition-clip.h \ ges-standard-transition-clip.h \
ges-test-clip.h \ ges-test-clip.h \
ges-title-clip.h \ ges-title-clip.h \

4
ges/ges-auto-transition.c
View file

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>."; * along with this program. If not, see <http://www.gnu.org/licenses/>.";
*/ */
/* This class warps a GESTransitionClip, letting any implementation /* This class warps a GESBaseTransitionClip, letting any implementation
* of a GESTransitionClip to be used. * of a GESBaseTransitionClip to be used.
* *
* NOTE: This is for internal use exclusively * NOTE: This is for internal use exclusively
*/ */

14
ges/ges-transition-clip.c → ges/ges-base-transition-clip.c
View file

@ -19,31 +19,31 @@
*/ */
/** /**
* SECTION: ges-transition-clip * SECTION: ges-base-transition-clip
* @short_description: Base classes for transitions * @short_description: Base classes for transitions
*/ */
#include <ges/ges.h> #include <ges/ges.h>
#include "ges-internal.h" #include "ges-internal.h"
struct _GESTransitionClipPrivate struct _GESBaseTransitionClipPrivate
{ {
/* Dummy variable */ /* Dummy variable */
void *nothing; void *nothing;
}; };
G_DEFINE_ABSTRACT_TYPE (GESTransitionClip, ges_transition_clip, G_DEFINE_ABSTRACT_TYPE (GESBaseTransitionClip, ges_base_transition_clip,
GES_TYPE_OPERATION_CLIP); GES_TYPE_OPERATION_CLIP);
static void static void
ges_transition_clip_class_init (GESTransitionClipClass * klass) ges_base_transition_clip_class_init (GESBaseTransitionClipClass * klass)
{ {
g_type_class_add_private (klass, sizeof (GESTransitionClipPrivate)); g_type_class_add_private (klass, sizeof (GESBaseTransitionClipPrivate));
} }
static void static void
ges_transition_clip_init (GESTransitionClip * self) ges_base_transition_clip_init (GESBaseTransitionClip * self)
{ {
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TRANSITION_CLIP, GESTransitionClipPrivate); GES_TYPE_BASE_TRANSITION_CLIP, GESBaseTransitionClipPrivate);
} }

42
ges/ges-transition-clip.h → ges/ges-base-transition-clip.h
View file

@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _GES_TRANSITION_CLIP #ifndef _GES_BASE_TRANSITION_CLIP
#define _GES_TRANSITION_CLIP #define _GES_BASE_TRANSITION_CLIP
#include "ges-operation-clip.h" #include "ges-operation-clip.h"
@ -28,45 +28,45 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GES_TYPE_TRANSITION_CLIP ges_transition_clip_get_type() #define GES_TYPE_BASE_TRANSITION_CLIP ges_base_transition_clip_get_type()
#define GES_TRANSITION_CLIP(obj) \ #define GES_BASE_TRANSITION_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRANSITION_CLIP, GESTransitionClip)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_BASE_TRANSITION_CLIP, GESBaseTransitionClip))
#define GES_TRANSITION_CLIP_CLASS(klass) \ #define GES_BASE_TRANSITION_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRANSITION_CLIP, GESTransitionClipClass)) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_BASE_TRANSITION_CLIP, GESBaseTransitionClipClass))
#define GES_IS_TRANSITION_CLIP(obj) \ #define GES_IS_BASE_TRANSITION_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRANSITION_CLIP)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_BASE_TRANSITION_CLIP))
#define GES_IS_TRANSITION_CLIP_CLASS(klass) \ #define GES_IS_BASE_TRANSITION_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRANSITION_CLIP)) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_BASE_TRANSITION_CLIP))
#define GES_TRANSITION_CLIP_GET_CLASS(obj) \ #define GES_BASE_TRANSITION_CLIP_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRANSITION_CLIP, GESTransitionClipClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_BASE_TRANSITION_CLIP, GESBaseTransitionClipClass))
typedef struct _GESTransitionClipPrivate GESTransitionClipPrivate; typedef struct _GESBaseTransitionClipPrivate GESBaseTransitionClipPrivate;
/** /**
* GESTransitionClip: * GESBaseTransitionClip:
*/ */
struct _GESTransitionClip { struct _GESBaseTransitionClip {
/*< private >*/ /*< private >*/
GESOperationClip parent; GESOperationClip parent;
/*< private >*/ /*< private >*/
GESTransitionClipPrivate *priv; GESBaseTransitionClipPrivate *priv;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
/** /**
* GESTransitionClipClass: * GESBaseTransitionClipClass:
* *
*/ */
struct _GESTransitionClipClass { struct _GESBaseTransitionClipClass {
/*< private >*/ /*< private >*/
GESOperationClipClass parent_class; GESOperationClipClass parent_class;
@ -74,8 +74,8 @@ struct _GESTransitionClipClass {
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
GType ges_transition_clip_get_type (void); GType ges_base_transition_clip_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* _GES_TRANSITION_CLIP */ #endif /* _GES_BASE_TRANSITION_CLIP */

18
ges/ges-simple-timeline-layer.c
View file

@ -27,9 +27,9 @@
* GESSimpleTimelineLayer, and the layer will automatically compute the * GESSimpleTimelineLayer, and the layer will automatically compute the
* appropriate start times. * appropriate start times.
* *
* Users should be aware that GESTransitionClip objects are considered to * Users should be aware that GESBaseTransitionClip objects are considered to
* have a negative duration for the purposes of positioning GESSourceClip * have a negative duration for the purposes of positioning GESSourceClip
* objects (i.e., adding a GESTransitionClip creates an overlap between * objects (i.e., adding a GESBaseTransitionClip creates an overlap between
* the two adjacent sources. * the two adjacent sources.
*/ */
@ -174,7 +174,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
GST_DEBUG ("recalculating values"); GST_DEBUG ("recalculating values");
if (priv->objects && GES_IS_TRANSITION_CLIP (priv->objects->data)) { if (priv->objects && GES_IS_BASE_TRANSITION_CLIP (priv->objects->data)) {
valid = FALSE; valid = FALSE;
} }
@ -205,7 +205,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
g_assert (priority != -1); g_assert (priority != -1);
} else if (GES_IS_TRANSITION_CLIP (obj)) { } else if (GES_IS_BASE_TRANSITION_CLIP (obj)) {
pos -= dur; pos -= dur;
if (pos < 0) if (pos < 0)
@ -227,7 +227,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
/* sanity checks */ /* sanity checks */
l_next = g_list_next (tmp); l_next = g_list_next (tmp);
if (GES_IS_TRANSITION_CLIP (prev_object)) { if (GES_IS_BASE_TRANSITION_CLIP (prev_object)) {
GST_ERROR ("two transitions in sequence!"); GST_ERROR ("two transitions in sequence!");
valid = FALSE; valid = FALSE;
} }
@ -261,7 +261,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
} }
if (prev_object && GES_IS_TRANSITION_CLIP (prev_object)) { if (prev_object && GES_IS_BASE_TRANSITION_CLIP (prev_object)) {
valid = FALSE; valid = FALSE;
} }
@ -307,14 +307,14 @@ ges_simple_timeline_layer_add_object (GESSimpleTimelineLayer * layer,
nth = g_list_nth (priv->objects, position); nth = g_list_nth (priv->objects, position);
if (GES_IS_TRANSITION_CLIP (object)) { if (GES_IS_BASE_TRANSITION_CLIP (object)) {
GList *lprev = g_list_previous (nth); GList *lprev = g_list_previous (nth);
GESClip *prev = GES_CLIP (lprev ? lprev->data : NULL); GESClip *prev = GES_CLIP (lprev ? lprev->data : NULL);
GESClip *next = GES_CLIP (nth ? nth->data : NULL); GESClip *next = GES_CLIP (nth ? nth->data : NULL);
if ((prev && GES_IS_TRANSITION_CLIP (prev)) || if ((prev && GES_IS_BASE_TRANSITION_CLIP (prev)) ||
(next && GES_IS_TRANSITION_CLIP (next))) { (next && GES_IS_BASE_TRANSITION_CLIP (next))) {
GST_ERROR ("Not adding transition: Only insert transitions between two" GST_ERROR ("Not adding transition: Only insert transitions between two"
" sources, or at the begining or end the layer\n"); " sources, or at the begining or end the layer\n");
return FALSE; return FALSE;

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

@ -193,7 +193,7 @@ ges_extractable_interface_init (GESExtractableInterface * iface)
} }
G_DEFINE_TYPE_WITH_CODE (GESStandardTransitionClip, G_DEFINE_TYPE_WITH_CODE (GESStandardTransitionClip,
ges_standard_transition_clip, GES_TYPE_TRANSITION_CLIP, ges_standard_transition_clip, GES_TYPE_BASE_TRANSITION_CLIP,
G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE, G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE,
ges_extractable_interface_init)); ges_extractable_interface_init));

6
ges/ges-standard-transition-clip.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-transition-clip.h> #include <ges/ges-base-transition-clip.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -53,7 +53,7 @@ typedef struct _GESStandardTransitionClipPrivate GESStandardTransitionClipPrivat
*/ */
struct _GESStandardTransitionClip { struct _GESStandardTransitionClip {
/*< private >*/ /*< private >*/
GESTransitionClip parent; GESBaseTransitionClip parent;
/*< public >*/ /*< public >*/
GESVideoStandardTransitionType vtype; GESVideoStandardTransitionType vtype;
@ -72,7 +72,7 @@ struct _GESStandardTransitionClip {
struct _GESStandardTransitionClipClass { struct _GESStandardTransitionClipClass {
/*< private >*/ /*< private >*/
GESTransitionClipClass parent_class; GESBaseTransitionClipClass 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

@ -62,8 +62,8 @@ typedef struct _GESEffectClipClass GESEffectClipClass;
typedef struct _GESUriClip GESUriClip; typedef struct _GESUriClip GESUriClip;
typedef struct _GESUriClipClass GESUriClipClass; typedef struct _GESUriClipClass GESUriClipClass;
typedef struct _GESTransitionClip GESTransitionClip; typedef struct _GESBaseTransitionClip GESBaseTransitionClip;
typedef struct _GESTransitionClipClass GESTransitionClipClass; typedef struct _GESBaseTransitionClipClass GESBaseTransitionClipClass;
typedef struct _GESStandardTransitionClip GESStandardTransitionClip; typedef struct _GESStandardTransitionClip GESStandardTransitionClip;
typedef struct _GESStandardTransitionClipClass GESStandardTransitionClipClass; typedef struct _GESStandardTransitionClipClass GESStandardTransitionClipClass;

2
ges/ges.h
View file

@ -39,7 +39,7 @@
#include <ges/ges-effect-clip.h> #include <ges/ges-effect-clip.h>
#include <ges/ges-overlay-clip.h> #include <ges/ges-overlay-clip.h>
#include <ges/ges-text-overlay-clip.h> #include <ges/ges-text-overlay-clip.h>
#include <ges/ges-transition-clip.h> #include <ges/ges-base-transition-clip.h>
#include <ges/ges-standard-transition-clip.h> #include <ges/ges-standard-transition-clip.h>
#include <ges/ges-standard-effect-clip.h> #include <ges/ges-standard-effect-clip.h>
#include <ges/ges-custom-source-clip.h> #include <ges/ges-custom-source-clip.h>

2
tests/examples/ges-ui.c
View file

@ -364,7 +364,7 @@ layer_object_added_cb (GESTimelineLayer * layer, GESClip * object, App * app)
gtk_list_store_set (app->model, &iter, 2, object, 0, "Test Source", -1); gtk_list_store_set (app->model, &iter, 2, object, 0, "Test Source", -1);
} }
else if (GES_IS_TRANSITION_CLIP (object)) { else if (GES_IS_BASE_TRANSITION_CLIP (object)) {
gtk_list_store_set (app->model, &iter, 2, object, 0, "Transition", -1); gtk_list_store_set (app->model, &iter, 2, object, 0, "Transition", -1);
} }