[pitivi] curve.py: specify formatfunc in getInterpolatedProperties



commit b0a9f6269df226c4967e81d3959305cebea174aa
Author: Brandon Lewis <brandon_lewis berkeley edu>
Date:   Mon Aug 17 15:43:27 2009 -0700

    curve.py: specify formatfunc in getInterpolatedProperties
    
    factories/file.py,timeline/track.py: give formatfunc in
    getInterpolatedProperties

 pitivi/factories/file.py |    5 +++--
 pitivi/timeline/track.py |    6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/pitivi/factories/file.py b/pitivi/factories/file.py
index 1fe32ad..6d8fed9 100644
--- a/pitivi/factories/file.py
+++ b/pitivi/factories/file.py
@@ -28,6 +28,7 @@ from pitivi.factories.base import RandomAccessSourceFactory, \
         SinkFactory
 from pitivi.elements.imagefreeze import ImageFreeze
 from pitivi.stream import MultimediaStream, AudioStream, VideoStream
+from pitivi.utils import formatPercent
 
 class FileSourceFactory(RandomAccessSourceFactory):
     """
@@ -48,9 +49,9 @@ class FileSourceFactory(RandomAccessSourceFactory):
         props = RandomAccessSourceFactory.getInterpolatedProperties(self, 
             stream)
         if isinstance(stream, AudioStream):
-            props.update({"volume" : (0.0, 2.0)})
+            props.update({"volume" : (0.0, 2.0, formatPercent)})
         elif isinstance(stream, VideoStream):
-            props.update({"alpha" : (0.0, 1.0)})
+            props.update({"alpha" : (0.0, 1.0, formatPercent)})
         self.debug("returning %r", props)
         return props
 
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index 0f855f0..2f3dcb1 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -372,11 +372,11 @@ class TrackObject(Signallable, Loggable):
                 interpolator = old_interpolators[prop_name][1]
             except KeyError:
                 if factory_properties[prop_name]:
-                    lower, upper = factory_properties[prop_name]
+                    lower, upper, formatstr = factory_properties[prop_name]
                 else:
-                    lower, upper = None, None
+                    lower, upper, formatstr = None, None, None
                 interpolator = Interpolator(self, gst_object,
-                    gst_object_property, lower, upper)
+                    gst_object_property, lower, upper, formatstr)
             else:
                 interpolator.attachToElementProperty(gst_object_property,
                         gst_object)



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