mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:36:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename GESTimelineEffect to GESEffectClip

Browse source
This commit is contained in:
Thibault Saunier 2013-01-16 23:11:14 -03:00
parent 695c381bb1
commit 192d8a6f4d
14 changed files with 60 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -511,19 +511,19 @@ GES_TIMELINE_TRANSITION_GET_CLASS
</SECTION> </SECTION>
<SECTION> <SECTION>
<FILE>ges-timeline-effect</FILE> <FILE>ges-effect-clip</FILE>
<TITLE>GESTimelineEffect</TITLE> <TITLE>GESEffectClip</TITLE>
GESTimelineEffect GESEffectClip
<SUBSECTION Standard> <SUBSECTION Standard>
GESTimelineEffectClass GESEffectClipClass
GESTimelineEffectPrivate GESEffectClipPrivate
GES_TIMELINE_EFFECT GES_EFFECT_CLIP
GES_IS_TIMELINE_EFFECT GES_IS_EFFECT_CLIP
GES_TYPE_TIMELINE_EFFECT GES_TYPE_EFFECT_CLIP
ges_timeline_effect_get_type ges_effect_clip_get_type
GES_TIMELINE_EFFECT_CLASS GES_EFFECT_CLIP_CLASS
GES_IS_TIMELINE_EFFECT_CLASS GES_IS_EFFECT_CLIP_CLASS
GES_TIMELINE_EFFECT_GET_CLASS GES_EFFECT_CLIP_GET_CLASS
</SECTION> </SECTION>
<SECTION> <SECTION>

2
docs/libs/ges.types
View file

@ -16,7 +16,7 @@ ges_timeline_source_get_type
ges_timeline_test_source_get_type ges_timeline_test_source_get_type
ges_timeline_transition_get_type ges_timeline_transition_get_type
ges_timeline_standard_transition_get_type ges_timeline_standard_transition_get_type
ges_timeline_effect_get_type ges_effect_clip_get_type
ges_timeline_parse_launch_effect_get_type ges_timeline_parse_launch_effect_get_type
ges_uri_clip_get_type ges_uri_clip_get_type
ges_timeline_text_overlay_get_type ges_timeline_text_overlay_get_type

4
ges/Makefile.am
View file

@ -19,7 +19,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-clip.c \ ges-clip.c \
ges-timeline-pipeline.c \ ges-timeline-pipeline.c \
ges-timeline-source.c \ ges-timeline-source.c \
ges-timeline-effect.c \ ges-effect-clip.c \
ges-timeline-parse-launch-effect.c \ ges-timeline-parse-launch-effect.c \
ges-uri-clip.c \ ges-uri-clip.c \
ges-timeline-operation.c \ ges-timeline-operation.c \
@ -74,7 +74,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-timeline-pipeline.h \ ges-timeline-pipeline.h \
ges-timeline-source.h \ ges-timeline-source.h \
ges-uri-clip.h \ ges-uri-clip.h \
ges-timeline-effect.h \ ges-effect-clip.h \
ges-timeline-parse-launch-effect.h \ ges-timeline-parse-launch-effect.h \
ges-timeline-operation.h \ ges-timeline-operation.h \
ges-timeline-transition.h \ ges-timeline-transition.h \

14
ges/ges-timeline-effect.c → ges/ges-effect-clip.c
View file

