Fix warning related to Ecore Api changes.
Fix some formatting. SVN revision: 50085
This commit is contained in:
parent
25ef450968
commit
12e6621218
|
@ -31,9 +31,9 @@ static double _animator_curve_in(double frame);
|
|||
static double _animator_curve_out(double frame);
|
||||
static unsigned int _animator_compute_reverse_repeat_count(unsigned int cnt);
|
||||
static unsigned int _animator_compute_no_reverse_repeat_count(unsigned int cnt);
|
||||
static int _animator_animate_cb(void *data);
|
||||
static Eina_Bool _animator_animate_cb(void *data);
|
||||
static void _delete_animator(Elm_Animator *animator);
|
||||
static void _animator_parent_del(void *data);
|
||||
static void _animator_parent_del(void *data, Evas *evas, Evas_Object *obj, void *event);
|
||||
|
||||
static unsigned int
|
||||
_animator_compute_reverse_repeat_count(unsigned int cnt)
|
||||
|
@ -84,7 +84,7 @@ _delete_animator(Elm_Animator *animator)
|
|||
}
|
||||
}
|
||||
|
||||
static int
|
||||
static Eina_Bool
|
||||
_animator_animate_cb(void *data)
|
||||
{
|
||||
Elm_Animator *animator = (Elm_Animator *) data;
|
||||
|
@ -129,7 +129,7 @@ _animator_animate_cb(void *data)
|
|||
}
|
||||
|
||||
static void
|
||||
_animator_parent_del(void *data)
|
||||
_animator_parent_del(void *data, Evas *evas, Evas_Object *obj, void *event)
|
||||
{
|
||||
elm_animator_del(data);
|
||||
}
|
||||
|
@ -145,8 +145,7 @@ _animator_parent_del(void *data)
|
|||
EAPI Eina_Bool
|
||||
elm_animator_auto_reverse_get(Elm_Animator *animator)
|
||||
{
|
||||
if (!animator)
|
||||
return EINA_FALSE;
|
||||
if (!animator) return EINA_FALSE;
|
||||
return animator->auto_reverse;
|
||||
}
|
||||
|
||||
|
@ -161,8 +160,7 @@ elm_animator_auto_reverse_get(Elm_Animator *animator)
|
|||
EAPI unsigned int
|
||||
elm_animator_repeat_get(Elm_Animator *animator)
|
||||
{
|
||||
if (!animator)
|
||||
return EINA_FALSE;
|
||||
if (!animator) return EINA_FALSE;
|
||||
return animator->repeat_cnt;
|
||||
}
|
||||
|
||||
|
@ -177,17 +175,19 @@ elm_animator_repeat_get(Elm_Animator *animator)
|
|||
EAPI void
|
||||
elm_animator_auto_reverse_set(Elm_Animator *animator, Eina_Bool reverse)
|
||||
{
|
||||
if (!animator)
|
||||
return;
|
||||
if (animator->auto_reverse == reverse)
|
||||
return;
|
||||
if (!animator) return;
|
||||
if (animator->auto_reverse == reverse) return;
|
||||
animator->auto_reverse = reverse;
|
||||
if (reverse)
|
||||
{
|
||||
animator->repeat_cnt =
|
||||
_animator_compute_reverse_repeat_count(animator->repeat_cnt);
|
||||
}
|
||||
else
|
||||
{
|
||||
animator->repeat_cnt =
|
||||
_animator_compute_no_reverse_repeat_count(animator->repeat_cnt);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -199,12 +199,9 @@ elm_animator_auto_reverse_set(Elm_Animator *animator, Eina_Bool reverse)
|
|||
* @ingroup Animator
|
||||
*/
|
||||
EAPI void
|
||||
elm_animator_curve_style_set(Elm_Animator *animator,
|
||||
Elm_Animator_Curve_Style cs)
|
||||
elm_animator_curve_style_set(Elm_Animator *animator, Elm_Animator_Curve_Style cs)
|
||||
{
|
||||
if (!animator)
|
||||
return;
|
||||
|
||||
if (!animator) return;
|
||||
switch (cs)
|
||||
{
|
||||
case ELM_ANIMATOR_CURVE_LINEAR:
|
||||
|
@ -236,10 +233,8 @@ elm_animator_curve_style_set(Elm_Animator *animator,
|
|||
EAPI void
|
||||
elm_animator_duration_set(Elm_Animator *animator, double duration)
|
||||
{
|
||||
if (!animator)
|
||||
return;
|
||||
if (animator->on_animating)
|
||||
return;
|
||||
if (!animator) return;
|
||||
if (animator->on_animating) return;
|
||||
animator->duration = duration;
|
||||
}
|
||||
|
||||
|
@ -259,10 +254,8 @@ elm_animator_operation_callback_set(Elm_Animator *animator,
|
|||
Elm_Animator *animator,
|
||||
double frame), void *data)
|
||||
{
|
||||
if (!animator)
|
||||
return;
|
||||
if (animator->on_animating)
|
||||
return;
|
||||
if (!animator) return;
|
||||
if (animator->on_animating) return;
|
||||
animator->animator_op = func;
|
||||
animator->animator_arg = data;
|
||||
}
|
||||
|
@ -280,8 +273,7 @@ elm_animator_add(Evas_Object *parent)
|
|||
{
|
||||
Elm_Animator *animator = calloc(1, sizeof(Elm_Animator));
|
||||
|
||||
if (!animator)
|
||||
return NULL;
|
||||
if (!animator) return NULL;
|
||||
elm_animator_auto_reverse_set(animator, EINA_FALSE);
|
||||
elm_animator_curve_style_set(animator, ELM_ANIMATOR_CURVE_LINEAR);
|
||||
|
||||
|
@ -305,8 +297,7 @@ elm_animator_add(Evas_Object *parent)
|
|||
EAPI Eina_Bool
|
||||
elm_animator_operating_get(Elm_Animator *animator)
|
||||
{
|
||||
if (!animator)
|
||||
return EINA_FALSE;
|
||||
if (!animator) return EINA_FALSE;
|
||||
return animator->on_animating;
|
||||
}
|
||||
|
||||
|
@ -320,12 +311,12 @@ elm_animator_operating_get(Elm_Animator *animator)
|
|||
EAPI void
|
||||
elm_animator_del(Elm_Animator *animator)
|
||||
{
|
||||
if (!animator)
|
||||
return;
|
||||
if (!animator) return;
|
||||
_delete_animator(animator);
|
||||
|
||||
if(animator->parent)
|
||||
evas_object_event_callback_del(animator->parent, EVAS_CALLBACK_DEL, _animator_parent_del);
|
||||
evas_object_event_callback_del(animator->parent, EVAS_CALLBACK_DEL,
|
||||
_animator_parent_del);
|
||||
free(animator);
|
||||
}
|
||||
|
||||
|
@ -342,10 +333,8 @@ EAPI void
|
|||
elm_animator_completion_callback_set(Elm_Animator *animator,
|
||||
void (*func) (void *data), void *data)
|
||||
{
|
||||
if (!animator)
|
||||
return;
|
||||
if (animator->on_animating)
|
||||
return;
|
||||
if (!animator) return;
|
||||
if (animator->on_animating) return;
|
||||
animator->completion_op = func;
|
||||
animator->completion_arg = data;
|
||||
}
|
||||
|
@ -360,8 +349,7 @@ elm_animator_completion_callback_set(Elm_Animator *animator,
|
|||
EAPI void
|
||||
elm_animator_stop(Elm_Animator *animator)
|
||||
{
|
||||
if (!animator)
|
||||
return;
|
||||
if (!animator) return;
|
||||
animator->on_animating = EINA_FALSE;
|
||||
_delete_animator(animator);
|
||||
}
|
||||
|
@ -377,12 +365,14 @@ elm_animator_stop(Elm_Animator *animator)
|
|||
EAPI void
|
||||
elm_animator_repeat_set(Elm_Animator *animator, unsigned int repeat_cnt)
|
||||
{
|
||||
if (!animator)
|
||||
return;
|
||||
if (!animator) return;
|
||||
if (!animator->auto_reverse)
|
||||
animator->repeat_cnt = repeat_cnt;
|
||||
else
|
||||
animator->repeat_cnt = _animator_compute_reverse_repeat_count(repeat_cnt);
|
||||
{
|
||||
animator->repeat_cnt =
|
||||
_animator_compute_reverse_repeat_count(repeat_cnt);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -395,10 +385,8 @@ elm_animator_repeat_set(Elm_Animator *animator, unsigned int repeat_cnt)
|
|||
EAPI void
|
||||
elm_animator_animate(Elm_Animator *animator)
|
||||
{
|
||||
if (!animator)
|
||||
return;
|
||||
if (!animator->animator_op)
|
||||
return;
|
||||
if (!animator) return;
|
||||
if (!animator->animator_op) return;
|
||||
animator->begin_time = ecore_loop_time_get();
|
||||
animator->on_animating = EINA_TRUE;
|
||||
animator->cur_repeat_cnt = animator->repeat_cnt;
|
||||
|
|
Loading…
Reference in New Issue