[pitivi: 4/16] Rename newKeyFrame/removeKeyFrame to newKeyframe and removeKeyframe.



commit 31c79047bdc755fae1a61dc796bcd636e37a7924
Author: Alessandro Decina <alessandro d gmail com>
Date:   Fri Jul 3 17:55:43 2009 +0200

    Rename newKeyFrame/removeKeyFrame to newKeyframe and removeKeyframe.

 pitivi/formatters/etree.py    |    2 +-
 pitivi/timeline/track.py      |    6 +++---
 pitivi/ui/curve.py            |    4 ++--
 tests/test_etree_formatter.py |    2 +-
 tests/test_track.py           |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/pitivi/formatters/etree.py b/pitivi/formatters/etree.py
index 99b1e16..9837229 100644
--- a/pitivi/formatters/etree.py
+++ b/pitivi/formatters/etree.py
@@ -396,7 +396,7 @@ class ElementTreeFormatter(Formatter):
         interpolator.start.mode = int(start.attrib["mode"])
 
         for kf in element.getiterator("keyframe"):
-            interpolator.newKeyFrame(long(kf.attrib["time"]), 
+            interpolator.newKeyframe(long(kf.attrib["time"]), 
                 value=self._parsePropertyValue(kf.attrib["value"]),
                 mode=int(kf.attrib["mode"]))
         end = element.find("end")
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index 183c7dd..8d0a9ef 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -165,7 +165,7 @@ class Interpolator(Signallable, Loggable):
         self._controller = gst.Controller(self._element, prop.name)
         self._controller.set_interpolation_mode(prop.name, gst.INTERPOLATE_LINEAR)
 
-    def newKeyFrame(self, time, value=None, mode=None):
+    def newKeyframe(self, time, value=None, mode=None):
         """add a new keyframe at the specified time, optionally with specified
         value and specified mode. If not specified, these will be computed so
         that the new keyframe likes on the existing curve at that timestampi
@@ -200,7 +200,7 @@ class Interpolator(Signallable, Loggable):
 
         return kf
 
-    def removeKeyFrame(self, keyframe):
+    def removeKeyframe(self, keyframe):
         self._controller.unset(self._property.name, keyframe.time)
         if keyframe is not self.start and keyframe is not self.end:
             self._keyframes.remove(keyframe)
@@ -354,7 +354,7 @@ class TrackObject(Signallable, Loggable):
             other_interpolator.end.value = interpolator.end.value
             other_interpolator.end.mode = interpolator.end.mode
             for kf in interpolator.getInteriorKeyframes():
-                other_interpolator.newKeyFrame(kf.time,
+                other_interpolator.newKeyframe(kf.time,
                     kf.value,
                     kf.mode)
 
diff --git a/pitivi/ui/curve.py b/pitivi/ui/curve.py
index 4926d3a..ee02a01 100644
--- a/pitivi/ui/curve.py
+++ b/pitivi/ui/curve.py
@@ -83,9 +83,9 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
             kf = self._view.findKeyframe(pos)
             if kf is None:
                 time, value = self.xyToTimeValue(pos)
-                interpolator.newKeyFrame(time, value)
+                interpolator.newKeyframe(time, value)
             else:
-                self._view.interpolator.removeKeyFrame(kf)
+                self._view.interpolator.removeKeyframe(kf)
 
         def xyToTimeValue(self, pos):
             bounds = self._view.bounds
diff --git a/tests/test_etree_formatter.py b/tests/test_etree_formatter.py
index f46db02..f1220a4 100644
--- a/tests/test_etree_formatter.py
+++ b/tests/test_etree_formatter.py
@@ -138,7 +138,7 @@ class TestFormatterSave(TestCase):
         volcurve.start.value = 0
         for t in xrange(3, 15, 3):
             value = int(t % 2)
-            volcurve.newKeyFrame(t * gst.SECOND, value)
+            volcurve.newKeyframe(t * gst.SECOND, value)
         volcurve.end.setObjectTime(15 * gst.SECOND)
         volcurve.end.value = 15 % 2
 
diff --git a/tests/test_track.py b/tests/test_track.py
index 8647f13..0d04798 100644
--- a/tests/test_track.py
+++ b/tests/test_track.py
@@ -231,7 +231,7 @@ class TestTrackObject(TestCase):
         expected = dict(((t * gst.SECOND, (t % 2, gst.INTERPOLATE_LINEAR))
             for t in xrange(3, 10, 3)))
         for time, (value, mode) in expected.iteritems():
-            interpolator.newKeyFrame(time, value, mode)
+            interpolator.newKeyframe(time, value, mode)
 
         def getKeyframes(obj):
             keyframes = obj.getInterpolator("volume").getInteriorKeyframes()



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