#include <Elementary.h>
-#include "elm_priv.h"
/**
* @addtogroup Animator Animator
*
* Support normalized frame value for animation.
*/
-#define MAGIC_OBJ_ANIMATOR 0x40777770
struct _Animator
{
void *animator_arg;
void (*completion_op) (void *data);
void *completion_arg;
- int magic;
Eina_Bool auto_reverse:1;
Eina_Bool on_animating:1;
};
static unsigned int _animator_compute_no_reverse_repeat_count(unsigned int cnt);
static int _animator_animate_cb(void *data);
static void _delete_animator(Elm_Animator *animator);
-static void _animator_parent_del(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__);
+//static void _animator_parent_del(void *data);
static unsigned int
_animator_compute_reverse_repeat_count(unsigned int cnt)
_animator_animate_cb(void *data)
{
Elm_Animator *animator = (Elm_Animator *) data;
- double elapsed_time, frame;
+ double elapsed_time, frame, cur_time;
animator->cur_time = ecore_loop_time_get();
return ECORE_CALLBACK_RENEW;
}
-
+/*
static void
-_animator_parent_del(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
+_animator_parent_del(void *data)
{
Elm_Animator *animator = data;
elm_animator_del(data);
}
-
+*/
/**
* Get the value of reverse mode.
*
EAPI Eina_Bool
elm_animator_auto_reverse_get(Elm_Animator *animator)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return EINA_FALSE;
return animator->auto_reverse;
}
EAPI unsigned int
elm_animator_repeat_get(Elm_Animator *animator)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return EINA_FALSE;
return animator->repeat_cnt;
}
EAPI void
elm_animator_auto_reverse_set(Elm_Animator *animator, Eina_Bool reverse)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return;
if (animator->auto_reverse == reverse)
return;
elm_animator_curve_style_set(Elm_Animator *animator,
Elm_Animator_Curve_Style cs)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return;
switch (cs)
EAPI void
elm_animator_duration_set(Elm_Animator *animator, double duration)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return;
if (animator->on_animating)
return;
Elm_Animator *animator,
double frame), void *data)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return;
if (animator->on_animating)
return;
EAPI Elm_Animator *
elm_animator_add(Evas_Object *parent)
{
- Elm_Animator *animator = ELM_NEW(Elm_Animator);
+ Elm_Animator *animator = calloc(1, sizeof(Elm_Animator));
if (!animator)
return NULL;
-
- animator->parent = parent;
- animator->magic = MAGIC_OBJ_ANIMATOR;
-
elm_animator_auto_reverse_set(animator, EINA_FALSE);
elm_animator_curve_style_set(animator, ELM_ANIMATOR_CURVE_LINEAR);
- if (parent) {
+/* if (parent) {
evas_object_event_callback_add(parent, EVAS_CALLBACK_DEL,
_animator_parent_del, animator);
- }
+ } */
+
+ animator->parent = parent;
return animator;
}
EAPI Eina_Bool
elm_animator_operating_get(Elm_Animator *animator)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return EINA_FALSE;
return animator->on_animating;
}
EAPI void
elm_animator_del(Elm_Animator *animator)
{
- if(animator->magic != MAGIC_OBJ_ANIMATOR) {
- return;
- }
+ if (!animator)
+ return;
_delete_animator(animator);
- if(animator->parent) {
+/* if(animator->parent) {
evas_object_event_callback_del(animator->parent, EVAS_CALLBACK_DEL, _animator_parent_del);
- }
+ } */
- memset(animator, 0x0, sizeof(Elm_Animator));
free(animator);
}
elm_animator_completion_callback_set(Elm_Animator *animator,
void (*func) (void *data), void *data)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return;
if (animator->on_animating)
return;
EAPI void
elm_animator_pause(Elm_Animator *animator)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if(!animator)
return;
if(!animator->on_animating)
EAPI void
elm_animator_resume(Elm_Animator *animator)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if(!animator)
return;
if(!animator->on_animating)
EAPI void
elm_animator_stop(Elm_Animator *animator)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return;
animator->on_animating = EINA_FALSE;
_delete_animator(animator);
EAPI void
elm_animator_repeat_set(Elm_Animator *animator, unsigned int repeat_cnt)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return;
if (!animator->auto_reverse)
animator->repeat_cnt = repeat_cnt;
EAPI void
elm_animator_animate(Elm_Animator *animator)
{
- if (animator->magic != MAGIC_OBJ_ANIMATOR)
+ if (!animator)
return;
if (!animator->animator_op)
return;