[pitivi/ges: 28/287] Add missing ges imports, and make it pass pep8



commit 3785db8fcd036b486d923ddad4bbce6d46076f48
Author: Mathieu Duponchelle <seeed laposte net>
Date:   Sun Aug 28 21:38:32 2011 +0200

    Add missing ges imports, and make it pass pep8
    
    And workaround pep8 :/

 pitivi/projectmanager.py    |    2 ++
 pitivi/timeline/timeline.py |    1 +
 pitivi/ui/mainwindow.py     |    1 +
 pitivi/ui/timeline.py       |   13 ++++++-------
 pitivi/ui/viewer.py         |    7 ++++---
 5 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/pitivi/projectmanager.py b/pitivi/projectmanager.py
index 71b1170..34d5804 100644
--- a/pitivi/projectmanager.py
+++ b/pitivi/projectmanager.py
@@ -22,6 +22,8 @@
 from gettext import gettext as _
 import gobject
 import os
+import gst
+import ges
 
 from urlparse import urlparse
 from pwd import getpwuid
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index aa3c69a..4c7d939 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -34,6 +34,7 @@ from pitivi.utils import start_insort_right, infinity, getPreviousObject, \
 from pitivi.timeline.gap import Gap, SmallestGapsFinder, invalid_gap
 from pitivi.stream import VideoStream
 from pitivi.timeline.align import AutoAligner
+import ges
 
 # Selection modes
 SELECT = 0
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index a73d088..57b4580 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -29,6 +29,7 @@ import gtk
 import gst
 from urllib import unquote
 import webbrowser
+import ges
 
 from gettext import gettext as _
 from gtk import RecentManager
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index b9cbe8e..a56a83c 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -46,7 +46,6 @@ from pitivi.ui.depsmanager import DepsManager
 from pitivi.timeline.align import AutoAligner
 from pitivi.check import soft_deps
 
-
 DND_EFFECT_LIST = [[dnd.VIDEO_EFFECT_TUPLE[0], dnd.EFFECT_TUPLE[0]],\
                   [dnd.AUDIO_EFFECT_TUPLE[0], dnd.EFFECT_TUPLE[0]]]
 VIDEO_EFFECT_LIST = [dnd.VIDEO_EFFECT_TUPLE[0], dnd.EFFECT_TUPLE[0]],
@@ -369,11 +368,11 @@ class Timeline(gtk.Table, Loggable, Zoomable):
 
             if kv == gtk.keysyms.Left:
                 if mod & gtk.gdk.SHIFT_MASK:
-                    self._seekRelative(-gst.SECOND)
+                    self._seekRelative(0 - gst.SECOND)
                 elif mod & gtk.gdk.CONTROL_MASK:
                     self._seeker.seek(ltime + 1)
                 else:
-                    self._seekRelative(-long(self.rate * gst.SECOND))
+                    self._seekRelative(0 - long(self.rate * gst.SECOND))
             elif kv == gtk.keysyms.Right:
                 if mod & gtk.gdk.SHIFT_MASK:
                     self._seekRelative(gst.SECOND)
@@ -489,7 +488,7 @@ class Timeline(gtk.Table, Loggable, Zoomable):
         for layer in self.app.projectManager.current.timeline.get_layers():
             if layer.get_priority() != 99:
                 break
-        for uri in uris :
+        for uri in uris:
             src = ges.TimelineFileSource(uri)
             layer.add_object(src)
             self._temp_objects.insert(0, src)
@@ -548,8 +547,8 @@ class Timeline(gtk.Table, Loggable, Zoomable):
 
     def unsureVadjHeight (self):
         self._scroll_pos_ns = Zoomable.pixelToNs(self.hadj.get_value())
-        self._root_item.set_simple_transform(-self.hadj.get_value(),
-            -self.vadj.get_value(), 1.0, 0)
+        self._root_item.set_simple_transform(0 - self.hadj.get_value(),
+            0 - self.vadj.get_value(), 1.0, 0)
 
     def _updateScrollPosition(self, adjustment):
         self.unsureVadjHeight()
@@ -691,7 +690,7 @@ class Timeline(gtk.Table, Loggable, Zoomable):
                 track.remove_object(track_object)
                 remove = True
                 for tck_obj in obj.get_track_objects():
-                    if isinstance (tck_obj, ges.TrackSource):
+                    if isinstance(tck_obj, ges.TrackSource):
                         remove = False
                 if remove:
                     lyr = obj.get_layer()
diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
index eb375bc..60753f5 100644
--- a/pitivi/ui/viewer.py
+++ b/pitivi/ui/viewer.py
@@ -436,7 +436,7 @@ class PitiviViewer(gtk.VBox, Loggable):
 
     def _sliderScrollCb(self, unused_slider, event):
         if event.direction == gtk.gdk.SCROLL_LEFT:
-            amount = -gst.SECOND
+            amount = - gst.SECOND
         else:
             amount = gst.SECOND
         self.seekRelative(amount)
@@ -504,7 +504,7 @@ class PitiviViewer(gtk.VBox, Loggable):
         self.seek(0)
 
     def _backCb(self, unused_button):
-        self.seekRelative(-gst.SECOND)
+        self.seekRelative(0 - gst.SECOND)
 
     def _playButtonCb(self, unused_button, playing):
         if playing:
@@ -609,7 +609,7 @@ class PitiviViewer(gtk.VBox, Loggable):
             self.warning("seek failed")
 
     def _posCb(self):
-        if not self.playing :
+        if not self.playing:
             return False
         try:
             position = self.pipeline.query_position(gst.FORMAT_TIME)[0]
@@ -651,6 +651,7 @@ class PitiviViewer(gtk.VBox, Loggable):
 
 
 class Point():
+
     def __init__(self, x, y, settings):
         self.x = x
         self.y = y



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