mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 02:01:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename GESTimelineParseLaunchEffect to GESStandardEffectClip

Browse source
This commit is contained in:
Thibault Saunier 2013-01-17 00:04:41 -03:00
parent d7693b4014
commit dbc83d5d86
10 changed files with 136 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ platform as well as Windows. It is released under the GNU Library General Public
<xi:include href="xml/ges-timeline-test-source.xml"/>
<xi:include href="xml/ges-timeline-text-overlay.xml"/>
<xi:include href="xml/ges-standard-transition-clip.xml"/>
<xi:include href="xml/ges-timeline-parse-launch-effect.xml"/>
<xi:include href="xml/ges-standard-effect-clip.xml"/>
</chapter>
<chapter>

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

@ -527,21 +527,21 @@ GES_EFFECT_CLIP_GET_CLASS
</SECTION>
<SECTION>
<FILE>ges-timeline-parse-launch-effect</FILE>
<TITLE>GESTimelineParseLaunchEffect</TITLE>
GESTimelineParseLaunchEffect
ges_timeline_parse_launch_effect_new
<FILE>ges-standard-effect-clip</FILE>
<TITLE>GESStandardEffectClip</TITLE>
GESStandardEffectClip
ges_standard_effect_clip_new
<SUBSECTION Standard>
GESTimelineParseLaunchEffectClass
GESTimelineParseLaunchEffectPrivate
GES_TIMELINE_PARSE_LAUNCH_EFFECT_CLASS
GES_TIMELINE_PARSE_LAUNCH_EFFECT
GES_IS_TIMELINE_PARSE_LAUNCH_EFFECT
GES_TYPE_TIMELINE_PARSE_LAUNCH_EFFECT
ges_timeline_parse_launch_effect_get_type
GES_TIMELINE_PARSE_LAUNCH_EFFECT_CLASS_
GES_IS_TIMELINE_PARSE_LAUNCH_EFFECT_CLASS
GES_TIMELINE_PARSE_LAUNCH_EFFECT_GET_CLASS
GESStandardEffectClipClass
GESStandardEffectClipPrivate
GES_STANDARD_EFFECT_CLIP_CLASS
GES_STANDARD_EFFECT_CLIP
GES_IS_STANDARD_EFFECT_CLIP
GES_TYPE_STANDARD_EFFECT_CLIP
ges_standard_effect_clip_get_type
GES_STANDARD_EFFECT_CLIP_CLASS_
GES_IS_STANDARD_EFFECT_CLIP_CLASS
GES_STANDARD_EFFECT_CLIP_GET_CLASS
</SECTION>
<SECTION>

2
docs/libs/ges.types
View file

@ -17,7 +17,7 @@ ges_timeline_test_source_get_type
ges_transition_clip_get_type
ges_standard_transition_clip_get_type
ges_effect_clip_get_type
ges_timeline_parse_launch_effect_get_type
ges_standard_effect_clip_get_type
ges_uri_clip_get_type
ges_timeline_text_overlay_get_type
ges_timeline_title_source_get_type

4
ges/Makefile.am
View file

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

62
ges/ges-timeline-parse-launch-effect.c → ges/ges-standard-effect-clip.c
View file

