pitivi r1424 - in trunk: bin pitivi/timeline pitivi/ui

[edwardrv svn gnome org]

Author: edwardrv
Date: Fri Nov 28 17:37:08 2008
New Revision: 1424
URL: http://svn.gnome.org/viewvc/pitivi?rev=1424&view=rev

Log:
Fixes for rebasing of brandon's master branch

Modified:
   trunk/bin/pitivi.in
   trunk/pitivi/timeline/source.py
   trunk/pitivi/ui/timeline.py

Modified: trunk/bin/pitivi.in
==============================================================================
--- trunk/bin/pitivi.in	(original)
+++ trunk/bin/pitivi.in	Fri Nov 28 17:37:08 2008
@@ -109,7 +109,12 @@
 
 def _run_pitivi():
     import pitivi.pitivi as ptv
-    sys.exit(ptv.main(sys.argv))
+
+    try:
+        sys.exit(ptv.main(sys.argv))
+    except StandardError, e:
+        print "Error: ", e
+        sys.exit(1)
 
 try:
     _add_pitivi_path()

Modified: trunk/pitivi/timeline/source.py
==============================================================================
--- trunk/pitivi/timeline/source.py	(original)
+++ trunk/pitivi/timeline/source.py	Fri Nov 28 17:37:08 2008
@@ -116,15 +116,6 @@
     # override setInTime and setOutTime methods to handle media-start/duration
 
     def setInTime(self, time):
-        """Sets [media]{start,duration} properties such that the hypothetical
-        start of the source, and the out-point of the source are constant"""
-        delta = self.start - time
-        duration = self.duration + delta
-        self.setStartDurationTime(time, duration)
-        self.setMediaStartDurationTime(self.media_start - delta,
-            duration)
-
-    def setInTime(self, time):
         """Sets the [media-]{start,duration} properties such that the
         out-point and hypothetical beginning of the media remain constant."""
         # { .... [ ==|=======] .... }

Modified: trunk/pitivi/ui/timeline.py
==============================================================================
--- trunk/pitivi/ui/timeline.py	(original)
+++ trunk/pitivi/ui/timeline.py	Fri Nov 28 17:37:08 2008
@@ -1,8 +1,8 @@
 # PiTiVi , Non-linear video editor
 #
-#       pitivi/ui/complextimeline.py
+#       pitivi/ui/timeline.py
 #
-# Copyright (c) 2006, Edward Hervey <bilboed bilboed com>
+# Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public