From: ChunEon Park <chuneon.park@samsung.com>

Subject: [E-devel]  [Patch] elm_animator

Please check this small patch.
Added one miner API.

Thanks.

The Hermet

SVN revision: 55251

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 49af14a..e9ed6b8 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -2264,21 +2264,22 @@ extern "C" {
    */
    typedef void (*Elm_Animator_Completion_Cb) (void *data);
 
-   EAPI Elm_Animator* elm_animator_add(Evas_Object *parent);
-   EAPI void          elm_animator_del(Elm_Animator *animator) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_duration_set(Elm_Animator *animator, double duration) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_operation_callback_set(Elm_Animator *animator, Elm_Animator_Operation_Cb func, void *data) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_completion_callback_set(Elm_Animator *animator, Elm_Animator_Completion_Cb func, void *data) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_stop(Elm_Animator *animator) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_repeat_set(Elm_Animator *animator, unsigned int repeat_cnt) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_animate(Elm_Animator *animator) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_curve_style_set(Elm_Animator *animator, Elm_Animator_Curve_Style cs) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_auto_reverse_set(Elm_Animator *animator, Eina_Bool reverse) EINA_ARG_NONNULL(1);
-   EAPI Eina_Bool     elm_animator_auto_reverse_get(const Elm_Animator *animator) EINA_ARG_NONNULL(1);
-   EAPI Eina_Bool     elm_animator_operating_get(const Elm_Animator *animator) EINA_ARG_NONNULL(1);
-   EAPI unsigned int  elm_animator_repeat_get(const Elm_Animator *animator) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_pause(Elm_Animator *animator) EINA_ARG_NONNULL(1);
-   EAPI void          elm_animator_resume(Elm_Animator *animator) EINA_ARG_NONNULL(1);
+   EAPI Elm_Animator*            elm_animator_add(Evas_Object *parent);
+   EAPI void                     elm_animator_del(Elm_Animator *animator) EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_duration_set(Elm_Animator *animator, double duration) EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_operation_callback_set(Elm_Animator *animator, Elm_Animator_Operation_Cb func, void *data) EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_completion_callback_set(Elm_Animator *animator, Elm_Animator_Completion_Cb func, void *data) EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_stop(Elm_Animator *animator) EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_repeat_set(Elm_Animator *animator, unsigned int repeat_cnt) EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_animate(Elm_Animator *animator) EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_curve_style_set(Elm_Animator *animator, Elm_Animator_Curve_Style cs) EINA_ARG_NONNULL(1);
+   EAPI Elm_Animator_Curve_Style elm_animator_curve_style_get(const Elm_Animator *animator); EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_auto_reverse_set(Elm_Animator *animator, Eina_Bool reverse) EINA_ARG_NONNULL(1);
+   EAPI Eina_Bool                elm_animator_auto_reverse_get(const Elm_Animator *animator) EINA_ARG_NONNULL(1);
+   EAPI Eina_Bool                elm_animator_operating_get(const Elm_Animator *animator) EINA_ARG_NONNULL(1);
+   EAPI unsigned int             elm_animator_repeat_get(const Elm_Animator *animator) EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_pause(Elm_Animator *animator) EINA_ARG_NONNULL(1);
+   EAPI void                     elm_animator_resume(Elm_Animator *animator) EINA_ARG_NONNULL(1);
 
    /* calendar */
    typedef enum 

diff --git a/src/lib/elm_animator.c b/src/lib/elm_animator.c
index 20a1d1c..1c642c8 100644 (file)
--- a/src/lib/elm_animator.c
+++ b/src/lib/elm_animator.c
@@ -38,11 +38,11 @@ struct _Elm_Animator
    double duration;
    unsigned int repeat_cnt;
    unsigned int cur_repeat_cnt;
-   double (*curve_op) (double frame);
    void (*animator_op) (void *data, Elm_Animator *animator, double frame);
    void *animator_arg;
    void (*completion_op) (void *data);
    void *completion_arg;
+   Elm_Animator_Curve_Style curve_style;
    Eina_Bool auto_reverse:1;
    Eina_Bool on_animating:1;
 };
@@ -111,7 +111,24 @@ _animator_animate_cb(void *data)
    animator->cur_time = ecore_loop_time_get();
    elapsed_time = animator->cur_time - animator->begin_time;
    if (elapsed_time > animator->duration) elapsed_time = animator->duration;
-   frame = animator->curve_op(elapsed_time / animator->duration);
+
+   //Compute current frame
+   switch (animator->curve_style)
+     {
+       case ELM_ANIMATOR_CURVE_IN_OUT:
+             frame = _animator_curve_in_out(elapsed_time / animator->duration);
+             break;
+       case ELM_ANIMATOR_CURVE_IN:
+             frame = _animator_curve_in(elapsed_time / animator->duration);
+             break;
+       case ELM_ANIMATOR_CURVE_OUT:
+             frame = _animator_curve_out(elapsed_time / animator->duration);
+             break;
+       default:
+         frame = _animator_curve_linear(elapsed_time / animator->duration);
+             break;
+     }
+       
    //Reverse?
    if (animator->auto_reverse)
      {
@@ -178,6 +195,22 @@ elm_animator_repeat_get(const Elm_Animator *animator)
 }
 
 /**
+ * Set the animation acceleration style.
+ *
+ * @param[in] animator Animator object
+ * @param[in] cs Curve style. Default is ELM_ANIMATOR_CURVE_LINEAR
+ *
+ * @ingroup Animator
+ */
+EAPI Elm_Animator_Curve_Style 
+elm_animator_curve_style_get(const Elm_Animator *animator)
+{
+   ELM_ANIMATOR_CHECK_OR_RETURN(animator, ELM_ANIMATOR_CURVE_LINEAR);
+  
+       return animator->curve_style;
+}
+
+/**
  * Set auto reverse function.
  *
  * @param[in] animator Animator object
@@ -212,24 +245,8 @@ elm_animator_curve_style_set(Elm_Animator *animator,
                             Elm_Animator_Curve_Style cs)
 {
    ELM_ANIMATOR_CHECK_OR_RETURN(animator);
-   switch (cs)
-     {
-     case ELM_ANIMATOR_CURVE_LINEAR:
-       animator->curve_op = _animator_curve_linear;
-       break;
-     case ELM_ANIMATOR_CURVE_IN_OUT:
-       animator->curve_op = _animator_curve_in_out;
-       break;
-     case ELM_ANIMATOR_CURVE_IN:
-       animator->curve_op = _animator_curve_in;
-       break;
-     case ELM_ANIMATOR_CURVE_OUT:
-       animator->curve_op = _animator_curve_out;
-       break;
-     default:
-       animator->curve_op = _animator_curve_linear;
-       break;
-     }
+
+       animator->curve_style = cs;
 }
 
 /**