[pitivi] timeline: Fix the setting of _on_layer so it's always a GES object
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] timeline: Fix the setting of _on_layer so it's always a GES object
- Date: Fri, 23 Oct 2015 17:10:33 +0000 (UTC)
commit 53cc4cedcbf7a6a3fad5aa4d74c7de767f2c844d
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Mon Oct 5 00:11:19 2015 +0200
timeline: Fix the setting of _on_layer so it's always a GES object
Should have been part of 762e023e9837247d80d7efedb68152ec1225a4ae
Differential Revision: https://phabricator.freedesktop.org/D326
pitivi/timeline/timeline.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 276cb02..b754d86 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -558,7 +558,7 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
if self.draggingElement is not None:
self.__drag_start_x = event.x
- self._on_layer = self.draggingElement.layer
+ self._on_layer = self.draggingElement.layer.bLayer
else:
layer_controls = self._getParentOfType(event_widget, LayerControls)
if not layer_controls:
@@ -700,7 +700,7 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
else:
clip_duration = asset.get_duration()
- layer, unused_on_sep = self.__getLayerAt(y)
+ bLayer, unused_on_sep = self.__getLayerAt(y)
if not placement:
placement = self.pixelToNs(x)
placement = max(0, placement)
@@ -708,11 +708,11 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
self.debug("Creating %s at %s", asset.props.id, Gst.TIME_ARGS(placement))
self.app.action_log.begin("add clip")
- bClip = layer.add_asset(asset,
- placement,
- 0,
- clip_duration,
- asset.get_supported_formats())
+ bClip = bLayer.add_asset(asset,
+ placement,
+ 0,
+ clip_duration,
+ asset.get_supported_formats())
placement += clip_duration
self.current_group.add(bClip.get_toplevel_parent())
self.selection.setSelection([], SELECT_ADD)
@@ -721,7 +721,7 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
if not self.draggingElement:
self.draggingElement = bClip.ui
- self._on_layer = layer
+ self._on_layer = bLayer
self._createdClips = True
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]