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

GESTrackVideoOverlay -> GESTrackTextOverlay

Browse source
This commit is contained in:
Brandon Lewis 2010-06-30 18:13:35 +02:00 committed by Edward Hervey
parent e134f1a5c9
commit 890bbb084e
8 changed files with 93 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -453,21 +453,21 @@ GES_IS_TRACK_TITLE_SOURCE_CLASS
</SECTION>
<SECTION>
<FILE>ges-track-video-overlay</FILE>
<FILE>ges-track-text-overlay</FILE>
<TITLE>GESTrackOverlay</TITLE>
GESTrackVideoOverlay
GESTrackVideoOverlayClass
ges_track_video_overlay_get_type
ges_track_video_overlay_new
ges_track_video_overlay_set_font_desc
ges_track_video_overlay_set_halignment
ges_track_video_overlay_set_text
ges_track_video_overlay_set_valignment
GESTrackTextOverlay
GESTrackTextOverlayClass
ges_track_text_overlay_get_type
ges_track_text_overlay_new
ges_track_text_overlay_set_font_desc
ges_track_text_overlay_set_halignment
ges_track_text_overlay_set_text
ges_track_text_overlay_set_valignment
<SUBSECTION Standard>
GES_IS_TRACK_VIDEO_OVERLAY
GES_IS_TRACK_VIDEO_OVERLAY_CLASS
GES_TRACK_VIDEO_OVERLAY
GES_TRACK_VIDEO_OVERLAY_CLASS
GES_TRACK_VIDEO_OVERLAY_GET_CLASS
GES_TYPE_TRACK_VIDEO_OVERLAY
GES_IS_TRACK_TEXT_OVERLAY
GES_IS_TRACK_TEXT_OVERLAY_CLASS
GES_TRACK_TEXT_OVERLAY
GES_TRACK_TEXT_OVERLAY_CLASS
GES_TRACK_TEXT_OVERLAY_GET_CLASS
GES_TYPE_TRACK_TEXT_OVERLAY
</SECTION>

4
ges/Makefile.am
View file

@ -32,7 +32,7 @@ libges_@GST_MAJORMINOR@_la_SOURCES = \
ges-track-video-background-source.c \
ges-track-audio-background-source.c \
ges-track-title-source.c \
ges-track-video-overlay.c \
ges-track-text-overlay.c \
ges-utils.c
libges_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/ges/
@ -63,7 +63,7 @@ libges_@GST_MAJORMINOR@include_HEADERS = \
ges-track-video-background-source.h \
ges-track-audio-background-source.h \
ges-track-title-source.h \
ges-track-video-overlay.h \
ges-track-text-overlay.h \
ges-utils.h
libges_@GST_MAJORMINOR@_la_CFLAGS = -I$(top_srcdir) $(GST_PROFILE_CFLAGS) $(GST_DISCOVERER_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)

14
ges/ges-timeline-overlay.c
View file

