mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename GESTimelineOverlay to GESOverlayClip

Browse source
This commit is contained in:
Thibault Saunier 2013-01-17 00:49:43 -03:00
parent 878f015179
commit fd5c3e512a
13 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/ges.mk
View file

@ -23,7 +23,7 @@ LOCAL_SRC_FILES := \
ges-standard-transition-clip.c \
ges-timeline-test-source.c \
ges-timeline-title-source.c \
ges-timeline-overlay.c \
ges-overlay-clip.c \
ges-timeline-text-overlay.c \
ges-track.c \
ges-track-object.c \

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

@ -40,7 +40,7 @@ platform as well as Windows. It is released under the GNU Library General Public
<xi:include href="xml/ges-clip.xml"/>
<xi:include href="xml/ges-source-clip.xml"/>
<xi:include href="xml/ges-operation-clip.xml"/>
<xi:include href="xml/ges-timeline-overlay.xml"/>
<xi:include href="xml/ges-overlay-clip.xml"/>
<xi:include href="xml/ges-effect-clip.xml"/>
<xi:include href="xml/ges-track.xml"/>
<xi:include href="xml/ges-track-object.xml"/>

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

@ -479,19 +479,19 @@ GES_OPERATION_CLIP_GET_CLASS
</SECTION>
<SECTION>
<FILE>ges-timeline-overlay</FILE>
<TITLE>GESTimelineOverlay</TITLE>
GESTimelineOverlay
GESTimelineOverlayClass
<FILE>ges-overlay-clip</FILE>
<TITLE>GESOverlayClip</TITLE>
GESOverlayClip
GESOverlayClipClass
<SUBSECTION Standard>
GESTimelineOverlayPrivate
ges_timeline_overlay_get_type
GES_IS_TIMELINE_OVERLAY
GES_IS_TIMELINE_OVERLAY_CLASS
GES_TIMELINE_OVERLAY
GES_TIMELINE_OVERLAY_CLASS
GES_TIMELINE_OVERLAY_GET_CLASS
GES_TYPE_TIMELINE_OVERLAY
GESOverlayClipPrivate
ges_overlay_clip_get_type
GES_IS_OVERLAY_CLIP
GES_IS_OVERLAY_CLIP_CLASS
GES_OVERLAY_CLIP
GES_OVERLAY_CLIP_CLASS
GES_OVERLAY_CLIP_GET_CLASS
GES_TYPE_OVERLAY_CLIP
</SECTION>
<SECTION>

2
docs/libs/ges.types
View file

@ -10,7 +10,7 @@ ges_timeline_get_type
ges_timeline_layer_get_type
ges_clip_get_type
ges_operation_clip_get_type
ges_timeline_overlay_get_type
ges_overlay_clip_get_type
ges_timeline_pipeline_get_type
ges_source_clip_get_type
ges_timeline_test_source_get_type

4
ges/Makefile.am
View file

@ -27,7 +27,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-standard-transition-clip.c \
ges-timeline-test-source.c \
ges-timeline-title-source.c \
ges-timeline-overlay.c \
ges-overlay-clip.c \
ges-timeline-text-overlay.c \
ges-track.c \
ges-track-object.c \
@ -81,7 +81,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-standard-transition-clip.h \
ges-timeline-test-source.h \
ges-timeline-title-source.h \
ges-timeline-overlay.h \
ges-overlay-clip.h \
ges-timeline-text-overlay.h \
ges-track-effect.h \
ges-track-parse-launch-effect.h \

16
ges/ges-timeline-overlay.c → ges/ges-overlay-clip.c
View file

@ -19,7 +19,7 @@
*/
/**
* SECTION:ges-timeline-overlay
* SECTION:ges-overlay-clip
* @short_description: Base Class for overlays in a GESTimelineLayer
*
* Overlays are objects which modify the underlying layer(s).
@ -32,26 +32,26 @@
#include "ges-internal.h"
#include "ges-operation-clip.h"
#include "ges-timeline-overlay.h"
#include "ges-overlay-clip.h"
G_DEFINE_ABSTRACT_TYPE (GESTimelineOverlay, ges_timeline_overlay,
G_DEFINE_ABSTRACT_TYPE (GESOverlayClip, ges_overlay_clip,
GES_TYPE_OPERATION_CLIP);
struct _GESTimelineOverlayPrivate
struct _GESOverlayClipPrivate
{
/* Dummy variable */
void *nothing;
};
static void
ges_timeline_overlay_class_init (GESTimelineOverlayClass * klass)
ges_overlay_clip_class_init (GESOverlayClipClass * klass)
{
g_type_class_add_private (klass, sizeof (GESTimelineOverlayPrivate));
g_type_class_add_private (klass, sizeof (GESOverlayClipPrivate));
}
static void
ges_timeline_overlay_init (GESTimelineOverlay * self)
ges_overlay_clip_init (GESOverlayClip * self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TIMELINE_OVERLAY, GESTimelineOverlayPrivate);
GES_TYPE_OVERLAY_CLIP, GESOverlayClipPrivate);
}

42
ges/ges-timeline-overlay.h → ges/ges-overlay-clip.h
View file

