Track: Implement remove_object()

diff --git a/ges/ges-track.c b/ges/ges-track.c
index 7cf1a9e5dc2971ff01cc14cff044f4dbfac2e4fe..c3735c5ef679eee80415d71ac69dfa51245387db 100644 (file)
--- a/ges/ges-track.c
+++ b/ges/ges-track.c
@@ -54,6 +54,15 @@ ges_track_set_property (GObject * object, guint property_id,
 static void
 ges_track_dispose (GObject * object)
 {
+  GESTrack *track = (GESTrack *) object;
+
+  /* FIXME : Remove all TrackObjects ! */
+
+  if (track->composition) {
+    g_object_unref (track->composition);
+    track->composition = NULL;
+  }
+
   G_OBJECT_CLASS (ges_track_parent_class)->dispose (object);
 }
 
@@ -77,6 +86,7 @@ ges_track_class_init (GESTrackClass * klass)
 static void
 ges_track_init (GESTrack * self)
 {
+  self->composition = gst_element_factory_make ("gnlcomposition", NULL);
 }
 
 GESTrack *
@@ -108,7 +118,10 @@ ges_track_add_object (GESTrack * track, GESTrackObject * object)
     return FALSE;
   }
 
-  ges_track_object_set_track (object, track);
+  if (G_UNLIKELY (!ges_track_object_set_track (object, track))) {
+    GST_ERROR ("Couldn't properly add the object to the Track");
+    return FALSE;
+  }
 
   GST_DEBUG ("Adding object to ourself");
 
@@ -121,3 +134,26 @@ ges_track_add_object (GESTrack * track, GESTrackObject * object)
 
   return TRUE;
 }
+
+gboolean
+ges_track_remove_object (GESTrack * track, GESTrackObject * object)
+{
+  GST_DEBUG ("track:%p, object:%p", track, object);
+
+  if (G_UNLIKELY (object->track != track)) {
+    GST_WARNING ("Object belongs to another track");
+    return FALSE;
+  }
+
+  if (G_LIKELY (object->gnlobject != NULL)) {
+    GST_DEBUG ("Removing GnlObject from composition");
+    if (!gst_bin_remove (GST_BIN (track->composition), object->gnlobject)) {
+      GST_WARNING ("Failed to remove gnlobject from composition");
+      return FALSE;
+    }
+  }
+
+  ges_track_object_set_track (object, NULL);
+
+  return TRUE;
+}

diff --git a/ges/ges-track.h b/ges/ges-track.h
index fa8804d8b21449d9801047864c05c440b871d9a8..61449300318979f41e085f4ed6484404c35019a1 100644 (file)
--- a/ges/ges-track.h
+++ b/ges/ges-track.h
@@ -62,6 +62,7 @@ GESTrack* ges_track_new (void);
 void ges_track_set_timeline (GESTrack * track, GESTimeline *timeline);
 
 gboolean ges_track_add_object (GESTrack * track, GESTrackObject * object);
+gboolean ges_track_remove_object (GESTrack * track, GESTrackObject * object);
 
 G_END_DECLS