mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 17:22:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

GESTrackVideoOverlay inherits directly from GESTrackOperation

Browse source
This commit is contained in:
Brandon Lewis 2010-06-30 17:59:17 +02:00 committed by Edward Hervey
parent a4210a1ea4
commit fc23c1f040
4 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,7 +391,7 @@ ges_tl_overlay_create_track_object (GESTimelineObject * obj, GESTrack * track)
}
else {
res = GES_TRACK_OBJECT (ges_track_overlay_new ());
res = NULL;
}
return res;

10
ges/ges-track-video-overlay.c
View file

@ -29,7 +29,7 @@
#include "ges-track-video-overlay.h"
G_DEFINE_TYPE (GESTrackVideoOverlay, ges_track_video_overlay,
GES_TYPE_TRACK_OVERLAY);
GES_TYPE_TRACK_OPERATION);
enum
{
@ -46,17 +46,17 @@ static void ges_track_video_overlay_get_property (GObject * object, guint
static void ges_track_video_overlay_set_property (GObject * object, guint
property_id, const GValue * value, GParamSpec * pspec);
static GstElement *ges_track_video_overlay_create_element (GESTrackOverlay
static GstElement *ges_track_video_overlay_create_element (GESTrackOperation
* self);
static void
ges_track_video_overlay_class_init (GESTrackVideoOverlayClass * klass)
{
GObjectClass *object_class;
GESTrackOverlayClass *bg_class;
GESTrackOperationClass *bg_class;
object_class = G_OBJECT_CLASS (klass);
bg_class = GES_TRACK_OVERLAY_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;
@ -123,7 +123,7 @@ ges_track_video_overlay_set_property (GObject * object,
}
static GstElement *
ges_track_video_overlay_create_element (GESTrackOverlay * object)
ges_track_video_overlay_create_element (GESTrackOperation * object)
{
GstElement *ret, *text;
GstPad *src_target, *sink_target;

6
ges/ges-track-video-overlay.h
View file

@ -24,7 +24,7 @@
#include <glib-object.h>
#include <ges/ges-types.h>
#include <ges/ges-track-title-source.h>
#include <ges/ges-track-overlay.h>
#include <ges/ges-track-operation.h>
G_BEGIN_DECLS
@ -51,7 +51,7 @@ G_BEGIN_DECLS
*
*/
struct _GESTrackVideoOverlay {
GESTrackOverlay parent;
GESTrackOperation parent;
/*< private >*/
gchar *text;
@ -67,7 +67,7 @@ struct _GESTrackVideoOverlay {
*/
struct _GESTrackVideoOverlayClass {
GESTrackOverlayClass parent_class;
GESTrackOperationClass parent_class;
/*< private >*/
};

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

@ -35,17 +35,16 @@ GST_START_TEST (test_overlay_basic)
GST_END_TEST;
#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \
guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \
guint64 pstart, pdur, pmstart, pmdur, pprio; \
g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \
"media-start", &pmstart, "media-duration", &pmdur, \
"priority", &pprio, "active", &pact, \
"priority", &pprio, \
NULL); \
assert_equals_uint64 (pstart, start); \
assert_equals_uint64 (pdur, duration); \
assert_equals_uint64 (pmstart, mstart); \
assert_equals_uint64 (pmdur, mduration); \
assert_equals_int (pprio, priority); \
assert_equals_int (pact, active); \
}
@ -57,7 +56,7 @@ GST_START_TEST (test_overlay_properties)
ges_init ();
track = ges_track_new (GES_TRACK_TYPE_AUDIO, GST_CAPS_ANY);
track = ges_track_new (GES_TRACK_TYPE_VIDEO, GST_CAPS_ANY);
fail_unless (track != NULL);
object = (GESTimelineObject *)