[pitivi] projects: Subclass ges.Timeline so the selection is properly declared
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] projects: Subclass ges.Timeline so the selection is properly declared
- Date: Sun, 2 Sep 2012 03:56:23 +0000 (UTC)
commit 67dc72bff57e4f2710b74a2b171bd44a301ec202
Author: Thibault Saunier <thibault saunier collabora com>
Date: Mon Jul 2 16:14:14 2012 -0400
projects: Subclass ges.Timeline so the selection is properly declared
pitivi/project.py | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/pitivi/project.py b/pitivi/project.py
index 6e459f9..ce6565d 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -57,6 +57,14 @@ from pitivi.preset import AudioPresetManager, DuplicatePresetNameException,\
#------------------ Backend classes ------------------------------------------#
+class Timeline(ges.Timeline):
+ def __init__(self):
+ ges.Timeline.__init__(self)
+ self.add_track(ges.track_audio_raw_new())
+ self.add_track(ges.track_video_raw_new())
+ self.selection = Selection()
+
+
class ProjectSettingsChanged(UndoableAction):
def __init__(self, project, old, new):
@@ -157,14 +165,15 @@ class ProjectManager(Signallable, Loggable):
self.emit("new-project-created", self.current)
- self.timeline = self.current.timeline
+ self.timeline = Timeline()
self.formatter = ges.PitiviFormatter()
self.formatter.connect("source-moved", self._formatterMissingURICb)
self.formatter.connect("loaded", self._projectLoadedCb)
if self.formatter.load_from_uri(self.timeline, uri):
self.current.connect("project-changed", self._projectChangedCb)
-
- return True
+ return True
+ self.warn("Could not load project %s", uri)
+ return False
def _restoreFromBackupDialog(self, time_diff):
"""
@@ -521,12 +530,7 @@ class Project(Signallable, Loggable):
self.medialibrary = MediaLibrary()
self._dirty = False
-
- self.timeline = ges.timeline_new_audio_video()
-
- # We add a Selection to the timeline as there is currently
- # no such feature in GES
- self.timeline.selection = Selection()
+ self.timeline = Timeline()
self.pipeline = Pipeline()
self.pipeline.add_timeline(self.timeline)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]