}
else {
- res = GES_TRACK_OBJECT (ges_track_overlay_new ());
+ res = NULL;
}
return res;
#include "ges-track-video-overlay.h"
G_DEFINE_TYPE (GESTrackVideoOverlay, ges_track_video_overlay,
- GES_TYPE_TRACK_OVERLAY);
+ GES_TYPE_TRACK_OPERATION);
enum
{
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;
}
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;
#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
*
*/
struct _GESTrackVideoOverlay {
- GESTrackOverlay parent;
+ GESTrackOperation parent;
/*< private >*/
gchar *text;
*/
struct _GESTrackVideoOverlayClass {
- GESTrackOverlayClass parent_class;
+ GESTrackOperationClass parent_class;
/*< private >*/
};
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); \
}
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 *)