[pitivi/ges] timeline: fix mistypes and removal of unused code



commit 4220f0627f8acb3b002e93b2edf2df643a1c5300
Author: Matas Brazdeikis <matas brazdeikis lt>
Date:   Sun May 6 21:44:01 2012 +0100

    timeline: fix mistypes and removal of unused code

 pitivi/timeline/timeline.py |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 6f7381a..f2248a8 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -388,7 +388,7 @@ class TimelineCanvas(goocanvas.Canvas, Zoomable, Loggable):
         if position == 0:
             self._snapEndedCb()
         else:
-            self.debug("Snapping indicator at", position)
+            self.debug("Snapping indicator at %d" % position)
             self._snap_indicator.props.x = Zoomable.nsToPixel(position)
             self._snap_indicator.props.height = self.height
             self._snap_indicator.props.visibility = goocanvas.ITEM_VISIBLE
@@ -651,9 +651,7 @@ class Timeline(gtk.Table, Loggable, Zoomable):
         # timeline ruler
         self.ruler = ruler.ScaleRuler(self.app, self.hadj)
         self.ruler.set_size_request(0, 25)
-        #self.ruler.set_border_width(2)
         self.ruler.connect("key-press-event", self._keyPressEventCb)
-        self.ruler.connect("size-allocate", self._rulerSizeAllocateCb)
         rulerframe = gtk.Frame()
         rulerframe.set_shadow_type(gtk.SHADOW_OUT)
         rulerframe.add(self.ruler)
@@ -872,7 +870,7 @@ class Timeline(gtk.Table, Loggable, Zoomable):
                     track = tckobj.get_track()
                     if track.props.track_type == ges.TRACK_TYPE_AUDIO and \
                             media_type == AUDIO_EFFECT or \
-                            track.props.track_objects == ges.TRACK_TYPE_VIDEO and \
+                            track.props.track_type == ges.TRACK_TYPE_VIDEO and \
                             media_type == VIDEO_EFFECT:
                         #Actually add the effect
                         self.app.action_log.begin("add effect")
@@ -1164,9 +1162,6 @@ class Timeline(gtk.Table, Loggable, Zoomable):
         self._hscrollbar.set_value(position)
         return False
 
-    def _rulerSizeAllocateCb(self, ruler, allocation):
-        self._canvas.props.redraw_when_scrolled = False
-
     def _snapDistanceChangedCb(self, settings):
         if self._timeline:
             self._timeline.props.snapping_distance = \



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