@ -18,7 +18,7 @@
*/
/**
* SECTION: ges-timeline-parse-launch-effect
* SECTION: ges-standard-effect-clip
* @short_description: An effect created by parse-launch style bin descriptions
* in a #GESTimelineLayer
*
@ -36,10 +36,10 @@
#include "ges-internal.h"
#include "ges-types.h"
G_DEFINE_TYPE (GESTimelineParseLaunchEffect, ges_timeline_parse_launch_effect,
G_DEFINE_TYPE (GESStandardEffectClip, ges_standard_effect_clip,
GES_TYPE_EFFECT_CLIP);
struct _GESTimelineParseLaunchEffectPrivate
struct _GESStandardEffectClipPrivate
{
gchar *video_bin_description;
gchar *audio_bin_description;
@ -52,30 +52,27 @@ enum
PROP_AUDIO_BIN_DESCRIPTION,
};
static void ges_timeline_parse_launch_effect_finalize (GObject * object);
static void ges_standard_effect_clip_finalize (GObject * object);
static GESTrackObject
* ges_tl_parse_launch_effect_create_track_obj (GESClip * self,
GESTrackType type);
static void
ges_timeline_parse_launch_effect_finalize (GObject * object)
ges_standard_effect_clip_finalize (GObject * object)
{
GESTimelineParseLaunchEffectPrivate *priv =
GES_TIMELINE_PARSE_LAUNCH_EFFECT (object)->priv;
GESStandardEffectClipPrivate *priv = GES_STANDARD_EFFECT_CLIP (object)->priv;
g_free (priv->audio_bin_description);
g_free (priv->video_bin_description);
G_OBJECT_CLASS (ges_timeline_parse_launch_effect_parent_class)->finalize
(object);
G_OBJECT_CLASS (ges_standard_effect_clip_parent_class)->finalize (object);
}
static void
ges_timeline_parse_launch_effect_get_property (GObject * object,
ges_standard_effect_clip_get_property (GObject * object,
guint property_id, GValue * value, GParamSpec * pspec)
{
GESTimelineParseLaunchEffectPrivate *priv =
GES_TIMELINE_PARSE_LAUNCH_EFFECT (object)->priv;
GESStandardEffectClipPrivate *priv = GES_STANDARD_EFFECT_CLIP (object)->priv;
switch (property_id) {
case PROP_VIDEO_BIN_DESCRIPTION:
@ -90,11 +87,10 @@ ges_timeline_parse_launch_effect_get_property (GObject * object,
}
static void
ges_timeline_parse_launch_effect_set_property (GObject * object,
ges_standard_effect_clip_set_property (GObject * object,
guint property_id, const GValue * value, GParamSpec * pspec)
{
GESTimelineParseLaunchEffect *self =
GES_TIMELINE_PARSE_LAUNCH_EFFECT (object);
GESStandardEffectClip *self = GES_STANDARD_EFFECT_CLIP (object);
switch (property_id) {
case PROP_VIDEO_BIN_DESCRIPTION:
@ -109,21 +105,19 @@ ges_timeline_parse_launch_effect_set_property (GObject * object,
}
static void
ges_timeline_parse_launch_effect_class_init (GESTimelineParseLaunchEffectClass *
klass)
ges_standard_effect_clip_class_init (GESStandardEffectClipClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GESClipClass *timobj_class = GES_CLIP_CLASS (klass);
g_type_class_add_private (klass,
sizeof (GESTimelineParseLaunchEffectPrivate));
g_type_class_add_private (klass, sizeof (GESStandardEffectClipPrivate));
object_class->get_property = ges_timeline_parse_launch_effect_get_property;
object_class->set_property = ges_timeline_parse_launch_effect_set_property;
object_class->finalize = ges_timeline_parse_launch_effect_finalize;
object_class->get_property = ges_standard_effect_clip_get_property;
object_class->set_property = ges_standard_effect_clip_set_property;
object_class->finalize = ges_standard_effect_clip_finalize;
/**
* GESTimelineParseLaunchEffect:video-bin-description:
* GESStandardEffectClip:video-bin-description:
*
* The description of the video track of the effect bin with a gst-launch-style
* pipeline description. This should be used for test purposes.
@ -137,7 +131,7 @@ ges_timeline_parse_launch_effect_class_init (GESTimelineParseLaunchEffectClass *
NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
* GESTimelineParseLaunchEffect:audio-bin-description:
* GESStandardEffectClip:audio-bin-description:
*
* The description of the audio track of the effect bin with a gst-launch-style
* pipeline description. This should be used for test purposes.
@ -156,11 +150,10 @@ ges_timeline_parse_launch_effect_class_init (GESTimelineParseLaunchEffectClass *
}
static void
ges_timeline_parse_launch_effect_init (GESTimelineParseLaunchEffect * self)
ges_standard_effect_clip_init (GESStandardEffectClip * self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TIMELINE_PARSE_LAUNCH_EFFECT,
GESTimelineParseLaunchEffectPrivate);
GES_TYPE_STANDARD_EFFECT_CLIP, GESStandardEffectClipPrivate);
}
@ -168,8 +161,7 @@ static GESTrackObject *
ges_tl_parse_launch_effect_create_track_obj (GESClip * self, GESTrackType type)
{
const gchar *bin_description = NULL;
GESTimelineParseLaunchEffect *effect =
GES_TIMELINE_PARSE_LAUNCH_EFFECT (self);
GESStandardEffectClip *effect = GES_STANDARD_EFFECT_CLIP (self);
if (type == GES_TRACK_TYPE_VIDEO) {
bin_description = effect->priv->video_bin_description;
@ -188,22 +180,22 @@ ges_tl_parse_launch_effect_create_track_obj (GESClip * self, GESTrackType type)
}
/**
* ges_timeline_parse_launch_effect_new:
* ges_standard_effect_clip_new:
* @video_bin_description: The gst-launch like bin description of the effect
* @audio_bin_description: The gst-launch like bin description of the effect
*
* Creates a new #GESTimelineParseLaunchEffect from the description of the bin.
* Creates a new #GESStandardEffectClip from the description of the bin.
*
* Returns: a newly created #GESTimelineParseLaunchEffect, or
* Returns: a newly created #GESStandardEffectClip, or
* %NULL if something went wrong.
*
* Since: 0.10.2
*/
GESTimelineParseLaunchEffect *
ges_timeline_parse_launch_effect_new (const gchar * video_bin_description,
GESStandardEffectClip *
ges_standard_effect_clip_new (const gchar * video_bin_description,
const gchar * audio_bin_description)
{
return g_object_new (GES_TYPE_TIMELINE_PARSE_LAUNCH_EFFECT,
return g_object_new (GES_TYPE_STANDARD_EFFECT_CLIP,
"video-bin-description", video_bin_description,
"audio-bin-description", audio_bin_description, NULL);
}

80
ges/ges-standard-effect-clip.h Normal file
View file

@ -0,0 +1,80 @@
/* GStreamer Editing Services
* Copyright (C) 2011 Thibault Saunier <thibault.saunier@collabora.co.uk>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef _GES_STANDARD_EFFECT_CLIP
#define _GES_STANDARD_EFFECT_CLIP
#include <glib-object.h>
#include <ges/ges-types.h>
G_BEGIN_DECLS
#define GES_TYPE_STANDARD_EFFECT_CLIP ges_standard_effect_clip_get_type()
#define GES_STANDARD_EFFECT_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_STANDARD_EFFECT_CLIP, GESStandardEffectClip))
#define GES_STANDARD_EFFECT_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_STANDARD_EFFECT_CLIP, GESStandardEffectClipClass))
#define GES_IS_STANDARD_EFFECT_CLIP(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_STANDARD_EFFECT_CLIP))
#define GES_IS_STANDARD_EFFECT_CLIP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_STANDARD_EFFECT_CLIP))
#define GES_STANDARD_EFFECT_CLIP_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_STANDARD_EFFECT_CLIP, GESStandardEffectClipClass))
typedef struct _GESStandardEffectClipPrivate GESStandardEffectClipPrivate;
/**
* GESStandardEffectClip:
*/
struct _GESStandardEffectClip {
/*< private >*/
GESEffectClip parent;
GESStandardEffectClipPrivate *priv;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
/**
* GESStandardEffectClipClass:
*
*/
struct _GESStandardEffectClipClass {
/*< private >*/
GESEffectClipClass parent_class;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
GType ges_standard_effect_clip_get_type (void);
GESStandardEffectClip *
ges_standard_effect_clip_new (const gchar * video_bin_description,
const gchar * audio_bin_description);
G_END_DECLS
#endif /* _GES_STANDARD_EFFECT_CLIP */

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

@ -1,80 +0,0 @@
/* GStreamer Editing Services
* Copyright (C) 2011 Thibault Saunier <thibault.saunier@collabora.co.uk>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef _GES_TIMELINE_PARSE_LAUNCH_EFFECT
#define _GES_TIMELINE_PARSE_LAUNCH_EFFECT
#include <glib-object.h>
#include <ges/ges-types.h>
G_BEGIN_DECLS
#define GES_TYPE_TIMELINE_PARSE_LAUNCH_EFFECT ges_timeline_parse_launch_effect_get_type()
#define GES_TIMELINE_PARSE_LAUNCH_EFFECT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_PARSE_LAUNCH_EFFECT, GESTimelineParseLaunchEffect))
#define GES_TIMELINE_PARSE_LAUNCH_EFFECT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_PARSE_LAUNCH_EFFECT, GESTimelineParseLaunchEffectClass))
#define GES_IS_TIMELINE_PARSE_LAUNCH_EFFECT(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_PARSE_LAUNCH_EFFECT))
#define GES_IS_TIMELINE_PARSE_LAUNCH_EFFECT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_PARSE_LAUNCH_EFFECT))
#define GES_TIMELINE_PARSE_LAUNCH_EFFECT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_PARSE_LAUNCH_EFFECT, GESTimelineParseLaunchEffectClass))
typedef struct _GESTimelineParseLaunchEffectPrivate GESTimelineParseLaunchEffectPrivate;
/**
* GESTimelineParseLaunchEffect:
*/
struct _GESTimelineParseLaunchEffect {
/*< private >*/
GESEffectClip parent;
GESTimelineParseLaunchEffectPrivate *priv;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
/**
* GESTimelineParseLaunchEffectClass:
*
*/
struct _GESTimelineParseLaunchEffectClass {
/*< private >*/
GESEffectClipClass parent_class;
/* Padding for API extension */
gpointer _ges_reserved[GES_PADDING];
};
GType ges_timeline_parse_launch_effect_get_type (void);
GESTimelineParseLaunchEffect *
ges_timeline_parse_launch_effect_new (const gchar * video_bin_description,
const gchar * audio_bin_description);
G_END_DECLS
#endif /* _GES_TIMELINE_PARSE_LAUNCH_EFFECT */

4
ges/ges-types.h
View file

@ -80,8 +80,8 @@ typedef struct _GESTimelineOverlayClass GESTimelineOverlayClass;
typedef struct _GESTimelineTextOverlay GESTimelineTextOverlay;
typedef struct _GESTimelineTextOverlayClass GESTimelineTextOverlayClass;
typedef struct _GESTimelineParseLaunchEffect GESTimelineParseLaunchEffect;
typedef struct _GESTimelineParseLaunchEffectClass GESTimelineParseLaunchEffectClass;
typedef struct _GESStandardEffectClip GESStandardEffectClip;
typedef struct _GESStandardEffectClipClass GESStandardEffectClipClass;
typedef struct _GESTrack GESTrack;
typedef struct _GESTrackClass GESTrackClass;

2
ges/ges.h
View file

@ -41,7 +41,7 @@
#include <ges/ges-timeline-text-overlay.h>
#include <ges/ges-transition-clip.h>
#include <ges/ges-standard-transition-clip.h>
#include <ges/ges-timeline-parse-launch-effect.h>
#include <ges/ges-standard-effect-clip.h>
#include <ges/ges-custom-timeline-source.h>
#include <ges/ges-effect-clip.h>
#include <ges/ges-uri-clip.h>

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

@ -166,7 +166,7 @@ GST_START_TEST (test_effect_clip)
GESTimeline *timeline;
GESTimelineLayer *layer;
GESTrack *track_audio, *track_video;
GESTimelineParseLaunchEffect *effect_clip;
GESStandardEffectClip *effect_clip;
GESTrackParseLaunchEffect *tck_effect, *tck_effect1;
GList *effects, *tmp;
gint i, clip_height;
@ -189,7 +189,7 @@ GST_START_TEST (test_effect_clip)
ges_timeline_add_layer (timeline, layer);
GST_DEBUG ("Create effect");
effect_clip = ges_timeline_parse_launch_effect_new ("identity", "identity");
effect_clip = ges_standard_effect_clip_new ("identity", "identity");
g_object_set (effect_clip, "duration", 25 * GST_SECOND, NULL);
@ -240,7 +240,7 @@ GST_START_TEST (test_priorities_clip)
GESTimeline *timeline;
GESTimelineLayer *layer;
GESTrack *track_audio, *track_video;
GESTimelineParseLaunchEffect *effect_clip;
GESStandardEffectClip *effect_clip;
GESTrackParseLaunchEffect *tck_effect, *tck_effect1;
GList *effects, *tmp;
gint i, clip_height;
@ -258,7 +258,7 @@ GST_START_TEST (test_priorities_clip)
ges_timeline_add_layer (timeline, layer);
GST_DEBUG ("Create effect");
effect_clip = ges_timeline_parse_launch_effect_new ("identity", "identity");
effect_clip = ges_standard_effect_clip_new ("identity", "identity");
g_object_set (effect_clip, "duration", 25 * GST_SECOND, NULL);
@ -316,7 +316,7 @@ GST_START_TEST (test_track_effect_set_properties)
GESTimeline *timeline;
GESTimelineLayer *layer;
GESTrack *track_video;
GESTimelineParseLaunchEffect *effect_clip;
GESStandardEffectClip *effect_clip;
GESTrackObject *tck_effect;
guint scratch_line, n_props, i;
gboolean color_aging;
@ -334,7 +334,7 @@ GST_START_TEST (test_track_effect_set_properties)
ges_timeline_add_layer (timeline, layer);
GST_DEBUG ("Create effect");
effect_clip = ges_timeline_parse_launch_effect_new ("agingtv", NULL);
effect_clip = ges_standard_effect_clip_new ("agingtv", NULL);
g_object_set (effect_clip, "duration", 25 * GST_SECOND, NULL);
@ -404,7 +404,7 @@ GST_START_TEST (test_clip_signals)
GESTimeline *timeline;
GESTimelineLayer *layer;
GESTrack *track_video;
GESTimelineParseLaunchEffect *effect_clip;
GESStandardEffectClip *effect_clip;
GESTrackParseLaunchEffect *tck_effect;
GValue val = { 0, };
@ -418,7 +418,7 @@ GST_START_TEST (test_clip_signals)
ges_timeline_add_layer (timeline, layer);
GST_DEBUG ("Create effect");
effect_clip = ges_timeline_parse_launch_effect_new ("agingtv", NULL);
effect_clip = ges_standard_effect_clip_new ("agingtv", NULL);
g_signal_connect (effect_clip, "effect-added", (GCallback) effect_added_cb,
effect_clip);