[pitivi] etree: use the correct type for value when saving and loading keyframes

[Edward Hervey <edwardrv src gnome org>]

commit 124e8eccba99b495248ed31be6c74e5a25cf5c2f
Author: Brandon Lewis <brandon_lewis berkeley edu>
Date:   Thu Jun 25 00:08:54 2009 -0700

    etree: use the correct type for value when saving and loading keyframes

 pitivi/formatters/etree.py |   45 +++++++++++++++++++++++++++++--------------
 1 files changed, 30 insertions(+), 15 deletions(-)
---
diff --git a/pitivi/formatters/etree.py b/pitivi/formatters/etree.py
index 960f2a1..7da1b43 100644
--- a/pitivi/formatters/etree.py
+++ b/pitivi/formatters/etree.py
@@ -362,31 +362,46 @@ class ElementTreeFormatter(Formatter):
         return track_object
 
     def _saveInterpolator(self, interpolator, prop):
-        element = Element("curve", property=prop)
-        start = Element("start", value=interpolator.start.value,
-            mode=interpolator.start.mode)
+        typename = prop.value_type.name
+        element = Element("curve", property=prop.name, type=typename)
+
+        start = self._saveKeyframe(interpolator.start, typename, False)
+        start.tag = "start"
         element.append(start)
-        for kf in interpolator.keyframes:
-            kfel = Element("keyframe", time=str(kf.time), value=str(kf.value), 
-                mode=str(int(kf.mode)))
+
+        for kf in interpolator.getInteriorKeyframes():
+            kfel = self._saveKeyframe(kf, typename)
             element.append(kfel)
-        end = Element("end", value=interpolator.end.value,
-            mode=interpolator.end.mode)
+
+        end = self._saveKeyframe(interpolator.end, typename, False)
+        end.tag = "end"
         element.append(end)
         return element
 
+    def _saveKeyframe(self, keyframe, typename, time=True):
+        element = Element("keyframe")
+        element.attrib["value"] = "(%s)%r" % (typename, keyframe.value)
+        element.attrib["mode"] = str(keyframe.mode)
+        if not time:
+            return element
+        element.attrib["time"] = str(keyframe.time)
+        return element
+
     def _loadInterpolator(self, element, trackobject):
-        interpolator = trackobject.interpolator[element.attrib["prop"]]
+        interpolator = trackobject.getInterpolator(element.attrib["property"])
+
         start = element.find("start")
-        interpolator.start.value = start.attrib["value"]
-        interpolator.start.mode = start.attrib["mode"]
-        for keyframe in element.getchildren():
+        interpolator.start.value = self._parsePropertyValue(
+            start.attrib["value"])
+        interpolator.start.mode = int(start.attrib["mode"])
+
+        for kf in element.getiterator("keyframe"):
             interpolator.newKeyFrame(long(kf.attrib["time"]), 
-                value=float(kf.attrib["value"]),
+                value=self._parsePropertyValue(kf.attrib["value"]),
                 mode=int(kf.attrib["mode"]))
         end = element.find("end")
-        interpolator.end.value = end.attrib["value"]
-        interpolator.end.mode = end.attrib["mode"]
+        interpolator.end.value = self._parsePropertyValue(end.attrib["value"])
+        interpolator.end.mode = int(end.attrib["mode"])
 
     def _saveTrackObjectRef(self, track_object):
         element = Element("track-object-ref")