From 218bd568661dd0dc71a27044429aaa742a7b8e4c Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 8 Dec 2010 16:09:35 +0100 Subject: [PATCH] ges: Remove creators for base classes --- docs/libs/ges-sections.txt | 2 -- ges/ges-custom-timeline-source.c | 9 +++++++++ ges/ges-timeline-source.c | 6 +++--- ges/ges-track-operation.h | 2 -- ges/ges-track-source.c | 6 ------ ges/ges-track-source.h | 2 -- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index 84b34d4..154546a 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -94,7 +94,6 @@ GES_TYPE_TRACK_OBJECT GESTrackSource GESTrackSource GESTrackSourceClass -ges_track_source_new GESTrackSourcePrivate GES_TRACK_SOURCE @@ -111,7 +110,6 @@ ges_track_source_get_type GESTrackOperation GESTrackOperation GESTrackOperationClass -ges_track_operation_new GESTrackOperationPrivate ges_track_operation_get_type diff --git a/ges/ges-custom-timeline-source.c b/ges/ges-custom-timeline-source.c index 4c65d97..e69dba4 100644 --- a/ges/ges-custom-timeline-source.c +++ b/ges/ges-custom-timeline-source.c @@ -31,6 +31,7 @@ #include "ges-internal.h" #include "ges-custom-timeline-source.h" #include "ges-timeline-source.h" +#include "ges-track-source.h" struct _GESCustomTimelineSourcePrivate { @@ -65,6 +66,13 @@ ges_cust_timeline_src_set_property (GObject * object, guint property_id, } } +static GESTrackObject * +ges_cust_timeline_src_create_track_object (GESTimelineObject * obj, + GESTrack * track) +{ + return g_object_new (GES_TYPE_TRACK_SOURCE, NULL); +} + static void ges_cust_timeline_src_dispose (GObject * object) { @@ -91,6 +99,7 @@ ges_cust_timeline_src_class_init (GESCustomTimelineSourceClass * klass) object_class->finalize = ges_cust_timeline_src_finalize; tlobj_class->fill_track_object = ges_cust_timeline_src_fill_track_object; + tlobj_class->create_track_object = ges_cust_timeline_src_create_track_object; } static void diff --git a/ges/ges-timeline-source.c b/ges/ges-timeline-source.c index f03f183..89fac99 100644 --- a/ges/ges-timeline-source.c +++ b/ges/ges-timeline-source.c @@ -217,9 +217,9 @@ static GESTrackObject * ges_timeline_source_create_track_object (GESTimelineObject * obj, GESTrack * track) { - GST_DEBUG ("Creating a GESTrackSource"); - /* FIXME : Implement properly ! */ - return (GESTrackObject *) ges_track_source_new (); + GST_ERROR + ("No GESTimelineObject::create_track_object vmethod implementation"); + return NULL; } static gboolean diff --git a/ges/ges-track-operation.h b/ges/ges-track-operation.h index 18946f9..4faf99a 100644 --- a/ges/ges-track-operation.h +++ b/ges/ges-track-operation.h @@ -85,8 +85,6 @@ struct _GESTrackOperationClass { GType ges_track_operation_get_type (void); -GESTrackOperation* ges_track_operation_new (void); - G_END_DECLS #endif /* _GES_TRACK_OPERATION */ diff --git a/ges/ges-track-source.c b/ges/ges-track-source.c index 8b38b27..1d9f11e 100644 --- a/ges/ges-track-source.c +++ b/ges/ges-track-source.c @@ -120,9 +120,3 @@ ges_track_source_init (GESTrackSource * self) self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GES_TYPE_TRACK_SOURCE, GESTrackSourcePrivate); } - -GESTrackSource * -ges_track_source_new (void) -{ - return g_object_new (GES_TYPE_TRACK_SOURCE, NULL); -} diff --git a/ges/ges-track-source.h b/ges/ges-track-source.h index 20aa1e2..14e92ad 100644 --- a/ges/ges-track-source.h +++ b/ges/ges-track-source.h @@ -86,8 +86,6 @@ struct _GESTrackSourceClass { GType ges_track_source_get_type (void); -GESTrackSource* ges_track_source_new (void); - G_END_DECLS #endif /* _GES_TRACK_SOURCE */ -- 2.7.4