[pitivi] formatter.etree: fillTimeline operates on the projects existing timeline rather than creating a new



commit b74c064b7fc15d066af6daf45df0d7b4a039d513
Author: Brandon Lewis <brandon_lewis berkeley edu>
Date:   Fri Apr 17 18:42:17 2009 -0700

    formatter.etree: fillTimeline operates on the projects existing timeline rather than creating a new one
---
 pitivi/formatters/etree.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pitivi/formatters/etree.py b/pitivi/formatters/etree.py
index 06c61cb..01c7656 100644
--- a/pitivi/formatters/etree.py
+++ b/pitivi/formatters/etree.py
@@ -382,6 +382,8 @@ class ElementTreeFormatter(Formatter):
     def _loadTimeline(self, element):
         self.debug("element:%r", element)
 
+        timeline = self.project.timeline
+
         # Tracks
         tracks_element = element.find("tracks")
         tracks = self._loadTracks(tracks_element)
@@ -391,9 +393,6 @@ class ElementTreeFormatter(Formatter):
         timeline_objects = \
                 self._loadTimelineObjects(timeline_objects_element)
 
-        # NOTE: the tracks here are already populated with track objects.
-        # the UI does not get any track-object-added signals
-        timeline = Timeline()
         for track in tracks:
             timeline.addTrack(track)
 
@@ -448,7 +447,7 @@ class ElementTreeFormatter(Formatter):
 
     def _fillTimeline(self):
         # fill up self.project
-        self.project.timeline = self._loadTimeline(self.timelinenode)
+        self._loadTimeline(self.timelinenode)
 
     @classmethod
     def canHandle(cls, uri):



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]