@ -31,7 +31,7 @@
#include "ges-timeline-source.h"
#include "ges-track-object.h"
#include "ges-track-title-source.h"
#include "ges-track-video-overlay.h"
#include "ges-track-text-overlay.h"
#include <string.h>
G_DEFINE_TYPE (GESTimelineOverlay, ges_tl_overlay, GES_TYPE_TIMELINE_OBJECT);
@ -284,7 +284,7 @@ ges_tl_overlay_set_text (GESTimelineOverlay * self, const gchar * text)
GESTrackObject *trackobject = (GESTrackObject *) tmp->data;
if (trackobject->track->type == GES_TRACK_TYPE_VIDEO)
ges_track_video_overlay_set_text (GES_TRACK_VIDEO_OVERLAY
ges_track_text_overlay_set_text (GES_TRACK_TEXT_OVERLAY
(trackobject), self->text);
}
}
@ -307,7 +307,7 @@ ges_tl_overlay_set_font_desc (GESTimelineOverlay * self, const gchar *
GESTrackObject *trackobject = (GESTrackObject *) tmp->data;
if (trackobject->track->type == GES_TRACK_TYPE_VIDEO)
ges_track_video_overlay_set_font_desc (GES_TRACK_VIDEO_OVERLAY
ges_track_text_overlay_set_font_desc (GES_TRACK_TEXT_OVERLAY
(trackobject), self->font_desc);
}
@ -329,7 +329,7 @@ ges_tl_overlay_set_halign (GESTimelineOverlay * self,
GESTrackObject *trackobject = (GESTrackObject *) tmp->data;
if (trackobject->track->type == GES_TRACK_TYPE_VIDEO)
ges_track_video_overlay_set_halignment (GES_TRACK_VIDEO_OVERLAY
ges_track_text_overlay_set_halignment (GES_TRACK_TEXT_OVERLAY
(trackobject), self->halign);
}
@ -350,7 +350,7 @@ ges_tl_overlay_set_valign (GESTimelineOverlay * self,
GESTrackObject *trackobject = (GESTrackObject *) tmp->data;
if (trackobject->track->type == GES_TRACK_TYPE_VIDEO)
ges_track_video_overlay_set_valignment (GES_TRACK_VIDEO_OVERLAY
ges_track_text_overlay_set_valignment (GES_TRACK_TEXT_OVERLAY
(trackobject), self->valign);
}
@ -385,9 +385,9 @@ ges_tl_overlay_create_track_object (GESTimelineObject * obj, GESTrack * track)
GST_DEBUG ("Creating a GESTrackOverlay");
if (track->type == GES_TRACK_TYPE_VIDEO) {
res = (GESTrackObject *) ges_track_video_overlay_new ();
res = (GESTrackObject *) ges_track_text_overlay_new ();
GST_DEBUG ("Setting text property");
ges_track_video_overlay_set_text ((GESTrackVideoOverlay *) res, tfs->text);
ges_track_text_overlay_set_text ((GESTrackTextOverlay *) res, tfs->text);
}
else {

77
ges/ges-track-video-overlay.c → ges/ges-track-text-overlay.c
View file

@ -26,9 +26,9 @@
#include "ges-internal.h"
#include "ges-track-object.h"
#include "ges-track-title-source.h"
#include "ges-track-video-overlay.h"
#include "ges-track-text-overlay.h"
G_DEFINE_TYPE (GESTrackVideoOverlay, ges_track_video_overlay,
G_DEFINE_TYPE (GESTrackTextOverlay, ges_track_text_overlay,
GES_TYPE_TRACK_OPERATION);
enum
@ -36,21 +36,21 @@ enum
PROP_0,
};
static void ges_track_video_overlay_dispose (GObject * object);
static void ges_track_text_overlay_dispose (GObject * object);
static void ges_track_video_overlay_finalize (GObject * object);
static void ges_track_text_overlay_finalize (GObject * object);
static void ges_track_video_overlay_get_property (GObject * object, guint
static void ges_track_text_overlay_get_property (GObject * object, guint
property_id, GValue * value, GParamSpec * pspec);
static void ges_track_video_overlay_set_property (GObject * object, guint
static void ges_track_text_overlay_set_property (GObject * object, guint
property_id, const GValue * value, GParamSpec * pspec);
static GstElement *ges_track_video_overlay_create_element (GESTrackOperation
static GstElement *ges_track_text_overlay_create_element (GESTrackOperation
* self);
static void
ges_track_video_overlay_class_init (GESTrackVideoOverlayClass * klass)
ges_track_text_overlay_class_init (GESTrackTextOverlayClass * klass)
{
GObjectClass *object_class;
GESTrackOperationClass *bg_class;
@ -58,16 +58,16 @@ ges_track_video_overlay_class_init (GESTrackVideoOverlayClass * klass)
object_class = G_OBJECT_CLASS (klass);
bg_class = GES_TRACK_OPERATION_CLASS (klass);
object_class->get_property = ges_track_video_overlay_get_property;
object_class->set_property = ges_track_video_overlay_set_property;
object_class->dispose = ges_track_video_overlay_dispose;
object_class->finalize = ges_track_video_overlay_finalize;
object_class->get_property = ges_track_text_overlay_get_property;
object_class->set_property = ges_track_text_overlay_set_property;
object_class->dispose = ges_track_text_overlay_dispose;
object_class->finalize = ges_track_text_overlay_finalize;
bg_class->create_element = ges_track_video_overlay_create_element;
bg_class->create_element = ges_track_text_overlay_create_element;
}
static void
ges_track_video_overlay_init (GESTrackVideoOverlay * self)
ges_track_text_overlay_init (GESTrackTextOverlay * self)
{
self->text = NULL;
self->font_desc = g_strdup (DEFAULT_FONT_DESC);
@ -77,9 +77,9 @@ ges_track_video_overlay_init (GESTrackVideoOverlay * self)
}
static void
ges_track_video_overlay_dispose (GObject * object)
ges_track_text_overlay_dispose (GObject * object)
{
GESTrackVideoOverlay *self = GES_TRACK_VIDEO_OVERLAY (object);
GESTrackTextOverlay *self = GES_TRACK_TEXT_OVERLAY (object);
if (self->text) {
g_free (self->text);
}
@ -93,17 +93,17 @@ ges_track_video_overlay_dispose (GObject * object)
self->text_el = NULL;
}
G_OBJECT_CLASS (ges_track_video_overlay_parent_class)->dispose (object);
G_OBJECT_CLASS (ges_track_text_overlay_parent_class)->dispose (object);
}
static void
ges_track_video_overlay_finalize (GObject * object)
ges_track_text_overlay_finalize (GObject * object)
{
G_OBJECT_CLASS (ges_track_video_overlay_parent_class)->finalize (object);
G_OBJECT_CLASS (ges_track_text_overlay_parent_class)->finalize (object);
}
static void
ges_track_video_overlay_get_property (GObject * object,
ges_track_text_overlay_get_property (GObject * object,
guint property_id, GValue * value, GParamSpec * pspec)
{
switch (property_id) {
@ -113,7 +113,7 @@ ges_track_video_overlay_get_property (GObject * object,
}
static void
ges_track_video_overlay_set_property (GObject * object,
ges_track_text_overlay_set_property (GObject * object,
guint property_id, const GValue * value, GParamSpec * pspec)
{
switch (property_id) {
@ -123,12 +123,12 @@ ges_track_video_overlay_set_property (GObject * object,
}
static GstElement *
ges_track_video_overlay_create_element (GESTrackOperation * object)
ges_track_text_overlay_create_element (GESTrackOperation * object)
{
GstElement *ret, *text;
GstPad *src_target, *sink_target;
GstPad *src, *sink;
GESTrackVideoOverlay *self = GES_TRACK_VIDEO_OVERLAY (object);
GESTrackTextOverlay *self = GES_TRACK_TEXT_OVERLAY (object);
text = gst_element_factory_make ("textoverlay", NULL);
self->text_el = text;
@ -160,8 +160,8 @@ ges_track_video_overlay_create_element (GESTrackOperation * object)
}
/**
* ges_track_video_overlay_set_text:
* @self: the #GESTrackVideoOverlay* to set text on
* ges_track_text_overlay_set_text:
* @self: the #GESTrackTextOverlay* to set text on
* @text: the text to render. an internal copy of this text will be
* made.
*
@ -170,8 +170,7 @@ ges_track_video_overlay_create_element (GESTrackOperation * object)
*/
void
ges_track_video_overlay_set_text (GESTrackVideoOverlay * self,
const gchar * text)
ges_track_text_overlay_set_text (GESTrackTextOverlay * self, const gchar * text)
{
if (self->text)
g_free (self->text);
@ -182,8 +181,8 @@ ges_track_video_overlay_set_text (GESTrackVideoOverlay * self,
}
/**
* ges_track_video_overlay_set_font_desc:
* @self: the #GESTrackVideoOverlay
* ges_track_text_overlay_set_font_desc:
* @self: the #GESTrackTextOverlay
* @font_desc: the pango font description
*
* Sets the text this track object will render.
@ -191,7 +190,7 @@ ges_track_video_overlay_set_text (GESTrackVideoOverlay * self,
*/
void
ges_track_video_overlay_set_font_desc (GESTrackVideoOverlay * self,
ges_track_text_overlay_set_font_desc (GESTrackTextOverlay * self,
const gchar * font_desc)
{
if (self->font_desc)
@ -204,14 +203,14 @@ ges_track_video_overlay_set_font_desc (GESTrackVideoOverlay * self,
}
/**
* ges_track_video_overlay_valignment:
* @self: the #GESTrackVideoOverlay* to set text on
* ges_track_text_overlay_valignment:
* @self: the #GESTrackTextOverlay* to set text on
* @valign: #GESTrackTitleSrcVAlign
*
* Sets the vertical aligment of the text.
*/
void
ges_track_video_overlay_set_valignment (GESTrackVideoOverlay * self,
ges_track_text_overlay_set_valignment (GESTrackTextOverlay * self,
GESTrackTitleSrcVAlign valign)
{
self->valign = valign;
@ -221,14 +220,14 @@ ges_track_video_overlay_set_valignment (GESTrackVideoOverlay * self,
}
/**
* ges_track_video_overlay_halignment:
* @self: the #GESTrackVideoOverlay* to set text on
* ges_track_text_overlay_halignment:
* @self: the #GESTrackTextOverlay* to set text on
* @halign: #GESTrackTitleSrcHAlign
*
* Sets the vertical aligment of the text.
*/
void
ges_track_video_overlay_set_halignment (GESTrackVideoOverlay * self,
ges_track_text_overlay_set_halignment (GESTrackTextOverlay * self,
GESTrackTitleSrcHAlign halign)
{
self->halign = halign;
@ -237,8 +236,8 @@ ges_track_video_overlay_set_halignment (GESTrackVideoOverlay * self,
g_object_set (self->text_el, "halignment", halign, NULL);
}
GESTrackVideoOverlay *
ges_track_video_overlay_new (void)
GESTrackTextOverlay *
ges_track_text_overlay_new (void)
{
return g_object_new (GES_TYPE_TRACK_VIDEO_OVERLAY, NULL);
return g_object_new (GES_TYPE_TRACK_TEXT_OVERLAY, NULL);
}

48
ges/ges-track-video-overlay.h → ges/ges-track-text-overlay.h
View file

@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef _GES_TRACK_VIDEO_OVERLAY
#define _GES_TRACK_VIDEO_OVERLAY
#ifndef _GES_TRACK_TEXT_OVERLAY
#define _GES_TRACK_TEXT_OVERLAY
#include <glib-object.h>
#include <ges/ges-types.h>
@ -28,29 +28,29 @@
G_BEGIN_DECLS
#define GES_TYPE_TRACK_VIDEO_OVERLAY ges_track_video_overlay_get_type()
#define GES_TYPE_TRACK_TEXT_OVERLAY ges_track_text_overlay_get_type()
#define GES_TRACK_VIDEO_OVERLAY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_VIDEO_OVERLAY, GESTrackVideoOverlay))
#define GES_TRACK_TEXT_OVERLAY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_TEXT_OVERLAY, GESTrackTextOverlay))
#define GES_TRACK_VIDEO_OVERLAY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_VIDEO_OVERLAY, GESTrackVideoOverlayClass))
#define GES_TRACK_TEXT_OVERLAY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_TEXT_OVERLAY, GESTrackTextOverlayClass))
#define GES_IS_TRACK_VIDEO_OVERLAY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_VIDEO_OVERLAY))
#define GES_IS_TRACK_TEXT_OVERLAY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_TEXT_OVERLAY))
#define GES_IS_TRACK_VIDEO_OVERLAY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_VIDEO_OVERLAY))
#define GES_IS_TRACK_TEXT_OVERLAY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_TEXT_OVERLAY))
#define GES_TRACK_VIDEO_OVERLAY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_VIDEO_OVERLAY, GESTrackVideoOverlayClass))
#define GES_TRACK_TEXT_OVERLAY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_TEXT_OVERLAY, GESTrackTextOverlayClass))
/**
* GESTrackVideoOverlay:
* GESTrackTextOverlay:
* @parent: parent
*
*/
struct _GESTrackVideoOverlay {
struct _GESTrackTextOverlay {
GESTrackOperation parent;
/*< private >*/
@ -62,33 +62,33 @@ struct _GESTrackVideoOverlay {
};
/**
* GESTrackVideoOverlayClass:
* GESTrackTextOverlayClass:
* @parent_class: parent class
*/
struct _GESTrackVideoOverlayClass {
struct _GESTrackTextOverlayClass {
GESTrackOperationClass parent_class;
/*< private >*/
};
GType ges_track_video_overlay_get_type (void);
GType ges_track_text_overlay_get_type (void);
void ges_track_video_overlay_set_text(GESTrackVideoOverlay *self, const
void ges_track_text_overlay_set_text(GESTrackTextOverlay *self, const
gchar *text);
void ges_track_video_overlay_set_font_desc(GESTrackVideoOverlay *self,
void ges_track_text_overlay_set_font_desc(GESTrackTextOverlay *self,
const gchar *font_desc);
void ges_track_video_overlay_set_halignment(GESTrackVideoOverlay
void ges_track_text_overlay_set_halignment(GESTrackTextOverlay
*self, GESTrackTitleSrcHAlign halgn);
void ges_track_video_overlay_set_valignment(GESTrackVideoOverlay
void ges_track_text_overlay_set_valignment(GESTrackTextOverlay
*self, GESTrackTitleSrcVAlign valign);
GESTrackVideoOverlay* ges_track_video_overlay_new (void);
GESTrackTextOverlay* ges_track_text_overlay_new (void);
G_END_DECLS
#endif /* _GES_TRACK_VIDEO_OVERLAY */
#endif /* _GES_TRACK_TEXT_OVERLAY */

6
ges/ges-types.h
View file

@ -95,9 +95,9 @@ typedef struct _GESTrackTitleSource GESTrackTitleSource;
typedef struct _GESTrackTitleSourceClass
GESTrackTitleSourceClass;
typedef struct _GESTrackVideoOverlay GESTrackVideoOverlay;
typedef struct _GESTrackVideoOverlayClass
GESTrackVideoOverlayClass;
typedef struct _GESTrackTextOverlay GESTrackTextOverlay;
typedef struct _GESTrackTextOverlayClass
GESTrackTextOverlayClass;
#endif /* __GES_TYPES_H__ */

2
ges/ges.h
View file

@ -46,7 +46,7 @@
#include <ges/ges-track-video-background-source.h>
#include <ges/ges-track-audio-background-source.h>
#include <ges/ges-track-title-source.h>
#include <ges/ges-track-video-overlay.h>
#include <ges/ges-track-text-overlay.h>
#include <ges/ges-utils.h>

6
tests/check/ges/overlays.c
View file

@ -150,7 +150,7 @@ GST_START_TEST (test_overlay_in_layer)
assert_equals_string ("sans 72", text);
g_free (text);
text = ((GESTrackVideoOverlay *) trobj)->font_desc;
text = ((GESTrackTextOverlay *) trobj)->font_desc;
assert_equals_string ("sans 72", text);
/* test halign and valign */
@ -161,8 +161,8 @@ GST_START_TEST (test_overlay_in_layer)
assert_equals_int (halign, GES_TRACK_TITLE_SRC_HALIGN_LEFT);
assert_equals_int (valign, GES_TRACK_TITLE_SRC_VALIGN_TOP);
halign = ((GESTrackVideoOverlay *) trobj)->halign;
valign = ((GESTrackVideoOverlay *) trobj)->valign;
halign = ((GESTrackTextOverlay *) trobj)->halign;
valign = ((GESTrackTextOverlay *) trobj)->valign;
assert_equals_int (halign, GES_TRACK_TITLE_SRC_HALIGN_LEFT);
assert_equals_int (valign, GES_TRACK_TITLE_SRC_VALIGN_TOP);