Rename functions with _pos to anim_.

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index 63efda3a0a27746d3f914ae448cd200dc45b58c7..2e8097f98baacd076c747b1cbf34035b19cbe898 100644 (file)
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -2065,13 +2065,13 @@ char *mlt_properties_get_time( mlt_properties self, const char* name, mlt_time_f
  * \return The integer value, 0 if not found (which may also be a legitimate value)
  */
 
-int mlt_properties_get_int_pos( mlt_properties self, const char *name, int position, int length )
+int mlt_properties_anim_get_int( mlt_properties self, const char *name, int position, int length )
 {
        mlt_profile profile = mlt_properties_get_data( self, "_profile", NULL );
        double fps = mlt_profile_fps( profile );
        property_list *list = self->local;
        mlt_property value = mlt_properties_find( self, name );
-       return value == NULL ? 0 : mlt_property_get_int_pos( value, fps, list->locale, position, length );
+       return value == NULL ? 0 : mlt_property_anim_get_int( value, fps, list->locale, position, length );
 }
 
 /** Set a property to an integer value at a frame position.
@@ -2083,7 +2083,7 @@ int mlt_properties_get_int_pos( mlt_properties self, const char *name, int posit
  * \return true if error
  */
 
-int mlt_properties_set_int_pos( mlt_properties self, const char *name, int value,
+int mlt_properties_anim_set_int( mlt_properties self, const char *name, int value,
        mlt_keyframe_type keyframe_type, int position, int length )
 {
        int error = 1;
@@ -2099,7 +2099,7 @@ int mlt_properties_set_int_pos( mlt_properties self, const char *name, int value
                mlt_profile profile = mlt_properties_get_data( self, "_profile", NULL );
                double fps = mlt_profile_fps( profile );
                property_list *list = self->local;
-               error = mlt_property_set_int_pos( property, value, fps, list->locale, keyframe_type, position, length );
+               error = mlt_property_anim_set_int( property, value, fps, list->locale, keyframe_type, position, length );
                mlt_properties_do_mirror( self, name );
        }
 
@@ -2163,7 +2163,7 @@ extern mlt_rect mlt_properties_get_rect( mlt_properties self, const char* name )
  * \return true if error
  */
 
-extern int mlt_properties_set_rect_pos( mlt_properties self, const char *name, mlt_rect value, mlt_keyframe_type keyframe_type, int position, int length )
+extern int mlt_properties_anim_set_rect( mlt_properties self, const char *name, mlt_rect value, mlt_keyframe_type keyframe_type, int position, int length )
 {
        int error = 1;
 
@@ -2178,7 +2178,7 @@ extern int mlt_properties_set_rect_pos( mlt_properties self, const char *name, m
                mlt_profile profile = mlt_properties_get_data( self, "_profile", NULL );
                double fps = mlt_profile_fps( profile );
                property_list *list = self->local;
-               error = mlt_property_set_rect_pos( property, value, fps, list->locale, keyframe_type, position, length );
+               error = mlt_property_anim_set_rect( property, value, fps, list->locale, keyframe_type, position, length );
                mlt_properties_do_mirror( self, name );
        }
 
@@ -2195,12 +2195,12 @@ extern int mlt_properties_set_rect_pos( mlt_properties self, const char *name, m
  * \return The rectangle value, the rectangle fields will be DBL_MIN if not found
  */
 
-extern mlt_rect mlt_properties_get_rect_pos( mlt_properties self, const char *name, int position, int length )
+extern mlt_rect mlt_properties_anim_get_rect( mlt_properties self, const char *name, int position, int length )
 {
        mlt_profile profile = mlt_properties_get_data( self, "_profile", NULL );
        double fps = mlt_profile_fps( profile );
        property_list *list = self->local;
        mlt_property value = mlt_properties_find( self, name );
        mlt_rect rect = { DBL_MIN, DBL_MIN, DBL_MIN, DBL_MIN, DBL_MIN };
-       return value == NULL ? rect : mlt_property_get_rect_pos( value, fps, list->locale, position, length );
+       return value == NULL ? rect : mlt_property_anim_get_rect( value, fps, list->locale, position, length );
 }

diff --git a/src/framework/mlt_properties.h b/src/framework/mlt_properties.h
index 5832ccfa8b6ec3a8b19c152ce7866526be277e7b..93c283cd05abcb81be5d1c1d923384cd32f99448 100644 (file)
--- a/src/framework/mlt_properties.h
+++ b/src/framework/mlt_properties.h
@@ -90,13 +90,13 @@ extern void mlt_properties_lock( mlt_properties self );
 extern void mlt_properties_unlock( mlt_properties self );
 extern char *mlt_properties_get_time( mlt_properties, const char* name, mlt_time_format );
 
-extern int mlt_properties_get_int_pos( mlt_properties self, const char *name, int position, int length );
-extern int mlt_properties_set_int_pos( mlt_properties self, const char *name, int value, mlt_keyframe_type keyframe_type, int position, int length );
+extern int mlt_properties_anim_get_int( mlt_properties self, const char *name, int position, int length );
+extern int mlt_properties_anim_set_int( mlt_properties self, const char *name, int value, mlt_keyframe_type keyframe_type, int position, int length );
 
 extern int mlt_properties_set_rect( mlt_properties self, const char *name, mlt_rect value );
 extern mlt_rect mlt_properties_get_rect( mlt_properties self, const char *name );
 
-extern int mlt_properties_set_rect_pos( mlt_properties self, const char *name, mlt_rect value, mlt_keyframe_type keyframe_type, int position, int length );
-extern mlt_rect mlt_properties_get_rect_pos( mlt_properties self, const char *name, int position, int length );
+extern int mlt_properties_anim_set_rect( mlt_properties self, const char *name, mlt_rect value, mlt_keyframe_type keyframe_type, int position, int length );
+extern mlt_rect mlt_properties_anim_get_rect( mlt_properties self, const char *name, int position, int length );
 
 #endif

diff --git a/src/framework/mlt_property.c b/src/framework/mlt_property.c
index 4fe9f4a9e52562648e197b86f13d1941d6cf3ce6..84b6e1d29878b654c052cb7856735b63b60c5ab1 100644 (file)
--- a/src/framework/mlt_property.c
+++ b/src/framework/mlt_property.c
@@ -1092,7 +1092,7 @@ static void refresh_animation( mlt_property self, double fps, locale_t locale, i
        }
 }
 
-double mlt_property_get_double_pos( mlt_property self, double fps, locale_t locale, int position, int length )
+double mlt_property_anim_get_double( mlt_property self, double fps, locale_t locale, int position, int length )
 {
        double result;
        if ( self->animation || ( ( self->types & mlt_prop_string ) && self->prop_string ) )
@@ -1113,7 +1113,7 @@ double mlt_property_get_double_pos( mlt_property self, double fps, locale_t loca
        return result;
 }
 
-int mlt_property_get_int_pos( mlt_property self, double fps, locale_t locale, int position, int length )
+int mlt_property_anim_get_int( mlt_property self, double fps, locale_t locale, int position, int length )
 {
        int result;
        if ( self->animation || ( ( self->types & mlt_prop_string ) && self->prop_string ) )
@@ -1142,7 +1142,7 @@ int mlt_property_get_int_pos( mlt_property self, double fps, locale_t locale, in
  * \return false if successful, true to indicate error
  */
 
-int mlt_property_set_double_pos( mlt_property self, double value, double fps, locale_t locale,
+int mlt_property_anim_set_double( mlt_property self, double value, double fps, locale_t locale,
        mlt_keyframe_type keyframe_type, int position, int length )
 {
        int result;
@@ -1169,7 +1169,7 @@ int mlt_property_set_double_pos( mlt_property self, double value, double fps, lo
  * \return false if successful, true to indicate error
  */
 
-int mlt_property_set_int_pos( mlt_property self, int value, double fps, locale_t locale,
+int mlt_property_anim_set_int( mlt_property self, int value, double fps, locale_t locale,
        mlt_keyframe_type keyframe_type, int position, int length )
 {
        int result;
@@ -1296,7 +1296,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, locale_t locale )
  * \return false if successful, true to indicate error
  */
 
-int mlt_property_set_rect_pos( mlt_property self, mlt_rect value, double fps, locale_t locale,
+int mlt_property_anim_set_rect( mlt_property self, mlt_rect value, double fps, locale_t locale,
        mlt_keyframe_type keyframe_type, int position, int length )
 {
        int result;
@@ -1315,7 +1315,7 @@ int mlt_property_set_rect_pos( mlt_property self, mlt_rect value, double fps, lo
        return result;
 }
 
-mlt_rect mlt_property_get_rect_pos( mlt_property self, double fps, locale_t locale, int position, int length )
+mlt_rect mlt_property_anim_get_rect( mlt_property self, double fps, locale_t locale, int position, int length )
 {
        mlt_rect result;
        if ( self->animation || ( ( self->types & mlt_prop_string ) && self->prop_string ) )

diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
index af0501f1d44e51bb83bafec127cd226667868b03..bc3fb591a7da48b812721b28821f7091e4d735be 100644 (file)
--- a/src/framework/mlt_property.h
+++ b/src/framework/mlt_property.h
@@ -56,16 +56,16 @@ extern void mlt_property_pass( mlt_property self, mlt_property that );
 extern char *mlt_property_get_time( mlt_property self, mlt_time_format, double fps, locale_t );
 extern int mlt_property_interpolate( mlt_property self, mlt_property points[],
                                      double progress, double fps, locale_t locale, mlt_keyframe_type interp );
-extern double mlt_property_get_double_pos( mlt_property self, double fps, locale_t locale, int position, int length );
-extern int mlt_property_get_int_pos( mlt_property self, double fps, locale_t locale, int position, int length );
-extern int mlt_property_set_double_pos( mlt_property self, double value, double fps, locale_t locale,
+extern double mlt_property_anim_get_double( mlt_property self, double fps, locale_t locale, int position, int length );
+extern int mlt_property_anim_get_int( mlt_property self, double fps, locale_t locale, int position, int length );
+extern int mlt_property_anim_set_double( mlt_property self, double value, double fps, locale_t locale,
                                         mlt_keyframe_type keyframe_type, int position, int length );
-extern int mlt_property_set_int_pos( mlt_property self, int value, double fps, locale_t locale,
+extern int mlt_property_anim_set_int( mlt_property self, int value, double fps, locale_t locale,
                                      mlt_keyframe_type keyframe_type, int position, int length );
 extern int mlt_property_set_rect( mlt_property self, mlt_rect value );
 extern mlt_rect mlt_property_get_rect( mlt_property self, locale_t locale );
-extern int mlt_property_set_rect_pos( mlt_property self, mlt_rect value, double fps, locale_t locale,
+extern int mlt_property_anim_set_rect( mlt_property self, mlt_rect value, double fps, locale_t locale,
                                       mlt_keyframe_type keyframe_type, int position, int length );
-extern mlt_rect mlt_property_get_rect_pos( mlt_property self, double fps, locale_t locale, int position, int length );
+extern mlt_rect mlt_property_anim_get_rect( mlt_property self, double fps, locale_t locale, int position, int length );
 
 #endif

diff --git a/src/mlt++/MltProperties.cpp b/src/mlt++/MltProperties.cpp
index 45f91cfc061da491a15eed790e5abc66c3163881..e717ec98209fa60938f5ef9f76d4374a61aef478 100644 (file)
--- a/src/mlt++/MltProperties.cpp
+++ b/src/mlt++/MltProperties.cpp
@@ -337,14 +337,14 @@ char *Properties::get_time( const char *name, mlt_time_format format )
        return mlt_properties_get_time( get_properties(), name, format );
 }
 
-int Properties::get_int( const char *name, int position, int length )
+int Properties::anim_get_int( const char *name, int position, int length )
 {
-       return mlt_properties_get_int_pos( get_properties(), name, position, length );
+       return mlt_properties_anim_get_int( get_properties(), name, position, length );
 }
 
-int Properties::set( const char *name, int value, int position, int length, mlt_keyframe_type keyframe_type )
+int Properties::anim_set( const char *name, int value, int position, int length, mlt_keyframe_type keyframe_type )
 {
-       return mlt_properties_set_int_pos( get_properties(), name, value, keyframe_type, position, length );
+       return mlt_properties_anim_set_int( get_properties(), name, value, keyframe_type, position, length );
 }
 
 int Properties::set( const char *name, mlt_rect value )
@@ -363,12 +363,12 @@ mlt_rect Properties::get_rect( const char *name )
        return mlt_properties_get_rect( get_properties(), name );
 }
 
-int Properties::set(const char *name, mlt_rect value, int position, int length, mlt_keyframe_type keyframe_type)
+int Properties::anim_set(const char *name, mlt_rect value, int position, int length, mlt_keyframe_type keyframe_type)
 {
-       return mlt_properties_set_rect_pos( get_properties(), name, value, keyframe_type, position, length );
+       return mlt_properties_anim_set_rect( get_properties(), name, value, keyframe_type, position, length );
 }
 
-mlt_rect Properties::get_rect(const char *name, int position, int length)
+mlt_rect Properties::anim_get_rect(const char *name, int position, int length)
 {
-       return mlt_properties_get_rect_pos( get_properties(), name, position, length );
+       return mlt_properties_anim_get_rect( get_properties(), name, position, length );
 }

diff --git a/src/mlt++/MltProperties.h b/src/mlt++/MltProperties.h
index dc42fc843e483b979eb9015a49ff0c55f448e6f7..96d395ab907abddc756008bacb22da53c83536cd 100644 (file)
--- a/src/mlt++/MltProperties.h
+++ b/src/mlt++/MltProperties.h
@@ -97,15 +97,16 @@ namespace Mlt
                        int set_lcnumeric( const char *locale );
                        const char *get_lcnumeric( );
                        char *get_time( const char *name, mlt_time_format = mlt_time_smpte );
-                       int get_int( const char *name, int position, int length );
-                       int set( const char *name, int value, int position, int length,
+
+                       int anim_get_int( const char *name, int position, int length );
+                       int anim_set( const char *name, int value, int position, int length,
                                mlt_keyframe_type keyframe_type = mlt_keyframe_linear );
                        int set( const char *name, mlt_rect value );
                        int set( const char *name, double x, double y, double w, double h, double opacity = 1.0 );
                        mlt_rect get_rect( const char* name );
-                       int set( const char *name, mlt_rect value, int position, int length,
+                       int anim_set( const char *name, mlt_rect value, int position, int length,
                                mlt_keyframe_type keyframe_type = mlt_keyframe_linear );
-                       mlt_rect get_rect( const char *name, int position, int length );
+                       mlt_rect anim_get_rect( const char *name, int position, int length );
        };
 }
 

diff --git a/src/tests/test_properties/test_properties.cpp b/src/tests/test_properties/test_properties.cpp
index 9a061643bd340eed1f64033bb29de77d7a4f555e..c17580a448ebfcf1b90d38ff66f3334e1e9949f8 100644 (file)
--- a/src/tests/test_properties/test_properties.cpp
+++ b/src/tests/test_properties/test_properties.cpp
@@ -508,36 +508,36 @@ private Q_SLOTS:
         mlt_animation_close(a);
     }
 
-    void test_property_get_double_pos()
+    void test_property_anim_get_double()
     {
         double fps = 25.0;
         mlt_property p = mlt_property_init();
         mlt_property_set_string(p, "10=100; 20=200");
         QCOMPARE(mlt_property_get_double(p, fps, locale), 10.0);
-        QCOMPARE(mlt_property_get_double_pos(p, fps, locale, 0, 100), 100.0);
-        QCOMPARE(mlt_property_get_double_pos(p, fps, locale, 15, 100), 150.0);
-        QCOMPARE(mlt_property_get_double_pos(p, fps, locale, 20, 100), 200.0);
+        QCOMPARE(mlt_property_anim_get_double(p, fps, locale, 0, 100), 100.0);
+        QCOMPARE(mlt_property_anim_get_double(p, fps, locale, 15, 100), 150.0);
+        QCOMPARE(mlt_property_anim_get_double(p, fps, locale, 20, 100), 200.0);
 
         mlt_property_set_string(p, "1.5");
         QCOMPARE(mlt_property_get_double(p, fps, locale), 1.5);
-        QCOMPARE(mlt_property_get_double_pos(p, fps, locale, 10, 100), 1.5);
+        QCOMPARE(mlt_property_anim_get_double(p, fps, locale, 10, 100), 1.5);
 
         mlt_property_close(p);
     }
 
-    void test_property_get_int_pos()
+    void test_property_anim_get_int()
     {
         double fps = 25.0;
         mlt_property p = mlt_property_init();
         mlt_property_set_string(p, "10=100; 20=200");
         QCOMPARE(mlt_property_get_int(p, fps, locale), 10);
-        QCOMPARE(mlt_property_get_int_pos(p, fps, locale, 0, 100), 100);
-        QCOMPARE(mlt_property_get_int_pos(p, fps, locale, 15, 100), 150);
-        QCOMPARE(mlt_property_get_int_pos(p, fps, locale, 20, 100), 200);
+        QCOMPARE(mlt_property_anim_get_int(p, fps, locale, 0, 100), 100);
+        QCOMPARE(mlt_property_anim_get_int(p, fps, locale, 15, 100), 150);
+        QCOMPARE(mlt_property_anim_get_int(p, fps, locale, 20, 100), 200);
 
         mlt_property_set_string(p, "1.5");
         QCOMPARE(mlt_property_get_int(p, fps, locale), 1);
-        QCOMPARE(mlt_property_get_int_pos(p, fps, locale, 10, 100), 1);
+        QCOMPARE(mlt_property_anim_get_int(p, fps, locale, 10, 100), 1);
 
         mlt_property_close(p);
     }
@@ -586,33 +586,33 @@ private Q_SLOTS:
         mlt_animation_close(a);
     }
 
-    void test_property_set_double_pos()
+    void test_property_anim_set_double()
     {
         double fps = 25.0;
         mlt_property p = mlt_property_init();
         mlt_property_set_string(p, "10=100; 20=200");
-        mlt_property_set_double_pos(p, 1.5, fps, locale, mlt_keyframe_linear, 30, 100);
+        mlt_property_anim_set_double(p, 1.5, fps, locale, mlt_keyframe_linear, 30, 100);
         QCOMPARE(mlt_property_get_double(p, fps, locale), 10.0);
-        QCOMPARE(mlt_property_get_double_pos(p, fps, locale, 0, 100), 100.0);
-        QCOMPARE(mlt_property_get_double_pos(p, fps, locale, 15, 100), 150.0);
-        QCOMPARE(mlt_property_get_double_pos(p, fps, locale, 20, 100), 200.0);
-        QCOMPARE(mlt_property_get_double_pos(p, fps, locale, 25, 100), 100.75);
-        QCOMPARE(mlt_property_get_double_pos(p, fps, locale, 30, 100), 1.5);
+        QCOMPARE(mlt_property_anim_get_double(p, fps, locale, 0, 100), 100.0);
+        QCOMPARE(mlt_property_anim_get_double(p, fps, locale, 15, 100), 150.0);
+        QCOMPARE(mlt_property_anim_get_double(p, fps, locale, 20, 100), 200.0);
+        QCOMPARE(mlt_property_anim_get_double(p, fps, locale, 25, 100), 100.75);
+        QCOMPARE(mlt_property_anim_get_double(p, fps, locale, 30, 100), 1.5);
         mlt_property_close(p);
     }
 
-    void test_property_set_int_pos()
+    void test_property_anim_set_int()
     {
         double fps = 25.0;
         mlt_property p = mlt_property_init();
         mlt_property_set_string(p, "10=100; 20=200");
-        mlt_property_set_int_pos(p, 300, fps, locale, mlt_keyframe_linear, 30, 100);
+        mlt_property_anim_set_int(p, 300, fps, locale, mlt_keyframe_linear, 30, 100);
         QCOMPARE(mlt_property_get_int(p, fps, locale), 10);
-        QCOMPARE(mlt_property_get_int_pos(p, fps, locale, 0, 100), 100);
-        QCOMPARE(mlt_property_get_int_pos(p, fps, locale, 15, 100), 150);
-        QCOMPARE(mlt_property_get_int_pos(p, fps, locale, 20, 100), 200);
-        QCOMPARE(mlt_property_get_int_pos(p, fps, locale, 25, 100), 250);
-        QCOMPARE(mlt_property_get_int_pos(p, fps, locale, 30, 100), 300);
+        QCOMPARE(mlt_property_anim_get_int(p, fps, locale, 0, 100), 100);
+        QCOMPARE(mlt_property_anim_get_int(p, fps, locale, 15, 100), 150);
+        QCOMPARE(mlt_property_anim_get_int(p, fps, locale, 20, 100), 200);
+        QCOMPARE(mlt_property_anim_get_int(p, fps, locale, 25, 100), 250);
+        QCOMPARE(mlt_property_anim_get_int(p, fps, locale, 30, 100), 300);
         mlt_property_close(p);
     }
 
@@ -632,27 +632,27 @@ private Q_SLOTS:
         p.set_lcnumeric("POSIX");
 
         // Construct animation from scratch
-        p.set("foo",   0,  0, len);
-        p.set("foo", 100, 50, len, mlt_keyframe_smooth);
-        QCOMPARE(p.get_int("foo",  0, len), 0);
-        QCOMPARE(p.get_int("foo", 25, len), 50);
-        QCOMPARE(p.get_int("foo", 50, len), 100);
+        p.anim_set("foo",   0,  0, len);
+        p.anim_set("foo", 100, 50, len, mlt_keyframe_smooth);
+        QCOMPARE(p.anim_get_int("foo",  0, len), 0);
+        QCOMPARE(p.anim_get_int("foo", 25, len), 50);
+        QCOMPARE(p.anim_get_int("foo", 50, len), 100);
         QCOMPARE(p.get("foo"), "0=0;50~=100");
 
         // Animation from string value
         p.set("foo", "10=100;20=200");
-        QCOMPARE(p.get_int("foo",  0, len), 100);
-        QCOMPARE(p.get_int("foo", 15, len), 150);
-        QCOMPARE(p.get_int("foo", 20, len), 200);
+        QCOMPARE(p.anim_get_int("foo",  0, len), 100);
+        QCOMPARE(p.anim_get_int("foo", 15, len), 150);
+        QCOMPARE(p.anim_get_int("foo", 20, len), 200);
 
         // Animation from string using time clock values
         // Need to set a profile so fps can be used to convert time to frames.
         Profile profile("dv_pal");
         p.set("_profile", profile.get_profile(), 0);
         p.set("foo", ":0.0=100; :2.0=200");
-        QCOMPARE(p.get_int("foo",  0, len), 100);
-        QCOMPARE(p.get_int("foo", 25, len), 150);
-        QCOMPARE(p.get_int("foo", 50, len), 200);
+        QCOMPARE(p.anim_get_int("foo",  0, len), 100);
+        QCOMPARE(p.anim_get_int("foo", 25, len), 150);
+        QCOMPARE(p.anim_get_int("foo", 50, len), 200);
     }
 
     void test_mlt_rect()
@@ -741,56 +741,56 @@ private Q_SLOTS:
         p.set_lcnumeric("POSIX");
 
         // Construct animation from scratch
-        p.set("key", r1,  0, len);
-        p.set("key", r2, 50, len);
-        QCOMPARE(p.get_rect("key",  0, len).x, 0.0);
-        QCOMPARE(p.get_rect("key", 25, len).x, 50.0);
-        QCOMPARE(p.get_rect("key", 25, len).y, 50.0);
-        QCOMPARE(p.get_rect("key", 25, len).w, 300.0);
-        QCOMPARE(p.get_rect("key", 25, len).h, 300.0);
-        QCOMPARE(p.get_rect("key", 25, len).o, 0.5);
-        QCOMPARE(p.get_rect("key", 50, len).x, 100.0);
+        p.anim_set("key", r1,  0, len);
+        p.anim_set("key", r2, 50, len);
+        QCOMPARE(p.anim_get_rect("key",  0, len).x, 0.0);
+        QCOMPARE(p.anim_get_rect("key", 25, len).x, 50.0);
+        QCOMPARE(p.anim_get_rect("key", 25, len).y, 50.0);
+        QCOMPARE(p.anim_get_rect("key", 25, len).w, 300.0);
+        QCOMPARE(p.anim_get_rect("key", 25, len).h, 300.0);
+        QCOMPARE(p.anim_get_rect("key", 25, len).o, 0.5);
+        QCOMPARE(p.anim_get_rect("key", 50, len).x, 100.0);
         QCOMPARE(p.get("key"), "0=0 0 200 200 0;50=100 100 400 400 1");
 
         // Animation from string value
-        QCOMPARE(p.get_rect("key",  0, len).x, 0.0);
-        QCOMPARE(p.get_rect("key",  0, len).y, 0.0);
-        QCOMPARE(p.get_rect("key",  0, len).w, 200.0);
-        QCOMPARE(p.get_rect("key",  0, len).h, 200.0);
-        QCOMPARE(p.get_rect("key",  0, len).o, 0.0);
-        QCOMPARE(p.get_rect("key", 50, len).x, 100.0);
-        QCOMPARE(p.get_rect("key", 50, len).y, 100.0);
-        QCOMPARE(p.get_rect("key", 50, len).w, 400.0);
-        QCOMPARE(p.get_rect("key", 50, len).h, 400.0);
-        QCOMPARE(p.get_rect("key", 50, len).o, 1.0);
-        QCOMPARE(p.get_rect("key", 15, len).x, 30.0);
-        QCOMPARE(p.get_rect("key", 15, len).y, 30.0);
-        QCOMPARE(p.get_rect("key", 15, len).w, 260.0);
-        QCOMPARE(p.get_rect("key", 15, len).h, 260.0);
-        QCOMPARE(p.get_rect("key", 15, len).o, 0.3);
+        QCOMPARE(p.anim_get_rect("key",  0, len).x, 0.0);
+        QCOMPARE(p.anim_get_rect("key",  0, len).y, 0.0);
+        QCOMPARE(p.anim_get_rect("key",  0, len).w, 200.0);
+        QCOMPARE(p.anim_get_rect("key",  0, len).h, 200.0);
+        QCOMPARE(p.anim_get_rect("key",  0, len).o, 0.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).x, 100.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).y, 100.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).w, 400.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).h, 400.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).o, 1.0);
+        QCOMPARE(p.anim_get_rect("key", 15, len).x, 30.0);
+        QCOMPARE(p.anim_get_rect("key", 15, len).y, 30.0);
+        QCOMPARE(p.anim_get_rect("key", 15, len).w, 260.0);
+        QCOMPARE(p.anim_get_rect("key", 15, len).h, 260.0);
+        QCOMPARE(p.anim_get_rect("key", 15, len).o, 0.3);
 
         // Smooth animation
         p.set("key", "0~=0/0:200x200:0; 50=100/100:400x400:1");
-        QCOMPARE(p.get_rect("key",  0, len).x, 0.0);
-        QCOMPARE(p.get_rect("key",  0, len).y, 0.0);
-        QCOMPARE(p.get_rect("key",  0, len).w, 200.0);
-        QCOMPARE(p.get_rect("key",  0, len).h, 200.0);
-        QCOMPARE(p.get_rect("key",  0, len).o, 0.0);
-        QCOMPARE(p.get_rect("key", 50, len).x, 100.0);
-        QCOMPARE(p.get_rect("key", 50, len).y, 100.0);
-        QCOMPARE(p.get_rect("key", 50, len).w, 400.0);
-        QCOMPARE(p.get_rect("key", 50, len).h, 400.0);
-        QCOMPARE(p.get_rect("key", 50, len).o, 1.0);
-        QCOMPARE(p.get_rect("key", 15, len).x, 25.8);
-        QCOMPARE(p.get_rect("key", 15, len).y, 25.8);
-        QCOMPARE(p.get_rect("key", 15, len).w, 251.6);
-        QCOMPARE(p.get_rect("key", 15, len).h, 251.6);
-        QCOMPARE(p.get_rect("key", 15, len).o, 0.258);
+        QCOMPARE(p.anim_get_rect("key",  0, len).x, 0.0);
+        QCOMPARE(p.anim_get_rect("key",  0, len).y, 0.0);
+        QCOMPARE(p.anim_get_rect("key",  0, len).w, 200.0);
+        QCOMPARE(p.anim_get_rect("key",  0, len).h, 200.0);
+        QCOMPARE(p.anim_get_rect("key",  0, len).o, 0.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).x, 100.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).y, 100.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).w, 400.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).h, 400.0);
+        QCOMPARE(p.anim_get_rect("key", 50, len).o, 1.0);
+        QCOMPARE(p.anim_get_rect("key", 15, len).x, 25.8);
+        QCOMPARE(p.anim_get_rect("key", 15, len).y, 25.8);
+        QCOMPARE(p.anim_get_rect("key", 15, len).w, 251.6);
+        QCOMPARE(p.anim_get_rect("key", 15, len).h, 251.6);
+        QCOMPARE(p.anim_get_rect("key", 15, len).o, 0.258);
 
         // Using percentages
         p.set("key", "0=0 0; 50=100% 200%");
-        QCOMPARE(p.get_rect("key", 25, len).x, 0.5);
-        QCOMPARE(p.get_rect("key", 25, len).y, 1.0);
+        QCOMPARE(p.anim_get_rect("key", 25, len).x, 0.5);
+        QCOMPARE(p.anim_get_rect("key", 25, len).y, 1.0);
     }
 
 };