@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef _GES_TIMELINE_OVERLAY
#define _GES_TIMELINE_OVERLAY
#ifndef _GES_OVERLAY_CLIP
#define _GES_OVERLAY_CLIP
#include <glib-object.h>
#include <ges/ges-types.h>
@ -27,45 +27,45 @@
G_BEGIN_DECLS
#define GES_TYPE_TIMELINE_OVERLAY ges_timeline_overlay_get_type()
#define GES_TYPE_OVERLAY_CLIP ges_overlay_clip_get_type()
#define GES_TIMELINE_OVERLAY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_OVERLAY, GESTimelineOverlay))
#define GES_OVERLAY_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_OVERLAY_CLIP, GESOverlayClip))
#define GES_TIMELINE_OVERLAY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_OVERLAY, GESTimelineOverlayClass))
#define GES_OVERLAY_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_OVERLAY_CLIP, GESOverlayClipClass))
#define GES_IS_TIMELINE_OVERLAY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_OVERLAY))
#define GES_IS_OVERLAY_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_OVERLAY_CLIP))
#define GES_IS_TIMELINE_OVERLAY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_OVERLAY))
#define GES_IS_OVERLAY_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_OVERLAY_CLIP))
#define GES_TIMELINE_OVERLAY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_OVERLAY, GESTimelineOverlayClass))
#define GES_OVERLAY_CLIP_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_OVERLAY_CLIP, GESOverlayClipClass))
typedef struct _GESTimelineOverlayPrivate GESTimelineOverlayPrivate;
typedef struct _GESOverlayClipPrivate GESOverlayClipPrivate;
/**
* GESTimelineOverlay:
* GESOverlayClip:
*/
struct _GESTimelineOverlay {
struct _GESOverlayClip {
/*< private >*/
GESOperationClip parent;
GESTimelineOverlayPrivate *priv;
GESOverlayClipPrivate *priv;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
/**
* GESTimelineOverlayClass:
* GESOverlayClipClass:
* @parent_class: parent class
*/
struct _GESTimelineOverlayClass {
struct _GESOverlayClipClass {
GESOperationClipClass parent_class;
/*< private >*/
@ -73,9 +73,9 @@ struct _GESTimelineOverlayClass {
gpointer _ges_reserved[GES_PADDING];
};
GType ges_timeline_overlay_get_type (void);
GType ges_overlay_clip_get_type (void);
G_END_DECLS
#endif /* _GES_TIMELINE_OVERLAY */
#endif /* _GES_OVERLAY_CLIP */

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

@ -32,7 +32,7 @@
#include <string.h>
G_DEFINE_TYPE (GESTimelineTextOverlay, ges_timeline_text_overlay,
GES_TYPE_TIMELINE_OVERLAY);
GES_TYPE_OVERLAY_CLIP);
#define DEFAULT_PROP_TEXT ""
#define DEFAULT_PROP_FONT_DESC "Serif 36"

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

@ -23,7 +23,7 @@
#include <glib-object.h>
#include <ges/ges-types.h>
#include <ges/ges-timeline-overlay.h>
#include <ges/ges-overlay-clip.h>
#include <ges/ges-track.h>
G_BEGIN_DECLS
@ -47,7 +47,7 @@ typedef struct _GESTimelineTextOverlayPrivate GESTimelineTextOverlayPrivate;
struct _GESTimelineTextOverlay
{
GESTimelineOverlay parent;
GESOverlayClip parent;
/*< private > */
GESTimelineTextOverlayPrivate *priv;
@ -64,7 +64,7 @@ struct _GESTimelineTextOverlayClass
{
/*< private > */
GESTimelineOverlayClass parent_class;
GESOverlayClipClass parent_class;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];

4
ges/ges-types.h
View file

@ -74,8 +74,8 @@ typedef struct _GESTimelineTestSourceClass GESTimelineTestSourceClass;
typedef struct _GESTimelineTitleSource GESTimelineTitleSource;
typedef struct _GESTimelineTitleSourceClass GESTimelineTitleSourceClass;
typedef struct _GESTimelineOverlay GESTimelineOverlay;
typedef struct _GESTimelineOverlayClass GESTimelineOverlayClass;
typedef struct _GESOverlayClip GESOverlayClip;
typedef struct _GESOverlayClipClass GESOverlayClipClass;
typedef struct _GESTimelineTextOverlay GESTimelineTextOverlay;
typedef struct _GESTimelineTextOverlayClass GESTimelineTextOverlayClass;

2
ges/ges.c
View file

@ -75,7 +75,7 @@ ges_init (void)
GES_TYPE_URI_CLIP;
GES_TYPE_TIMELINE_TITLE_SOURCE;
GES_TYPE_STANDARD_TRANSITION_CLIP;
GES_TYPE_TIMELINE_OVERLAY;
GES_TYPE_OVERLAY_CLIP;
/* register formatter types with the system */
GES_TYPE_PITIVI_FORMATTER;

2
ges/ges.h
View file

@ -37,7 +37,7 @@
#include <ges/ges-timeline-title-source.h>
#include <ges/ges-operation-clip.h>
#include <ges/ges-effect-clip.h>
#include <ges/ges-timeline-overlay.h>
#include <ges/ges-overlay-clip.h>
#include <ges/ges-timeline-text-overlay.h>
#include <ges/ges-transition-clip.h>
#include <ges/ges-standard-transition-clip.h>

2
tests/check/ges/asset.c
View file

@ -106,7 +106,7 @@ GST_START_TEST (test_list_asset)
enum_class = g_type_class_peek (GES_VIDEO_STANDARD_TRANSITION_TYPE_TYPE);
fail_unless (ges_init ());
fail_if (ges_list_assets (GES_TYPE_TIMELINE_OVERLAY));
fail_if (ges_list_assets (GES_TYPE_OVERLAY_CLIP));
assets = ges_list_assets (GES_TYPE_STANDARD_TRANSITION_CLIP);
/* note: we do not have a a for value=0 "Transition not set" */