enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

efl_animation: Remove unnecessary macro

This commit is contained in:
Jaehyun Cho 2017-10-23 13:58:59 +09:00
parent 348fc0b06e
commit 74155b6e34
34 changed files with 49 additions and 496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/lib/evas/canvas/efl_animation.c
View File

@ -5,7 +5,6 @@ _target_del_cb(void *data, const Efl_Event *event EINA_UNUSED)
{
Eo *eo_obj = data;
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
EFL_ANIMATION_DATA_GET(eo_obj, pd);
pd->target = NULL;
@ -16,18 +15,14 @@ _efl_animation_target_set(Eo *eo_obj,
Efl_Animation_Data *pd,
Efl_Canvas_Object *target)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
efl_event_callback_add(target, EFL_EVENT_DEL, _target_del_cb, eo_obj);
pd->target = target;
}
EOLIAN static Efl_Canvas_Object *
_efl_animation_target_get(Eo *eo_obj, Efl_Animation_Data *pd)
_efl_animation_target_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj, NULL);
return pd->target;
}
@ -36,82 +31,60 @@ _efl_animation_duration_set(Eo *eo_obj,
Efl_Animation_Data *pd,
double duration)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
efl_animation_total_duration_set(eo_obj, duration);
pd->duration = duration;
}
EOLIAN static double
_efl_animation_duration_get(Eo *eo_obj, Efl_Animation_Data *pd)
_efl_animation_duration_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj, 0.0);
return pd->duration;
}
EOLIAN static void
_efl_animation_duration_only_set(Eo *eo_obj,
_efl_animation_duration_only_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd,
double duration)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
pd->duration = duration;
}
EOLIAN static void
_efl_animation_total_duration_set(Eo *eo_obj,
_efl_animation_total_duration_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd,
double total_duration)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
pd->total_duration = total_duration;
}
EOLIAN static double
_efl_animation_total_duration_get(Eo *eo_obj, Efl_Animation_Data *pd)
_efl_animation_total_duration_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj, 0.0);
return pd->total_duration;
}
EOLIAN static Eina_Bool
_efl_animation_is_deleted(Eo *eo_obj, Efl_Animation_Data *pd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, EINA_TRUE);
return pd->is_deleted;
}
EOLIAN static void
_efl_animation_final_state_keep_set(Eo *eo_obj,
_efl_animation_final_state_keep_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd,
Eina_Bool keep_final_state)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
if (pd->keep_final_state == keep_final_state) return;
pd->keep_final_state = !!keep_final_state;
}
EOLIAN static Eina_Bool
_efl_animation_final_state_keep_get(Eo *eo_obj, Efl_Animation_Data *pd)
_efl_animation_final_state_keep_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj, EINA_FALSE);
return pd->keep_final_state;
}
EOLIAN static Efl_Animation_Object *
_efl_animation_object_create(Eo *eo_obj, Efl_Animation_Data *pd EINA_UNUSED)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj, NULL);
Efl_Animation_Object *anim_obj
= efl_add(EFL_ANIMATION_OBJECT_CLASS, NULL);
@ -134,33 +107,26 @@ _efl_animation_object_create(Eo *eo_obj, Efl_Animation_Data *pd EINA_UNUSED)
}
EOLIAN static void
_efl_animation_repeat_mode_set(Eo *eo_obj,
_efl_animation_repeat_mode_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd,
Efl_Animation_Repeat_Mode mode)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
if ((mode == EFL_ANIMATION_REPEAT_MODE_RESTART) ||
(mode == EFL_ANIMATION_REPEAT_MODE_REVERSE))
pd->repeat_mode = mode;
}
EOLIAN static Efl_Animation_Repeat_Mode
_efl_animation_repeat_mode_get(Eo *eo_obj, Efl_Animation_Data *pd)
_efl_animation_repeat_mode_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj,
EFL_ANIMATION_REPEAT_MODE_RESTART);
return pd->repeat_mode;
}
EOLIAN static void
_efl_animation_repeat_count_set(Eo *eo_obj,
_efl_animation_repeat_count_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd,
int count)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
//EFL_ANIMATION_REPEAT_INFINITE repeats animation infinitely
if ((count < 0) && (count != EFL_ANIMATION_REPEAT_INFINITE)) return;
@ -168,50 +134,40 @@ _efl_animation_repeat_count_set(Eo *eo_obj,
}
EOLIAN static int
_efl_animation_repeat_count_get(Eo *eo_obj, Efl_Animation_Data *pd)
_efl_animation_repeat_count_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj, 0);
return pd->repeat_count;
}
EOLIAN static void
_efl_animation_start_delay_set(Eo *eo_obj,
_efl_animation_start_delay_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd,
double delay_time)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
if (delay_time < 0.0) return;
pd->start_delay_time = delay_time;
}
EOLIAN static double
_efl_animation_start_delay_get(Eo *eo_obj,
_efl_animation_start_delay_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj, 0.0);
return pd->start_delay_time;
}
EOLIAN static void
_efl_animation_interpolator_set(Eo *eo_obj,
_efl_animation_interpolator_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd,
Efl_Interpolator *interpolator)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj);
pd->interpolator = interpolator;
}
EOLIAN static Efl_Interpolator *
_efl_animation_interpolator_get(Eo *eo_obj,
_efl_animation_interpolator_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Data *pd)
{
EFL_ANIMATION_CHECK_OR_RETURN(eo_obj, NULL);
return pd->interpolator;
}
@ -231,7 +187,6 @@ _efl_animation_efl_object_constructor(Eo *eo_obj,
pd->interpolator = NULL;
pd->is_deleted = EINA_FALSE;
pd->keep_final_state = EINA_FALSE;
return eo_obj;
@ -240,8 +195,6 @@ _efl_animation_efl_object_constructor(Eo *eo_obj,
EOLIAN static void
_efl_animation_efl_object_destructor(Eo *eo_obj, Efl_Animation_Data *pd)
{
pd->is_deleted = EINA_TRUE;
if (pd->target)
efl_event_callback_del(pd->target, EFL_EVENT_DEL, _target_del_cb, eo_obj);

3
src/lib/evas/canvas/efl_animation.eo
View File

@ -83,9 +83,6 @@ class Efl.Animation (Efl.Object)
interpolator: Efl.Object; [[Interpolator which indicates interpolation fucntion. Efl_Interpolator is required.]]
}
}
is_deleted @protected {
return: bool; [[$true if animation is deleted, $false otherwise.]]
}
object_create {
[[Create object of the animation.]]
return: Efl.Animation.Object; [[Created object of the animation]]

8
src/lib/evas/canvas/efl_animation_alpha.c
View File

@ -1,13 +1,11 @@
#include "efl_animation_alpha_private.h"
EOLIAN static void
_efl_animation_alpha_alpha_set(Eo *eo_obj,
_efl_animation_alpha_alpha_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Alpha_Data *pd,
double from_alpha,
double to_alpha)
{
EFL_ANIMATION_ALPHA_CHECK_OR_RETURN(eo_obj);
pd->from.alpha = from_alpha;
pd->to.alpha = to_alpha;
}
@ -18,8 +16,6 @@ _efl_animation_alpha_alpha_get(Eo *eo_obj EINA_UNUSED,
double *from_alpha,
double *to_alpha)
{
EFL_ANIMATION_ALPHA_CHECK_OR_RETURN(eo_obj);
if (from_alpha)
*from_alpha = pd->from.alpha;
if (to_alpha)
@ -30,8 +26,6 @@ EOLIAN static Efl_Animation_Object *
_efl_animation_alpha_efl_animation_object_create(Eo *eo_obj,
Efl_Animation_Alpha_Data *pd)
{
EFL_ANIMATION_ALPHA_CHECK_OR_RETURN(eo_obj, NULL);
Efl_Animation_Object_Alpha *anim_obj
= efl_add(EFL_ANIMATION_OBJECT_ALPHA_CLASS, NULL);

12
src/lib/evas/canvas/efl_animation_alpha_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_ALPHA_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_ALPHA_CHECK_OR_RETURN(anim, ...) \
do { \
if (!anim) { \
CRI("Efl_Animation " # anim " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_is_deleted(anim)) { \
ERR("Efl_Animation " # anim " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_ALPHA_DATA_GET(o, pd) \
Efl_Animation_Alpha_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_ALPHA_CLASS)

18
src/lib/evas/canvas/efl_animation_group.c
View File

@ -5,8 +5,6 @@ _efl_animation_group_animation_add(Eo *eo_obj,
Efl_Animation_Group_Data *pd,
Efl_Animation *animation)
{
EFL_ANIMATION_GROUP_CHECK_OR_RETURN(eo_obj);
if (!animation) return;
Efl_Canvas_Object *target = efl_animation_target_get(eo_obj);
@ -26,23 +24,19 @@ _efl_animation_group_animation_add(Eo *eo_obj,
}
EOLIAN static void
_efl_animation_group_animation_del(Eo *eo_obj,
_efl_animation_group_animation_del(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Group_Data *pd,
Efl_Animation*animation)
{
EFL_ANIMATION_GROUP_CHECK_OR_RETURN(eo_obj);
if (!animation) return;
pd->animations = eina_list_remove(pd->animations, animation);
}
EOLIAN static Eina_List *
_efl_animation_group_animations_get(Eo *eo_obj,
_efl_animation_group_animations_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Group_Data *pd)
{
EFL_ANIMATION_GROUP_CHECK_OR_RETURN(eo_obj, NULL);
return pd->animations;
}
@ -51,8 +45,6 @@ _efl_animation_group_efl_animation_target_set(Eo *eo_obj,
Efl_Animation_Group_Data *pd,
Efl_Canvas_Object *target)
{
EFL_ANIMATION_GROUP_CHECK_OR_RETURN(eo_obj);
Eina_List *l;
Efl_Animation *anim;
EINA_LIST_FOREACH(pd->animations, l, anim)
@ -68,8 +60,6 @@ _efl_animation_group_efl_animation_duration_set(Eo *eo_obj,
Efl_Animation_Group_Data *pd,
double duration)
{
EFL_ANIMATION_GROUP_CHECK_OR_RETURN(eo_obj);
if (duration == EFL_ANIMATION_GROUP_DURATION_NONE) goto end;
if (duration < 0.0) return;
@ -94,8 +84,6 @@ _efl_animation_group_efl_animation_final_state_keep_set(Eo *eo_obj,
Efl_Animation_Group_Data *pd,
Eina_Bool keep_final_state)
{
EFL_ANIMATION_GROUP_CHECK_OR_RETURN(eo_obj);
Eina_List *l;
Efl_Animation *anim;
EINA_LIST_FOREACH(pd->animations, l, anim)
@ -111,8 +99,6 @@ _efl_animation_group_efl_animation_interpolator_set(Eo *eo_obj,
Efl_Animation_Group_Data *pd,
Efl_Interpolator *interpolator)
{
EFL_ANIMATION_GROUP_CHECK_OR_RETURN(eo_obj);
Eina_List *l;
Efl_Animation *anim;
EINA_LIST_FOREACH(pd->animations, l, anim)

8
src/lib/evas/canvas/efl_animation_group_parallel.c
View File

@ -5,8 +5,6 @@ _efl_animation_group_parallel_efl_animation_group_animation_add(Eo *eo_obj,
Efl_Animation_Group_Parallel_Data *pd EINA_UNUSED,
Efl_Animation *animation)
{
EFL_ANIMATION_GROUP_PARALLEL_CHECK_OR_RETURN(eo_obj);
if (!animation) return;
efl_animation_group_animation_add(efl_super(eo_obj, MY_CLASS),
@ -26,8 +24,6 @@ _efl_animation_group_parallel_efl_animation_group_animation_del(Eo *eo_obj,
Efl_Animation_Group_Parallel_Data *pd EINA_UNUSED,
Efl_Animation *animation)
{
EFL_ANIMATION_GROUP_PARALLEL_CHECK_OR_RETURN(eo_obj);
if (!animation) return;
efl_animation_group_animation_del(efl_super(eo_obj, MY_CLASS),
@ -46,8 +42,6 @@ EOLIAN static double
_efl_animation_group_parallel_efl_animation_total_duration_get(Eo *eo_obj,
Efl_Animation_Group_Parallel_Data *pd EINA_UNUSED)
{
EFL_ANIMATION_GROUP_PARALLEL_CHECK_OR_RETURN(eo_obj, 0.0);
Eina_List *animations =
efl_animation_group_animations_get(eo_obj);
if (!animations) return 0.0;
@ -77,8 +71,6 @@ EOLIAN static Efl_Animation_Object *
_efl_animation_group_parallel_efl_animation_object_create(Eo *eo_obj,
Efl_Animation_Group_Parallel_Data *pd EINA_UNUSED)
{
EFL_ANIMATION_GROUP_PARALLEL_CHECK_OR_RETURN(eo_obj, NULL);
Efl_Animation_Object_Group_Parallel *group_anim_obj
= efl_add(EFL_ANIMATION_OBJECT_GROUP_PARALLEL_CLASS, NULL);

12
src/lib/evas/canvas/efl_animation_group_parallel_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_GROUP_PARALLEL_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_GROUP_PARALLEL_CHECK_OR_RETURN(anim, ...) \
do { \
if (!anim) { \
CRI("Efl_Animation " # anim " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_is_deleted(anim)) { \
ERR("Efl_Animation " # anim " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_GROUP_PARALLEL_DATA_GET(o, pd) \
Efl_Animation_Group_Parallel_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_GROUP_PARALLEL_CLASS)

12
src/lib/evas/canvas/efl_animation_group_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_GROUP_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_GROUP_CHECK_OR_RETURN(anim, ...) \
do { \
if (!anim) { \
CRI("Efl_Animation " # anim " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_is_deleted(anim)) { \
ERR("Efl_Animation " # anim " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_GROUP_DATA_GET(o, pd) \
Efl_Animation_Group_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_GROUP_CLASS)

8
src/lib/evas/canvas/efl_animation_group_sequential.c
View File

@ -5,8 +5,6 @@ _efl_animation_group_sequential_efl_animation_group_animation_add(Eo *eo_obj,
Efl_Animation_Group_Sequential_Data *pd EINA_UNUSED,
Efl_Animation *animation)
{
EFL_ANIMATION_GROUP_SEQUENTIAL_CHECK_OR_RETURN(eo_obj);
if (!animation) return;
efl_animation_group_animation_add(efl_super(eo_obj, MY_CLASS), animation);
@ -24,8 +22,6 @@ _efl_animation_group_sequential_efl_animation_group_animation_del(Eo *eo_obj,
Efl_Animation_Group_Sequential_Data *pd EINA_UNUSED,
Efl_Animation *animation)
{
EFL_ANIMATION_GROUP_SEQUENTIAL_CHECK_OR_RETURN(eo_obj);
if (!animation) return;
efl_animation_group_animation_del(efl_super(eo_obj, MY_CLASS), animation);
@ -42,8 +38,6 @@ EOLIAN static double
_efl_animation_group_sequential_efl_animation_total_duration_get(Eo *eo_obj,
Efl_Animation_Group_Sequential_Data *pd EINA_UNUSED)
{
EFL_ANIMATION_GROUP_SEQUENTIAL_CHECK_OR_RETURN(eo_obj, 0.0);
Eina_List *animations = efl_animation_group_animations_get(eo_obj);
if (!animations) return 0.0;
@ -71,8 +65,6 @@ EOLIAN static Efl_Animation_Object *
_efl_animation_group_sequential_efl_animation_object_create(Eo *eo_obj,
Efl_Animation_Group_Sequential_Data *pd EINA_UNUSED)
{
EFL_ANIMATION_GROUP_SEQUENTIAL_CHECK_OR_RETURN(eo_obj, NULL);
Efl_Animation_Object_Group_Sequential *group_anim_obj
= efl_add(EFL_ANIMATION_OBJECT_GROUP_SEQUENTIAL_CLASS, NULL);

12
src/lib/evas/canvas/efl_animation_group_sequential_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_GROUP_SEQUENTIAL_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_GROUP_SEQUENTIAL_CHECK_OR_RETURN(anim, ...) \
do { \
if (!anim) { \
CRI("Efl_Animation " # anim " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_is_deleted(anim)) { \
ERR("Efl_Animation " # anim " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_GROUP_SEQUENTIAL_DATA_GET(o, pd) \
Efl_Animation_Group_Sequential_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_GROUP_SEQUENTIAL_CLASS)

112
src/lib/evas/canvas/efl_animation_object.c
View File

@ -1,21 +1,17 @@
#include "efl_animation_object_private.h"
EOLIAN static void
_efl_animation_object_auto_del_set(Eo *eo_obj,
_efl_animation_object_auto_del_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd,
Eina_Bool auto_del)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
pd->auto_del = auto_del;
}
EOLIAN static Eina_Bool
_efl_animation_object_auto_del_get(Eo *eo_obj,
_efl_animation_object_auto_del_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj, EINA_TRUE);
return pd->auto_del;
}
@ -24,7 +20,6 @@ _target_del_cb(void *data, const Efl_Event *event EINA_UNUSED)
{
Eo *eo_obj = data;
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
EFL_ANIMATION_OBJECT_DATA_GET(eo_obj, pd);
pd->target = NULL;
@ -36,8 +31,6 @@ _efl_animation_object_target_set(Eo *eo_obj,
Efl_Animation_Object_Data *pd,
Efl_Canvas_Object *target)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if (pd->target == target) return;
if (pd->target)
@ -49,10 +42,9 @@ _efl_animation_object_target_set(Eo *eo_obj,
}
EOLIAN static Efl_Canvas_Object *
_efl_animation_object_target_get(Eo *eo_obj, Efl_Animation_Object_Data *pd)
_efl_animation_object_target_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN((Eo *)eo_obj, NULL);
return pd->target;
}
@ -61,79 +53,63 @@ _efl_animation_object_duration_set(Eo *eo_obj,
Efl_Animation_Object_Data *pd,
double duration)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
efl_animation_object_total_duration_set(eo_obj, duration);
pd->duration = duration;
}
EOLIAN static double
_efl_animation_object_duration_get(Eo *eo_obj,
_efl_animation_object_duration_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN((Eo *)eo_obj, 0.0);
return pd->duration;
}
EOLIAN static void
_efl_animation_object_duration_only_set(Eo *eo_obj,
_efl_animation_object_duration_only_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd,
double duration)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
pd->duration = duration;
}
EOLIAN static void
_efl_animation_object_total_duration_set(Eo *eo_obj,
_efl_animation_object_total_duration_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd,
double total_duration)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
pd->total_duration = total_duration;
}
EOLIAN static double
_efl_animation_object_total_duration_get(Eo *eo_obj, Efl_Animation_Object_Data *pd)
_efl_animation_object_total_duration_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj, 0.0);
return pd->total_duration;
}
EOLIAN static void
_efl_animation_object_repeat_mode_set(Eo *eo_obj,
_efl_animation_object_repeat_mode_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd,
Efl_Animation_Object_Repeat_Mode mode)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if ((mode == EFL_ANIMATION_OBJECT_REPEAT_MODE_RESTART) ||
(mode == EFL_ANIMATION_OBJECT_REPEAT_MODE_REVERSE))
pd->repeat_mode = mode;
}
EOLIAN static Efl_Animation_Object_Repeat_Mode
_efl_animation_object_repeat_mode_get(const Eo *eo_obj,
_efl_animation_object_repeat_mode_get(const Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN((Eo *)eo_obj,
EFL_ANIMATION_OBJECT_REPEAT_MODE_RESTART);
return pd->repeat_mode;
}
EOLIAN static void
_efl_animation_object_repeat_count_set(Eo *eo_obj,
_efl_animation_object_repeat_count_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd,
int count)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
//EFL_ANIMATION_OBJECT_REPEAT_INFINITE repeats animation infinitely
if ((count < 0) && (count != EFL_ANIMATION_OBJECT_REPEAT_INFINITE)) return;
@ -141,69 +117,48 @@ _efl_animation_object_repeat_count_set(Eo *eo_obj,
}
EOLIAN static int
_efl_animation_object_repeat_count_get(const Eo *eo_obj,
_efl_animation_object_repeat_count_get(const Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN((Eo *)eo_obj, 0);
return pd->repeat_count;
}
EOLIAN static void
_efl_animation_object_start_delay_set(Eo *eo_obj,
_efl_animation_object_start_delay_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd,
double delay_time)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if (delay_time < 0.0) return;
pd->start_delay_time = delay_time;
}
EOLIAN static double
_efl_animation_object_start_delay_get(Eo *eo_obj,
_efl_animation_object_start_delay_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj, 0.0);
return pd->start_delay_time;
}
EOLIAN static void
_efl_animation_object_interpolator_set(Eo *eo_obj,
_efl_animation_object_interpolator_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd,
Efl_Interpolator *interpolator)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
pd->interpolator = interpolator;
}
EOLIAN static Efl_Interpolator *
_efl_animation_object_interpolator_get(Eo *eo_obj,
_efl_animation_object_interpolator_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj, NULL);
return pd->interpolator;
}
EOLIAN static Eina_Bool
_efl_animation_object_is_deleted(Eo *eo_obj,
Efl_Animation_Object_Data *pd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, EINA_TRUE);
return pd->is_deleted;
}
EOLIAN static void
_efl_animation_object_target_state_save(Eo *eo_obj,
_efl_animation_object_target_state_save(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if (!pd->target || !pd->target_state) return;
Evas_Coord x, y, w, h;
@ -230,11 +185,9 @@ _efl_animation_object_target_state_save(Eo *eo_obj,
}
EOLIAN static void
_efl_animation_object_target_state_reset(Eo *eo_obj,
_efl_animation_object_target_state_reset(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if (!pd->target) return;
if (efl_gfx_map_has(pd->target))
@ -267,11 +220,9 @@ _efl_animation_object_target_state_reset(Eo *eo_obj,
}
EOLIAN static void
_efl_animation_object_target_map_reset(Eo *eo_obj,
_efl_animation_object_target_map_reset(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if (!pd->target) return;
if (efl_gfx_map_has(pd->target))
@ -279,23 +230,19 @@ _efl_animation_object_target_map_reset(Eo *eo_obj,
}
EOLIAN static void
_efl_animation_object_final_state_keep_set(Eo *eo_obj,
_efl_animation_object_final_state_keep_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd,
Eina_Bool keep_final_state)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if (pd->keep_final_state == keep_final_state) return;
pd->keep_final_state = !!keep_final_state;
}
EOLIAN static Eina_Bool
_efl_animation_object_final_state_keep_get(Eo *eo_obj,
_efl_animation_object_final_state_keep_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN((Eo *)eo_obj, EINA_FALSE);
return pd->keep_final_state;
}
@ -451,8 +398,6 @@ EOLIAN static void
_efl_animation_object_start(Eo *eo_obj,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if (pd->start_delay_timer) return;
if (pd->start_delay_time > 0.0)
@ -469,8 +414,6 @@ EOLIAN static void
_efl_animation_object_cancel(Eo *eo_obj,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
ecore_timer_del(pd->start_delay_timer);
pd->start_delay_timer = NULL;
@ -497,8 +440,6 @@ _efl_animation_object_progress_set(Eo *eo_obj,
Efl_Animation_Object_Data *pd EINA_UNUSED,
double progress)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if ((progress < 0.0) || (progress > 1.0)) return;
if (!pd->is_direction_forward)
@ -519,11 +460,9 @@ _efl_animation_object_progress_set(Eo *eo_obj,
}
EOLIAN static void
_efl_animation_object_pause(Eo *eo_obj,
_efl_animation_object_pause(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if (!pd->is_started) return;
if (pd->is_ended) return;
if (pd->is_paused) return;
@ -542,8 +481,6 @@ EOLIAN static void
_efl_animation_object_resume(Eo *eo_obj,
Efl_Animation_Object_Data *pd)
{
EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(eo_obj);
if (!pd->is_started) return;
if (pd->is_ended) return;
if (!pd->is_paused) return;
@ -580,7 +517,6 @@ _efl_animation_object_efl_object_constructor(Eo *eo_obj,
pd->repeat_count = 0;
pd->auto_del = EINA_TRUE;
pd->is_deleted = EINA_FALSE;
pd->is_cancelled = EINA_FALSE;
pd->keep_final_state = EINA_FALSE;
@ -591,8 +527,6 @@ EOLIAN static void
_efl_animation_object_efl_object_destructor(Eo *eo_obj,
Efl_Animation_Object_Data *pd)
{
pd->is_deleted = EINA_TRUE;
if (pd->animator)
{
ecore_animator_del(pd->animator);

3
src/lib/evas/canvas/efl_animation_object.eo
View File

@ -26,9 +26,6 @@ class Efl.Animation.Object (Efl.Object)
resume {
[[Resume animation.]]
}
is_deleted @protected {
return: bool; [[$true if animation object is deleted, $false otherwise.]]
}
target_state_save @protected {
[[Save the state of the target.]]
}

8
src/lib/evas/canvas/efl_animation_object_alpha.c
View File

@ -1,13 +1,11 @@
#include "efl_animation_object_alpha_private.h"
EOLIAN static void
_efl_animation_object_alpha_alpha_set(Eo *eo_obj,
_efl_animation_object_alpha_alpha_set(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Alpha_Data *pd,
double from_alpha,
double to_alpha)
{
EFL_ANIMATION_OBJECT_ALPHA_CHECK_OR_RETURN(eo_obj);
pd->from.alpha = from_alpha;
pd->to.alpha = to_alpha;
}
@ -18,8 +16,6 @@ _efl_animation_object_alpha_alpha_get(Eo *eo_obj EINA_UNUSED,
double *from_alpha,
double *to_alpha)
{
EFL_ANIMATION_OBJECT_ALPHA_CHECK_OR_RETURN(eo_obj);
if (from_alpha)
*from_alpha = pd->from.alpha;
if (to_alpha)
@ -57,8 +53,6 @@ _efl_animation_object_alpha_efl_animation_object_progress_set(Eo *eo_obj,
Efl_Animation_Object_Alpha_Data *pd EINA_UNUSED,
double progress)
{
EFL_ANIMATION_OBJECT_ALPHA_CHECK_OR_RETURN(eo_obj);
if ((progress < 0.0) || (progress > 1.0)) return;
_progress_set(eo_obj, progress);

12
src/lib/evas/canvas/efl_animation_object_alpha_private.h
View File

@ -9,18 +9,6 @@
#define MY_CLASS EFL_ANIMATION_OBJECT_ALPHA_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_OBJECT_ALPHA_CHECK_OR_RETURN(anim_obj, ...) \
do { \
if (!anim_obj) { \
CRI("Efl_Animation_Object " # anim_obj " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_object_is_deleted(anim_obj)) { \
ERR("Efl_Animation_Object " # anim_obj " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_OBJECT_ALPHA_DATA_GET(o, pd) \
Efl_Animation_Object_Alpha_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_OBJECT_ALPHA_CLASS)

30
src/lib/evas/canvas/efl_animation_object_group.c
View File

@ -5,8 +5,6 @@ _efl_animation_object_group_object_add(Eo *eo_obj,
Efl_Animation_Object_Group_Data *pd,
Efl_Animation_Object *anim_obj)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj);
if (!anim_obj) return;
Efl_Canvas_Object *target = efl_animation_object_target_get(eo_obj);
@ -26,23 +24,19 @@ _efl_animation_object_group_object_add(Eo *eo_obj,
}
EOLIAN static void
_efl_animation_object_group_object_del(Eo *eo_obj,
_efl_animation_object_group_object_del(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Group_Data *pd,
Efl_Animation_Object *anim_obj)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj);
if (!anim_obj) return;
pd->anim_objs = eina_list_remove(pd->anim_objs, anim_obj);
}
EOLIAN static Eina_List *
_efl_animation_object_group_objects_get(Eo *eo_obj,
_efl_animation_object_group_objects_get(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Group_Data *pd)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj, NULL);
return pd->anim_objs;
}
@ -51,8 +45,6 @@ _efl_animation_object_group_efl_animation_object_target_set(Eo *eo_obj,
Efl_Animation_Object_Group_Data *pd,
Efl_Canvas_Object *target)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj);
Eina_List *l;
Efl_Animation_Object *anim_obj;
@ -69,8 +61,6 @@ _efl_animation_object_group_efl_animation_object_duration_set(Eo *eo_obj,
Efl_Animation_Object_Group_Data *pd,
double duration)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj);
if (duration == EFL_ANIMATION_OBJECT_GROUP_DURATION_NONE) goto end;
if (duration < 0.0) return;
@ -98,8 +88,6 @@ _efl_animation_object_group_efl_animation_object_final_state_keep_set(Eo *eo_obj
Efl_Animation_Object_Group_Data *pd,
Eina_Bool state_keep)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj);
Eina_List *l;
Efl_Animation_Object *anim_obj;
@ -117,8 +105,6 @@ _efl_animation_object_group_efl_animation_object_interpolator_set(Eo *eo_obj,
Efl_Animation_Object_Group_Data *pd,
Efl_Interpolator *interpolator)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj);
Eina_List *l;
Efl_Animation_Object *anim_obj;
@ -159,11 +145,9 @@ _efl_animation_object_group_efl_object_destructor(Eo *eo_obj,
}
EOLIAN static void
_efl_animation_object_group_efl_animation_object_target_state_save(Eo *eo_obj,
_efl_animation_object_group_efl_animation_object_target_state_save(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Group_Data *pd)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj);
Eina_List *l;
Efl_Animation_Object *anim_obj;
@ -174,11 +158,9 @@ _efl_animation_object_group_efl_animation_object_target_state_save(Eo *eo_obj,
}
EOLIAN static void
_efl_animation_object_group_efl_animation_object_target_state_reset(Eo *eo_obj,
_efl_animation_object_group_efl_animation_object_target_state_reset(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Group_Data *pd)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj);
Eina_List *l;
Efl_Animation_Object *anim_obj;
@ -189,11 +171,9 @@ _efl_animation_object_group_efl_animation_object_target_state_reset(Eo *eo_obj,
}
EOLIAN static void
_efl_animation_object_group_efl_animation_object_target_map_reset(Eo *eo_obj,
_efl_animation_object_group_efl_animation_object_target_map_reset(Eo *eo_obj EINA_UNUSED,
Efl_Animation_Object_Group_Data *pd)
{
EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(eo_obj);
Eina_List *l;
Efl_Animation_Object *anim_obj;

6
src/lib/evas/canvas/efl_animation_object_group_parallel.c
View File

@ -59,8 +59,6 @@ _efl_animation_object_group_parallel_efl_animation_object_group_object_add(Eo *e
Efl_Animation_Object_Group_Parallel_Data *pd,
Efl_Animation_Object *anim_obj)
{
EFL_ANIMATION_OBJECT_GROUP_PARALLEL_CHECK_OR_RETURN(eo_obj);
if (!anim_obj) return;
efl_animation_object_group_object_add(efl_super(eo_obj, MY_CLASS), anim_obj);
@ -83,8 +81,6 @@ _efl_animation_object_group_parallel_efl_animation_object_group_object_del(Eo *e
Efl_Animation_Object_Group_Parallel_Data *pd EINA_UNUSED,
Efl_Animation_Object *anim_obj)
{
EFL_ANIMATION_OBJECT_GROUP_PARALLEL_CHECK_OR_RETURN(eo_obj);
if (!anim_obj) return;
efl_animation_object_group_object_del(efl_super(eo_obj, MY_CLASS), anim_obj);
@ -106,8 +102,6 @@ EOLIAN static double
_efl_animation_object_group_parallel_efl_animation_object_total_duration_get(Eo *eo_obj,
Efl_Animation_Object_Group_Parallel_Data *pd EINA_UNUSED)
{
EFL_ANIMATION_OBJECT_GROUP_PARALLEL_CHECK_OR_RETURN(eo_obj, 0.0);
Eina_List *anim_objs = efl_animation_object_group_objects_get(eo_obj);
if (!anim_objs) return 0.0;

12
src/lib/evas/canvas/efl_animation_object_group_parallel_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_OBJECT_GROUP_PARALLEL_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_OBJECT_GROUP_PARALLEL_CHECK_OR_RETURN(anim_obj, ...) \
do { \
if (!anim_obj) { \
CRI("Efl_Animation_Object " # anim_obj " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_object_is_deleted(anim_obj)) { \
ERR("Efl_Animation_Object " # anim_obj " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_OBJECT_GROUP_PARALLEL_DATA_GET(o, pd) \
Efl_Animation_Object_Group_Parallel_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_OBJECT_GROUP_PARALLEL_CLASS)

12
src/lib/evas/canvas/efl_animation_object_group_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_OBJECT_GROUP_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_OBJECT_GROUP_CHECK_OR_RETURN(anim_obj, ...) \
do { \
if (!anim_obj) { \
CRI("Efl_Animation_Object " # anim_obj " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_object_is_deleted(anim_obj)) { \
ERR("Efl_Animation_Object " # anim_obj " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_OBJECT_GROUP_DATA_GET(o, pd) \
Efl_Animation_Object_Group_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_OBJECT_GROUP_CLASS)

6
src/lib/evas/canvas/efl_animation_object_group_sequential.c
View File

@ -61,8 +61,6 @@ _efl_animation_object_group_sequential_efl_animation_object_group_object_add(Eo
Efl_Animation_Object_Group_Sequential_Data *pd EINA_UNUSED,
Efl_Animation_Object *anim_obj)
{
EFL_ANIMATION_OBJECT_GROUP_SEQUENTIAL_CHECK_OR_RETURN(eo_obj);
if (!anim_obj) return;
efl_animation_object_group_object_add(efl_super(eo_obj, MY_CLASS), anim_obj);
@ -85,8 +83,6 @@ _efl_animation_object_group_sequential_efl_animation_object_group_object_del(Eo
Efl_Animation_Object_Group_Sequential_Data *pd EINA_UNUSED,
Efl_Animation_Object *anim_obj)
{
EFL_ANIMATION_OBJECT_GROUP_SEQUENTIAL_CHECK_OR_RETURN(eo_obj);
if (!anim_obj) return;
efl_animation_object_group_object_del(efl_super(eo_obj, MY_CLASS), anim_obj);
@ -108,8 +104,6 @@ EOLIAN static double
_efl_animation_object_group_sequential_efl_animation_object_total_duration_get(Eo *eo_obj,
Efl_Animation_Object_Group_Sequential_Data *pd EINA_UNUSED)
{
EFL_ANIMATION_OBJECT_GROUP_SEQUENTIAL_CHECK_OR_RETURN(eo_obj, 0.0);
Eina_List *anim_objs = efl_animation_object_group_objects_get(eo_obj);
if (!anim_objs) return 0.0;

12
src/lib/evas/canvas/efl_animation_object_group_sequential_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_OBJECT_GROUP_SEQUENTIAL_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_OBJECT_GROUP_SEQUENTIAL_CHECK_OR_RETURN(anim_obj, ...) \
do { \
if (!anim_obj) { \
CRI("Efl_Animation_Object " # anim_obj " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_object_is_deleted(anim_obj)) { \
ERR("Efl_Animation_Object " # anim_obj " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_OBJECT_GROUP_SEQUENTIAL_DATA_GET(o, pd) \
Efl_Animation_Object_Group_Sequential_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_OBJECT_GROUP_SEQUENTIAL_CLASS)

13
src/lib/evas/canvas/efl_animation_object_private.h
View File

@ -44,7 +44,6 @@ typedef struct _Efl_Animation_Object_Data
Efl_Interpolator *interpolator;
Eina_Bool auto_del : 1;
Eina_Bool is_deleted : 1;
Eina_Bool is_started : 1;
Eina_Bool is_cancelled : 1;
Eina_Bool is_ended : 1;
@ -54,17 +53,5 @@ typedef struct _Efl_Animation_Object_Data
Eina_Bool is_direction_changed : 1;
} Efl_Animation_Object_Data;
#define EFL_ANIMATION_OBJECT_CHECK_OR_RETURN(anim_obj, ...) \
do { \
if (!anim_obj) { \
CRI("Efl_Animation_Object " # anim_obj " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_object_is_deleted(anim_obj)) { \
ERR("Efl_Animation_Object " # anim_obj " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_OBJECT_DATA_GET(o, pd) \
Efl_Animation_Object_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_OBJECT_CLASS)

10
src/lib/evas/canvas/efl_animation_object_rotate.c
View File

@ -9,8 +9,6 @@ _efl_animation_object_rotate_rotate_set(Eo *eo_obj,
double cx,
double cy)
{
EFL_ANIMATION_OBJECT_ROTATE_CHECK_OR_RETURN(eo_obj);
pd->from.degree = from_degree;
pd->to.degree = to_degree;
@ -48,8 +46,6 @@ _efl_animation_object_rotate_rotate_get(Eo *eo_obj,
double *cx,
double *cy)
{
EFL_ANIMATION_OBJECT_ROTATE_CHECK_OR_RETURN(eo_obj);
//Update relative pivot based on absolute pivot
if (!pd->use_rel_pivot)
{
@ -97,8 +93,6 @@ _efl_animation_object_rotate_rotate_absolute_set(Eo *eo_obj,
Evas_Coord cx,
Evas_Coord cy)
{
EFL_ANIMATION_OBJECT_ROTATE_CHECK_OR_RETURN(eo_obj);
pd->from.degree = from_degree;
pd->to.degree = to_degree;
@ -138,8 +132,6 @@ _efl_animation_object_rotate_rotate_absolute_get(Eo *eo_obj,
Evas_Coord *cx,
Evas_Coord *cy)
{
EFL_ANIMATION_OBJECT_ROTATE_CHECK_OR_RETURN(eo_obj);
//Update absolute pivot based on relative pivot
if (pd->use_rel_pivot)
{
@ -206,8 +198,6 @@ _efl_animation_object_rotate_efl_animation_object_progress_set(Eo *eo_obj,
Efl_Animation_Object_Rotate_Data *pd EINA_UNUSED,
double progress)
{
EFL_ANIMATION_OBJECT_ROTATE_CHECK_OR_RETURN(eo_obj);
if ((progress < 0.0) || (progress > 1.0)) return;
_progress_set(eo_obj, progress);

12
src/lib/evas/canvas/efl_animation_object_rotate_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_OBJECT_ROTATE_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_OBJECT_ROTATE_CHECK_OR_RETURN(anim_obj, ...) \
do { \
if (!anim_obj) { \
CRI("Efl_Animation_Object " # anim_obj " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_object_is_deleted(anim_obj)) { \
ERR("Efl_Animation_Object " # anim_obj " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_OBJECT_ROTATE_DATA_GET(o, pd) \
Efl_Animation_Object_Rotate_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_OBJECT_ROTATE_CLASS)

10
src/lib/evas/canvas/efl_animation_object_scale.c
View File

@ -11,8 +11,6 @@ _efl_animation_object_scale_scale_set(Eo *eo_obj,
double cx,
double cy)
{
EFL_ANIMATION_OBJECT_SCALE_CHECK_OR_RETURN(eo_obj);
pd->from.scale_x = from_scale_x;
pd->from.scale_y = from_scale_y;
@ -55,8 +53,6 @@ _efl_animation_object_scale_scale_get(Eo *eo_obj,
double *cx,
double *cy)
{
EFL_ANIMATION_OBJECT_SCALE_CHECK_OR_RETURN(eo_obj);
//Update relative pivot based on absolute pivot
if (!pd->use_rel_pivot)
{
@ -112,8 +108,6 @@ _efl_animation_object_scale_scale_absolute_set(Eo *eo_obj,
Evas_Coord cx,
Evas_Coord cy)
{
EFL_ANIMATION_OBJECT_SCALE_CHECK_OR_RETURN(eo_obj);
pd->from.scale_x = from_scale_x;
pd->from.scale_y = from_scale_y;
@ -158,8 +152,6 @@ _efl_animation_object_scale_scale_absolute_get(Eo *eo_obj,
Evas_Coord *cx,
Evas_Coord *cy)
{
EFL_ANIMATION_OBJECT_SCALE_CHECK_OR_RETURN(eo_obj);
//Update absolute pivot based on relative pivot
if (pd->use_rel_pivot)
{
@ -235,8 +227,6 @@ _efl_animation_object_scale_efl_animation_object_progress_set(Eo *eo_obj,
Efl_Animation_Object_Scale_Data *pd EINA_UNUSED,
double progress)
{
EFL_ANIMATION_OBJECT_SCALE_CHECK_OR_RETURN(eo_obj);
if ((progress < 0.0) || (progress > 1.0)) return;
_progress_set(eo_obj, progress);

12
src/lib/evas/canvas/efl_animation_object_scale_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_OBJECT_SCALE_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_OBJECT_SCALE_CHECK_OR_RETURN(anim_obj, ...) \
do { \
if (!anim_obj) { \
CRI("Efl_Animation_Object " # anim_obj " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_object_is_deleted(anim_obj)) { \
ERR("Efl_Animation_Object " # anim_obj " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_OBJECT_SCALE_DATA_GET(o, pd) \
Efl_Animation_Object_Scale_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_OBJECT_SCALE_CLASS)

10
src/lib/evas/canvas/efl_animation_object_translate.c
View File

@ -8,8 +8,6 @@ _efl_animation_object_translate_translate_set(Eo *eo_obj,
Evas_Coord to_x,
Evas_Coord to_y)
{
EFL_ANIMATION_OBJECT_TRANSLATE_CHECK_OR_RETURN(eo_obj);
pd->from.move_x = from_x;
pd->from.move_y = from_y;
@ -41,8 +39,6 @@ _efl_animation_object_translate_translate_get(Eo *eo_obj,
Evas_Coord *to_x,
Evas_Coord *to_y)
{
EFL_ANIMATION_OBJECT_TRANSLATE_CHECK_OR_RETURN(eo_obj);
//Update relative move based on absolute coordinate
if (!pd->use_rel_move)
{
@ -79,8 +75,6 @@ _efl_animation_object_translate_translate_absolute_set(Eo *eo_obj,
Evas_Coord to_x,
Evas_Coord to_y)
{
EFL_ANIMATION_OBJECT_TRANSLATE_CHECK_OR_RETURN(eo_obj);
pd->from.x = from_x;
pd->from.y = from_y;
@ -112,8 +106,6 @@ _efl_animation_object_translate_translate_absolute_get(Eo *eo_obj,
Evas_Coord *to_x,
Evas_Coord *to_y)
{
EFL_ANIMATION_OBJECT_TRANSLATE_CHECK_OR_RETURN(eo_obj);
//Update absolute coordinate based on relative move
if (pd->use_rel_move)
{
@ -196,8 +188,6 @@ _efl_animation_object_translate_efl_animation_object_progress_set(Eo *eo_obj,
Efl_Animation_Object_Translate_Data *pd EINA_UNUSED,
double progress)
{
EFL_ANIMATION_OBJECT_TRANSLATE_CHECK_OR_RETURN(eo_obj);
if ((progress < 0.0) || (progress > 1.0)) return;
_progress_set(eo_obj, progress);

12
src/lib/evas/canvas/efl_animation_object_translate_private.h
View File

@ -5,18 +5,6 @@
#define MY_CLASS EFL_ANIMATION_OBJECT_TRANSLATE_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_OBJECT_TRANSLATE_CHECK_OR_RETURN(anim_obj, ...) \
do { \
if (!anim_obj) { \
CRI("Efl_Animation_Object " # anim_obj " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_object_is_deleted(anim_obj)) { \
ERR("Efl_Animation_Object " # anim_obj " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_OBJECT_TRANSLATE_DATA_GET(o, pd) \
Efl_Animation_Object_Translate_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_OBJECT_TRANSLATE_CLASS)

13
src/lib/evas/canvas/efl_animation_private.h
View File

@ -20,21 +20,8 @@ typedef struct _Efl_Animation_Data
Efl_Interpolator *interpolator;
Eina_Bool is_deleted : 1;
Eina_Bool keep_final_state : 1;
} Efl_Animation_Data;
#define EFL_ANIMATION_CHECK_OR_RETURN(anim, ...) \
do { \
if (!anim) { \
CRI("Efl_Animation " # anim " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_is_deleted(anim)) { \
ERR("Efl_Animation " # anim " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_DATA_GET(o, pd) \
Efl_Animation_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_CLASS)

10
src/lib/evas/canvas/efl_animation_rotate.c
View File

@ -9,8 +9,6 @@ _efl_animation_rotate_rotate_set(Eo *eo_obj,
double cx,
double cy)
{
EFL_ANIMATION_ROTATE_CHECK_OR_RETURN(eo_obj);
pd->from.degree = from_degree;
pd->to.degree = to_degree;
@ -48,8 +46,6 @@ _efl_animation_rotate_rotate_get(Eo *eo_obj,
double *cx,
double *cy)
{
EFL_ANIMATION_ROTATE_CHECK_OR_RETURN(eo_obj);
//Update relative pivot based on absolute pivot
if (!pd->use_rel_pivot)
{
@ -97,8 +93,6 @@ _efl_animation_rotate_rotate_absolute_set(Eo *eo_obj,
Evas_Coord cx,
Evas_Coord cy)
{
EFL_ANIMATION_ROTATE_CHECK_OR_RETURN(eo_obj);
pd->from.degree = from_degree;
pd->to.degree = to_degree;
@ -138,8 +132,6 @@ _efl_animation_rotate_rotate_absolute_get(Eo *eo_obj,
Evas_Coord *cx,
Evas_Coord *cy)
{
EFL_ANIMATION_ROTATE_CHECK_OR_RETURN(eo_obj);
//Update relative pivot based on absolute pivot
if (pd->use_rel_pivot)
{
@ -178,8 +170,6 @@ EOLIAN static Efl_Animation_Object *
_efl_animation_rotate_efl_animation_object_create(Eo *eo_obj,
Efl_Animation_Rotate_Data *pd)
{
EFL_ANIMATION_ROTATE_CHECK_OR_RETURN(eo_obj, NULL);
Efl_Animation_Object_Rotate *anim_obj
= efl_add(EFL_ANIMATION_OBJECT_ROTATE_CLASS, NULL);

12
src/lib/evas/canvas/efl_animation_rotate_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_ROTATE_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_ROTATE_CHECK_OR_RETURN(anim, ...) \
do { \
if (!anim) { \
CRI("Efl_Animation " # anim " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_is_deleted(anim)) { \
ERR("Efl_Animation " # anim " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_ROTATE_DATA_GET(o, pd) \
Efl_Animation_Rotate_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_ROTATE_CLASS)

10
src/lib/evas/canvas/efl_animation_scale.c
View File

@ -11,8 +11,6 @@ _efl_animation_scale_scale_set(Eo *eo_obj,
double cx,
double cy)
{
EFL_ANIMATION_SCALE_CHECK_OR_RETURN(eo_obj);
pd->from.scale_x = from_scale_x;
pd->from.scale_y = from_scale_y;
@ -55,8 +53,6 @@ _efl_animation_scale_scale_get(Eo *eo_obj,
double *cx,
double *cy)
{
EFL_ANIMATION_SCALE_CHECK_OR_RETURN(eo_obj);
//Update relative pivot based on absolute pivot
if (!pd->use_rel_pivot)
{
@ -112,8 +108,6 @@ _efl_animation_scale_scale_absolute_set(Eo *eo_obj,
Evas_Coord cx,
Evas_Coord cy)
{
EFL_ANIMATION_SCALE_CHECK_OR_RETURN(eo_obj);
pd->from.scale_x = from_scale_x;
pd->from.scale_y = from_scale_y;
@ -158,8 +152,6 @@ _efl_animation_scale_scale_absolute_get(Eo *eo_obj,
Evas_Coord *cx,
Evas_Coord *cy)
{
EFL_ANIMATION_SCALE_CHECK_OR_RETURN(eo_obj);
//Update absolute pivot based on relative pivot
if (pd->use_rel_pivot)
{
@ -204,8 +196,6 @@ EOLIAN static Efl_Animation_Object *
_efl_animation_scale_efl_animation_object_create(Eo *eo_obj,
Efl_Animation_Scale_Data *pd)
{
EFL_ANIMATION_SCALE_CHECK_OR_RETURN(eo_obj, NULL);
Efl_Animation_Object_Scale *anim_obj
= efl_add(EFL_ANIMATION_OBJECT_SCALE_CLASS, NULL);

12
src/lib/evas/canvas/efl_animation_scale_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_SCALE_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_SCALE_CHECK_OR_RETURN(anim, ...) \
do { \
if (!anim) { \
CRI("Efl_Animation " # anim " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_is_deleted(anim)) { \
ERR("Efl_Animation " # anim " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_SCALE_DATA_GET(o, pd) \
Efl_Animation_Scale_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_SCALE_CLASS)

10
src/lib/evas/canvas/efl_animation_translate.c
View File

@ -8,8 +8,6 @@ _efl_animation_translate_translate_set(Eo *eo_obj,
Evas_Coord to_x,
Evas_Coord to_y)
{
EFL_ANIMATION_TRANSLATE_CHECK_OR_RETURN(eo_obj);
pd->from.move_x = from_x;
pd->from.move_y = from_y;
@ -41,8 +39,6 @@ _efl_animation_translate_translate_get(Eo *eo_obj,
Evas_Coord *to_x,
Evas_Coord *to_y)
{
EFL_ANIMATION_TRANSLATE_CHECK_OR_RETURN(eo_obj);
//Update relative move based on absolute coordinate
if (!pd->use_rel_move)
{
@ -79,8 +75,6 @@ _efl_animation_translate_translate_absolute_set(Eo *eo_obj,
Evas_Coord to_x,
Evas_Coord to_y)
{
EFL_ANIMATION_TRANSLATE_CHECK_OR_RETURN(eo_obj);
pd->from.x = from_x;
pd->from.y = from_y;
@ -112,8 +106,6 @@ _efl_animation_translate_translate_absolute_get(Eo *eo_obj,
Evas_Coord *to_x,
Evas_Coord *to_y)
{
EFL_ANIMATION_TRANSLATE_CHECK_OR_RETURN(eo_obj);
//Update absolute coordinate based on relative move
if (pd->use_rel_move)
{
@ -146,8 +138,6 @@ EOLIAN static Efl_Animation_Object *
_efl_animation_translate_efl_animation_object_create(Eo *eo_obj,
Efl_Animation_Translate_Data *pd)
{
EFL_ANIMATION_TRANSLATE_CHECK_OR_RETURN(eo_obj, NULL);
Efl_Animation_Object_Translate *anim_obj
= efl_add(EFL_ANIMATION_OBJECT_TRANSLATE_CLASS, NULL);

12
src/lib/evas/canvas/efl_animation_translate_private.h
View File

@ -6,18 +6,6 @@
#define MY_CLASS EFL_ANIMATION_TRANSLATE_CLASS
#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
#define EFL_ANIMATION_TRANSLATE_CHECK_OR_RETURN(anim, ...) \
do { \
if (!anim) { \
CRI("Efl_Animation " # anim " is NULL!"); \
return __VA_ARGS__; \
} \
if (efl_animation_is_deleted(anim)) { \
ERR("Efl_Animation " # anim " has already been deleted!"); \
return __VA_ARGS__; \
} \
} while (0)
#define EFL_ANIMATION_TRANSLATE_DATA_GET(o, pd) \
Efl_Animation_Translate_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_TRANSLATE_CLASS)