[pitivi] elements: Do not try to track the layer a clip is in



commit ec07eb1b705032960b9d515f5159053d5a236f7c
Author: Thibault Saunier <tsaunier gnome org>
Date:   Thu Dec 24 11:56:10 2015 +0100

    elements: Do not try to track the layer a clip is in
    
    We have GES for that already!

 pitivi/timeline/elements.py |    8 ++++----
 pitivi/timeline/layer.py    |    1 -
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/pitivi/timeline/elements.py b/pitivi/timeline/elements.py
index fec11b3..aff8b3b 100644
--- a/pitivi/timeline/elements.py
+++ b/pitivi/timeline/elements.py
@@ -673,7 +673,6 @@ class Clip(Gtk.EventBox, timelineUtils.Zoomable, Loggable):
 
         self.handles = []
         self.z_order = -1
-        self.layer = layer
         self.timeline = layer.timeline
         self.app = layer.app
 
@@ -708,6 +707,10 @@ class Clip(Gtk.EventBox, timelineUtils.Zoomable, Loggable):
         self.drag_dest_set(0, [ui.EFFECT_TARGET_ENTRY], Gdk.DragAction.COPY)
         self.connect("drag-drop", self.__dragDropCb)
 
+    @property
+    def layer(self):
+        return self.bClip.get_layer().ui
+
     def __dragDropCb(self, unused_widget, context, x, y, timestamp):
         success = False
 
@@ -904,9 +907,6 @@ class Clip(Gtk.EventBox, timelineUtils.Zoomable, Loggable):
 
     def _layerChangedCb(self, bClip, unused_pspec):
         self.updatePosition()
-        bLayer = bClip.props.layer
-        if bLayer:
-            self.layer = bLayer.ui
 
     def __disconnectFromChild(self, child):
         if child.ui:
diff --git a/pitivi/timeline/layer.py b/pitivi/timeline/layer.py
index 5b623ae..7d0da9d 100644
--- a/pitivi/timeline/layer.py
+++ b/pitivi/timeline/layer.py
@@ -487,7 +487,6 @@ class Layer(Gtk.EventBox, timelineUtils.Zoomable, Loggable):
 
     def __childWidgetRemovedCb(self, layout, clip):
         bClip = clip.bClip
-        bClip.ui.layer = None
         if self.timeline.draggingElement is None:
             bClip.ui.release()
             bClip.ui = None


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