@ -18,7 +18,7 @@
*/ */
/** /**
* SECTION: ges-timeline-effect * SECTION: ges-effect-clip
* @short_description: An effect in a GESTimelineLayer * @short_description: An effect in a GESTimelineLayer
* *
* The effect will be applied on the sources that have lower priorities * The effect will be applied on the sources that have lower priorities
@ -33,26 +33,26 @@
#include "ges-internal.h" #include "ges-internal.h"
#include "ges-types.h" #include "ges-types.h"
G_DEFINE_ABSTRACT_TYPE (GESTimelineEffect, ges_timeline_effect, G_DEFINE_ABSTRACT_TYPE (GESEffectClip, ges_effect_clip,
GES_TYPE_TIMELINE_OPERATION); GES_TYPE_TIMELINE_OPERATION);
struct _GESTimelineEffectPrivate struct _GESEffectClipPrivate
{ {
void *nothing; void *nothing;
}; };
static void static void
ges_timeline_effect_class_init (GESTimelineEffectClass * klass) ges_effect_clip_class_init (GESEffectClipClass * klass)
{ {
g_type_class_add_private (klass, sizeof (GESTimelineEffectPrivate)); g_type_class_add_private (klass, sizeof (GESEffectClipPrivate));
} }
static void static void
ges_timeline_effect_init (GESTimelineEffect * self) ges_effect_clip_init (GESEffectClip * self)
{ {
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TIMELINE_EFFECT, GESTimelineEffectPrivate); GES_TYPE_EFFECT_CLIP, GESEffectClipPrivate);
} }

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

@ -17,52 +17,52 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _GES_TIMELINE_EFFECT #ifndef _GES_EFFECT_CLIP
#define _GES_TIMELINE_EFFECT #define _GES_EFFECT_CLIP
#include <glib-object.h> #include <glib-object.h>
#include <ges/ges-types.h> #include <ges/ges-types.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GES_TYPE_TIMELINE_EFFECT ges_timeline_effect_get_type() #define GES_TYPE_EFFECT_CLIP ges_effect_clip_get_type()
#define GES_TIMELINE_EFFECT(obj) \ #define GES_EFFECT_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_EFFECT, GESTimelineEffect)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_EFFECT_CLIP, GESEffectClip))
#define GES_TIMELINE_EFFECT_CLASS(klass) \ #define GES_EFFECT_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_EFFECT, GESTimelineEffectClass)) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_EFFECT_CLIP, GESEffectClipClass))
#define GES_IS_TIMELINE_EFFECT(obj) \ #define GES_IS_EFFECT_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_EFFECT)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_EFFECT_CLIP))
#define GES_IS_TIMELINE_EFFECT_CLASS(klass) \ #define GES_IS_EFFECT_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_EFFECT)) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_EFFECT_CLIP))
#define GES_TIMELINE_EFFECT_GET_CLASS(obj) \ #define GES_EFFECT_CLIP_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_EFFECT, GESTimelineEffectClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_EFFECT_CLIP, GESEffectClipClass))
typedef struct _GESTimelineEffectPrivate GESTimelineEffectPrivate; typedef struct _GESEffectClipPrivate GESEffectClipPrivate;
/** /**
* GESTimelineEffect: * GESEffectClip:
*/ */
struct _GESTimelineEffect { struct _GESEffectClip {
/*< private >*/ /*< private >*/
GESTimelineOperation parent; GESTimelineOperation parent;
GESTimelineEffectPrivate *priv; GESEffectClipPrivate *priv;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
/** /**
* GESTimelineEffectClass: * GESEffectClipClass:
* *
*/ */
struct _GESTimelineEffectClass { struct _GESEffectClipClass {
/*< private >*/ /*< private >*/
GESTimelineOperationClass parent_class; GESTimelineOperationClass parent_class;
@ -70,7 +70,7 @@ struct _GESTimelineEffectClass {
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
GType ges_timeline_effect_get_type (void); GType ges_effect_clip_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* _GES_TIMELINE_EFFECT */ #endif /* _GES_EFFECT_CLIP */

3
ges/ges-meta-container.c
View file

@ -14,8 +14,7 @@ static GQuark ges_meta_key;
G_DEFINE_INTERFACE_WITH_CODE (GESMetaContainer, ges_meta_container, G_DEFINE_INTERFACE_WITH_CODE (GESMetaContainer, ges_meta_container,
G_TYPE_OBJECT, ges_meta_key = G_TYPE_OBJECT, ges_meta_key =
g_quark_from_static_string ("ges-meta-container-data"); g_quark_from_static_string ("ges-meta-container-data"););
);
enum enum
{ {

2
ges/ges-timeline-parse-launch-effect.c
View file

@ -37,7 +37,7 @@
#include "ges-types.h" #include "ges-types.h"
G_DEFINE_TYPE (GESTimelineParseLaunchEffect, ges_timeline_parse_launch_effect, G_DEFINE_TYPE (GESTimelineParseLaunchEffect, ges_timeline_parse_launch_effect,
GES_TYPE_TIMELINE_EFFECT); GES_TYPE_EFFECT_CLIP);
struct _GESTimelineParseLaunchEffectPrivate struct _GESTimelineParseLaunchEffectPrivate
{ {

4
ges/ges-timeline-parse-launch-effect.h
View file

@ -49,7 +49,7 @@ typedef struct _GESTimelineParseLaunchEffectPrivate GESTimelineParseLaunchEffect
*/ */
struct _GESTimelineParseLaunchEffect { struct _GESTimelineParseLaunchEffect {
/*< private >*/ /*< private >*/
GESTimelineEffect parent; GESEffectClip parent;
GESTimelineParseLaunchEffectPrivate *priv; GESTimelineParseLaunchEffectPrivate *priv;
@ -64,7 +64,7 @@ struct _GESTimelineParseLaunchEffect {
struct _GESTimelineParseLaunchEffectClass { struct _GESTimelineParseLaunchEffectClass {
/*< private >*/ /*< private >*/
GESTimelineEffectClass parent_class; GESEffectClipClass parent_class;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];

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

@ -374,8 +374,8 @@ ges_timeline_pipeline_change_state (GstElement * element,
ret = GST_STATE_CHANGE_FAILURE; ret = GST_STATE_CHANGE_FAILURE;
goto done; goto done;
} }
if (self->priv-> if (self->
mode & (TIMELINE_MODE_RENDER | TIMELINE_MODE_SMART_RENDER)) priv->mode & (TIMELINE_MODE_RENDER | TIMELINE_MODE_SMART_RENDER))
GST_DEBUG ("rendering => Updating pipeline caps"); GST_DEBUG ("rendering => Updating pipeline caps");
if (!ges_timeline_pipeline_update_caps (self)) { if (!ges_timeline_pipeline_update_caps (self)) {
GST_ERROR_OBJECT (element, "Error setting the caps for rendering"); GST_ERROR_OBJECT (element, "Error setting the caps for rendering");

4
ges/ges-types.h
View file

@ -56,8 +56,8 @@ typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass;
typedef struct _GESTimelineSource GESTimelineSource; typedef struct _GESTimelineSource GESTimelineSource;
typedef struct _GESTimelineSourceClass GESTimelineSourceClass; typedef struct _GESTimelineSourceClass GESTimelineSourceClass;
typedef struct _GESTimelineEffect GESTimelineEffect; typedef struct _GESEffectClip GESEffectClip;
typedef struct _GESTimelineEffectClass GESTimelineEffectClass; typedef struct _GESEffectClipClass GESEffectClipClass;
typedef struct _GESUriClip GESUriClip; typedef struct _GESUriClip GESUriClip;
typedef struct _GESUriClipClass GESUriClipClass; typedef struct _GESUriClipClass GESUriClipClass;

4
ges/ges.h
View file

@ -36,14 +36,14 @@
#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-timeline-operation.h>
#include <ges/ges-timeline-effect.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>
#include <ges/ges-timeline-transition.h> #include <ges/ges-timeline-transition.h>
#include <ges/ges-timeline-standard-transition.h> #include <ges/ges-timeline-standard-transition.h>
#include <ges/ges-timeline-parse-launch-effect.h> #include <ges/ges-timeline-parse-launch-effect.h>
#include <ges/ges-custom-timeline-source.h> #include <ges/ges-custom-timeline-source.h>
#include <ges/ges-timeline-effect.h> #include <ges/ges-effect-clip.h>
#include <ges/ges-uri-clip.h> #include <ges/ges-uri-clip.h>
#include <ges/ges-screenshot.h> #include <ges/ges-screenshot.h>
#include <ges/ges-asset.h> #include <ges/ges-asset.h>

4
tests/check/ges/effects.c
View file

@ -220,8 +220,8 @@ GST_START_TEST (test_effect_clip)
GES_TRACK_EFFECT (tmp->data)); GES_TRACK_EFFECT (tmp->data));
fail_unless (priority > effect_prio); fail_unless (priority > effect_prio);
fail_unless (GES_IS_TRACK_EFFECT (tmp->data)); fail_unless (GES_IS_TRACK_EFFECT (tmp->data));
fail_unless (ges_track_object_get_track (GES_TRACK_OBJECT (tmp->data))-> fail_unless (ges_track_object_get_track (GES_TRACK_OBJECT (tmp->
type == track_type[i]); data))->type == track_type[i]);
effect_prio = priority; effect_prio = priority;
g_object_unref (tmp->data); g_object_unref (tmp->data);

8
tests/check/ges/project.c
View file

@ -206,10 +206,10 @@ _test_project (GESProject * project, GESTimeline * timeline)
assert_equals_string (ges_meta_container_get_string (GES_META_CONTAINER assert_equals_string (ges_meta_container_get_string (GES_META_CONTAINER
(project), "name"), "Example project"); (project), "name"), "Example project");
clips = clips =
ges_timeline_layer_get_objects (GES_TIMELINE_LAYER (timeline-> ges_timeline_layer_get_objects (GES_TIMELINE_LAYER (timeline->layers->
layers->data)); data));
fail_unless (ges_meta_container_get_uint (GES_META_CONTAINER fail_unless (ges_meta_container_get_uint (GES_META_CONTAINER (timeline->
(timeline->layers->data), "a", &a_meta)); layers->data), "a", &a_meta));
assert_equals_int (a_meta, 3); assert_equals_int (a_meta, 3);
assert_equals_int (g_list_length (clips), 1); assert_equals_int (g_list_length (clips), 1);
media_uri = ges_test_file_uri ("audio_video.ogg"); media_uri = ges_test_file_uri ("audio_video.ogg");