[pitivi/ges: 62/287] Remove the background layer as it is now handled by GES itself



commit 1860827661eb5f46be95012fff8c019ca2ec4c83
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Sat Oct 22 16:17:28 2011 +0200

    Remove the background layer as it is now handled by GES itself

 pitivi/project.py     |   19 ++-----------------
 pitivi/sourcelist.py  |    7 ++-----
 pitivi/ui/timeline.py |    3 ---
 3 files changed, 4 insertions(+), 25 deletions(-)
---
diff --git a/pitivi/project.py b/pitivi/project.py
index 0d9cfa8..d58c699 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -31,7 +31,6 @@ from pitivi.sourcelist import SourceList
 from pitivi.settings import ExportSettings
 from pitivi.signalinterface import Signallable
 from pitivi.utils import Seeker
-from pitivi.ui.timeline import BACKGROUND_PRIORITY
 
 
 class ProjectError(Exception):
@@ -92,16 +91,6 @@ class Project(Signallable, Loggable):
         self.layer.set_property("auto-transition", True)
 
         self.timeline.add_layer(self.layer)
-        self.back_layer = ges.TimelineLayer()
-        self._background = ges.TimelineTestSource()
-        self.back_layer.set_priority(BACKGROUND_PRIORITY)
-
-        #FIXME THIS IS SO DIRTY GES port
-        for track in self.timeline.get_tracks():
-            track.connect("notify::duration", self._backgroundDurationCb)
-
-        self.back_layer.add_object(self._background)
-        self.timeline.add_layer(self.back_layer)
 
         self.pipeline = ges.TimelinePipeline()
         self.pipeline._setUp = False
@@ -111,9 +100,6 @@ class Project(Signallable, Loggable):
         self.settings = ExportSettings()
         self._videocaps = self.settings.getVideoCaps()
 
-    def _backgroundDurationCb(self, track, unused):
-        self._background.props.duration = track.props.duration
-
     def release(self):
         self.pipeline = None
 
@@ -163,6 +149,5 @@ class Project(Signallable, Loggable):
 
     def loadSources(self):
         for layer in self.timeline.get_layers():
-            if layer.props.priority < BACKGROUND_PRIORITY:
-                for obj in layer.get_objects():
-                    self.sources.addUri(obj.get_uri())
+            for obj in layer.get_objects():
+                self.sources.addUri(obj.get_uri())
diff --git a/pitivi/sourcelist.py b/pitivi/sourcelist.py
index a866a31..f82a98a 100644
--- a/pitivi/sourcelist.py
+++ b/pitivi/sourcelist.py
@@ -30,8 +30,6 @@ import gst
 from pitivi.signalinterface import Signallable
 from pitivi.log.loggable import Loggable
 
-from pitivi.ui.timeline import BACKGROUND_PRIORITY
-
 
 class SourceListError(Exception):
     pass
@@ -128,9 +126,8 @@ class SourceList(Signallable, Loggable):
 
     def _newProjectLoadedCb(self, unused_pitivi, project):
         for layer in project.timeline.get_layers():
-            if layer.props.priority < BACKGROUND_PRIORITY:
-                for obj in layer.get_objects():
-                    self.addUri(obj.get_uri())
+            for obj in layer.get_objects():
+                self.addUri(obj.get_uri())
 
     def getUri(self, uri):
         """
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index 2ba70b3..20c8c7c 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -67,9 +67,6 @@ ALIGN = _("Align clips based on their soundtracks")
 SELECT_BEFORE = ("Select all sources before selected")
 SELECT_AFTER = ("Select all after selected")
 
-#FIXME We should not use a background when gaps are properly handled in GES
-BACKGROUND_PRIORITY = 99
-
 ui = '''
 <ui>
     <menubar name="MainMenuBar">



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