pitivi r1191 - in branches/SOC_2008_BLEWIS: . pitivi pitivi/ui

[blewis svn gnome org]

Author: blewis
Date: Fri Jul 18 20:25:34 2008
New Revision: 1191
URL: http://svn.gnome.org/viewvc/pitivi?rev=1191&view=rev

Log:
reviewed by: <delete if not using a buddy>
* pitivi/ui/timelineobjects.py:
* pitivi/ui/viewer.py:
* pitivi/utils.py:


Modified:
   branches/SOC_2008_BLEWIS/ChangeLog
   branches/SOC_2008_BLEWIS/pitivi/ui/timelineobjects.py
   branches/SOC_2008_BLEWIS/pitivi/ui/viewer.py
   branches/SOC_2008_BLEWIS/pitivi/utils.py

Modified: branches/SOC_2008_BLEWIS/pitivi/ui/timelineobjects.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/ui/timelineobjects.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/ui/timelineobjects.py	Fri Jul 18 20:25:34 2008
@@ -44,6 +44,7 @@
 
 import goocanvas
 from util import *
+from pitivi.utils import time_to_string
 
 # Default width / height ratio for simple elements
 DEFAULT_SIMPLE_SIZE_RATIO = 1.50 # default height / width ratio
@@ -61,17 +62,6 @@
 MINIMUM_HEIGHT = DEFAULT_HEIGHT
 MINIMUM_WIDTH = 3 * MINIMUM_HEIGHT
 
-def time_to_string(value):
-    if value == gst.CLOCK_TIME_NONE:
-        return "--:--:--.---"
-    ms = value / gst.MSECOND
-    sec = ms / 1000
-    ms = ms % 1000
-    mins = sec / 60
-    sec = sec % 60
-    hours = mins / 60
-    return "%02d:%02d:%02d.%03d" % (hours, mins, sec, ms)
-
 class SimpleTimelineWidget(gtk.HBox):
     """Contains the editing widget as well as a gtk.ScrolledWindow containing
     the simple timeline canvas. Handles showing/hiding the editing widget and

Modified: branches/SOC_2008_BLEWIS/pitivi/ui/viewer.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/ui/viewer.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/ui/viewer.py	Fri Jul 18 20:25:34 2008
@@ -34,17 +34,7 @@
 from pitivi.signalgroup import SignalGroup
 
 from gettext import gettext as _
-
-def time_to_string(value):
-    if value == -1:
-        return "--:--:--.---"
-    ms = value / gst.MSECOND
-    sec = ms / 1000
-    ms = ms % 1000
-    mins = sec / 60
-    sec = sec % 60
-    hours = mins / 60
-    return "%02d:%02d:%02d.%03d" % (hours, mins, sec, ms)
+from pitivi.utils import time_to_string
 
 class PitiviViewer(gtk.VBox):
     """ Pitivi's viewer widget with controls """

Modified: branches/SOC_2008_BLEWIS/pitivi/utils.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/utils.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/utils.py	Fri Jul 18 20:25:34 2008
@@ -24,6 +24,17 @@
 
 import gst, bisect
 
+def time_to_string(value):
+    if value == gst.CLOCK_TIME_NONE:
+        return "--:--:--.---"
+    ms = value / gst.MSECOND
+    sec = ms / 1000
+    ms = ms % 1000
+    mins = sec / 60
+    sec = sec % 60
+    hours = mins / 60
+    return "%02d:%02d:%02d.%03d" % (hours, mins, sec, ms)
+
 def bin_contains(bin, element):
     """ Returns True if the bin contains the given element, the search is recursive """
     if not isinstance(bin, gst.Bin):