GESTrack: keep track of trackobjects and remove/release them in dispose

diff --git a/ges/ges-track.c b/ges/ges-track.c
index 4dc4e70e2260fe09a430b6cf6f6923167023b5a3..0c5c79ed6de53ce6b3ae162a3bb3296d0a34823b 100644 (file)
--- a/ges/ges-track.c
+++ b/ges/ges-track.c
@@ -88,7 +88,11 @@ ges_track_dispose (GObject * object)
 {
   GESTrack *track = (GESTrack *) object;
 
-  /* FIXME : Remove all TrackObjects ! */
+  while (track->trackobjects) {
+    GESTrackObject *trobj = GES_TRACK_OBJECT (track->trackobjects->data);
+    ges_track_remove_object (track, trobj);
+    ges_timeline_object_release_track_object (trobj->timelineobj, trobj);
+  }
 
   if (track->composition) {
     gst_bin_remove (GST_BIN (object), track->composition);
@@ -293,6 +297,8 @@ ges_track_add_object (GESTrack * track, GESTrackObject * object)
     return FALSE;
   }
 
+  track->trackobjects = g_list_append (track->trackobjects, object);
+
   return TRUE;
 }
 
@@ -325,6 +331,7 @@ ges_track_remove_object (GESTrack * track, GESTrackObject * object)
   }
 
   ges_track_object_set_track (object, NULL);
+  track->trackobjects = g_list_remove (track->trackobjects, object);
 
   return TRUE;
 }

diff --git a/ges/ges-track.h b/ges/ges-track.h
index 0213bfc110f6d0a0d938a089f03d223c1edf6852..7ad1e381fa23e9fd59adacefb5a4dc96c9cf5cfa 100644 (file)
--- a/ges/ges-track.h
+++ b/ges/ges-track.h
@@ -59,6 +59,7 @@ struct _GESTrack {
 
   /*< private >*/
   GESTimeline * timeline;
+  GList * trackobjects;
 
   GstCaps * caps;