summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-21 13:38:39 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-21 14:06:43 -0500
commita0a80fc74af9f874c67bb8388d2d7de5d9feb24e (patch)
tree5d6d102faa168428874dcbab4f5ab41b03bcd98e /src/lib
parent7eb0375c0e0ad42f9e6be264c27cc5a04af054b7 (diff)
Efl.Animator: rename to Efl.Canvas.Animator
most C api remains unchanged ref T6714 ref T6716
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/evas/Evas_Common.h12
-rw-r--r--src/lib/evas/Evas_Eo.h20
-rw-r--r--src/lib/evas/Evas_Legacy.h11
-rw-r--r--src/lib/evas/canvas/efl_animation.c138
-rw-r--r--src/lib/evas/canvas/efl_animation_alpha_private.h19
-rw-r--r--src/lib/evas/canvas/efl_animation_group.eo32
-rw-r--r--src/lib/evas/canvas/efl_animation_group_parallel.eo13
-rw-r--r--src/lib/evas/canvas/efl_animation_group_private.h15
-rw-r--r--src/lib/evas/canvas/efl_animation_group_sequential.eo13
-rw-r--r--src/lib/evas/canvas/efl_animation_rotate_private.h35
-rw-r--r--src/lib/evas/canvas/efl_animation_scale_private.h35
-rw-r--r--src/lib/evas/canvas/efl_animation_translate_private.h22
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation.c138
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation.eo (renamed from src/lib/evas/canvas/efl_animation.eo)7
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_alpha.c (renamed from src/lib/evas/canvas/efl_animation_alpha.c)22
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_alpha.eo (renamed from src/lib/evas/canvas/efl_animation_alpha.eo)9
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_alpha_private.h19
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group.c (renamed from src/lib/evas/canvas/efl_animation_group.c)48
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group.eo33
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_parallel.c (renamed from src/lib/evas/canvas/efl_animation_group_parallel.c)14
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo14
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_parallel_private.h (renamed from src/lib/evas/canvas/efl_animation_group_parallel_private.h)2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_private.h15
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_sequential.c (renamed from src/lib/evas/canvas/efl_animation_group_sequential.c)14
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo13
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_group_sequential_private.h (renamed from src/lib/evas/canvas/efl_animation_group_sequential_private.h)2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.c (renamed from src/lib/evas/canvas/efl_animation_player.c)102
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.eo (renamed from src/lib/evas/canvas/efl_animation_player.eo)7
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player_private.h (renamed from src/lib/evas/canvas/efl_animation_player_private.h)12
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_private.h (renamed from src/lib/evas/canvas/efl_animation_private.h)10
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_rotate.c (renamed from src/lib/evas/canvas/efl_animation_rotate.c)30
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_rotate.eo (renamed from src/lib/evas/canvas/efl_animation_rotate.eo)9
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_rotate_private.h35
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale.c (renamed from src/lib/evas/canvas/efl_animation_scale.c)38
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale.eo (renamed from src/lib/evas/canvas/efl_animation_scale.eo)9
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale_private.h35
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate.c (renamed from src/lib/evas/canvas/efl_animation_translate.c)30
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate.eo (renamed from src/lib/evas/canvas/efl_animation_translate.eo)9
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate_private.h22
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_types.eot (renamed from src/lib/evas/canvas/efl_animation_types.eot)4
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c8
42 files changed, 554 insertions, 525 deletions
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index f69d69d..5c54312 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -3329,6 +3329,10 @@ EAPI const Eina_List *evas_font_path_global_list(void) EINA_WARN_UNUSED_R
3329 */ 3329 */
3330EAPI void evas_font_reinit(void); 3330EAPI void evas_font_reinit(void);
3331 3331
3332
3333/* this is now public, non-beta api forever because someone didn't add a beta
3334 api guard.
3335 */
3332#ifndef _EFL_ANIMATION_EO_CLASS_TYPE 3336#ifndef _EFL_ANIMATION_EO_CLASS_TYPE
3333#define _EFL_ANIMATION_EO_CLASS_TYPE 3337#define _EFL_ANIMATION_EO_CLASS_TYPE
3334 3338
@@ -3452,7 +3456,13 @@ struct _Efl_Animation_Player_Running_Event_Info
3452#define EFL_ANIMATION_REPEAT_INFINITE -1 3456#define EFL_ANIMATION_REPEAT_INFINITE -1
3453#define EFL_ANIMATION_PLAYER_REPEAT_INFINITE -1 3457#define EFL_ANIMATION_PLAYER_REPEAT_INFINITE -1
3454 3458
3459
3460#ifdef EFL_BETA_API_SUPPORT
3461struct _Efl_Canvas_Animation_Player_Running_Event_Info
3462{
3463 double progress;
3464};
3465#endif
3455/** 3466/**
3456 * @} 3467 * @}
3457 */ 3468 */
3458
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index da7553d..eafe8bb 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -50,19 +50,19 @@
50 * @} 50 * @}
51 */ 51 */
52 52
53#include "canvas/efl_animation_types.eot.h" 53#include "canvas/efl_canvas_animation_types.eot.h"
54 54
55#include "canvas/efl_canvas_object.eo.h" 55#include "canvas/efl_canvas_object.eo.h"
56 56
57#include "canvas/efl_animation.eo.h" 57#include "canvas/efl_canvas_animation.eo.h"
58#include "canvas/efl_animation_alpha.eo.h" 58#include "canvas/efl_canvas_animation_alpha.eo.h"
59#include "canvas/efl_animation_rotate.eo.h" 59#include "canvas/efl_canvas_animation_rotate.eo.h"
60#include "canvas/efl_animation_scale.eo.h" 60#include "canvas/efl_canvas_animation_scale.eo.h"
61#include "canvas/efl_animation_translate.eo.h" 61#include "canvas/efl_canvas_animation_translate.eo.h"
62#include "canvas/efl_animation_group.eo.h" 62#include "canvas/efl_canvas_animation_group.eo.h"
63#include "canvas/efl_animation_group_parallel.eo.h" 63#include "canvas/efl_canvas_animation_group_parallel.eo.h"
64#include "canvas/efl_animation_group_sequential.eo.h" 64#include "canvas/efl_canvas_animation_group_sequential.eo.h"
65#include "canvas/efl_animation_player.eo.h" 65#include "canvas/efl_canvas_animation_player.eo.h"
66 66
67#endif /* EFL_EO_API_SUPPORT */ 67#endif /* EFL_EO_API_SUPPORT */
68 68
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index c6a3b5f..e5c7033 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -8088,4 +8088,15 @@ EAPI void evas_object_text_filter_source_set(Evas_Object *obj, const char *name,
8088 */ 8088 */
8089EAPI Evas_Object *evas_object_event_grabber_add(Evas *e); 8089EAPI Evas_Object *evas_object_event_grabber_add(Evas *e);
8090#include "canvas/efl_canvas_object_event_grabber.eo.legacy.h" 8090#include "canvas/efl_canvas_object_event_grabber.eo.legacy.h"
8091
8092#include "canvas/efl_canvas_animation_alpha.eo.legacy.h"
8093#include "canvas/efl_canvas_animation.eo.legacy.h"
8094#include "canvas/efl_canvas_animation_group.eo.legacy.h"
8095#include "canvas/efl_canvas_animation_group_parallel.eo.legacy.h"
8096#include "canvas/efl_canvas_animation_group_sequential.eo.legacy.h"
8097#include "canvas/efl_canvas_animation_player.eo.legacy.h"
8098#include "canvas/efl_canvas_animation_rotate.eo.legacy.h"
8099#include "canvas/efl_canvas_animation_scale.eo.legacy.h"
8100#include "canvas/efl_canvas_animation_translate.eo.legacy.h"
8101
8091#endif 8102#endif
diff --git a/src/lib/evas/canvas/efl_animation.c b/src/lib/evas/canvas/efl_animation.c
deleted file mode 100644
index f1ad508..0000000
--- a/src/lib/evas/canvas/efl_animation.c
+++ /dev/null
@@ -1,138 +0,0 @@
1#include "efl_animation_private.h"
2
3#define MY_CLASS EFL_ANIMATION_CLASS
4
5EOLIAN static void
6_efl_animation_duration_set(Eo *eo_obj EINA_UNUSED,
7 Efl_Animation_Data *pd,
8 double sec)
9{
10 pd->duration = sec;
11}
12
13EOLIAN static double
14_efl_animation_duration_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd)
15{
16 return pd->duration;
17}
18
19EOLIAN static void
20_efl_animation_final_state_keep_set(Eo *eo_obj EINA_UNUSED,
21 Efl_Animation_Data *pd,
22 Eina_Bool keep)
23{
24 if (pd->keep_final_state == keep) return;
25
26 pd->keep_final_state = !!keep;
27}
28
29EOLIAN static Eina_Bool
30_efl_animation_final_state_keep_get(Eo *eo_obj EINA_UNUSED,
31 Efl_Animation_Data *pd)
32{
33 return pd->keep_final_state;
34}
35
36EOLIAN static void
37_efl_animation_repeat_mode_set(Eo *eo_obj EINA_UNUSED,
38 Efl_Animation_Data *pd,
39 Efl_Animation_Repeat_Mode mode)
40{
41 if ((mode == EFL_ANIMATION_REPEAT_MODE_RESTART) ||
42 (mode == EFL_ANIMATION_REPEAT_MODE_REVERSE))
43 pd->repeat_mode = mode;
44}
45
46EOLIAN static Efl_Animation_Repeat_Mode
47_efl_animation_repeat_mode_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd)
48{
49 return pd->repeat_mode;
50}
51
52EOLIAN static void
53_efl_animation_repeat_count_set(Eo *eo_obj EINA_UNUSED,
54 Efl_Animation_Data *pd,
55 int count)
56{
57 //EFL_ANIMATION_REPEAT_INFINITE repeats animation infinitely
58 if ((count < 0) && (count != EFL_ANIMATION_REPEAT_INFINITE)) return;
59
60 pd->repeat_count = count;
61}
62
63EOLIAN static int
64_efl_animation_repeat_count_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd)
65{
66 return pd->repeat_count;
67}
68
69EOLIAN static void
70_efl_animation_start_delay_set(Eo *eo_obj EINA_UNUSED,
71 Efl_Animation_Data *pd,
72 double sec)
73{
74 if (sec < 0.0) return;
75
76 pd->start_delay_time = sec;
77}
78
79EOLIAN static double
80_efl_animation_start_delay_get(Eo *eo_obj EINA_UNUSED,
81 Efl_Animation_Data *pd)
82{
83 return pd->start_delay_time;
84}
85
86EOLIAN static void
87_efl_animation_interpolator_set(Eo *eo_obj EINA_UNUSED,
88 Efl_Animation_Data *pd,
89 Efl_Interpolator *interpolator)
90{
91 pd->interpolator = interpolator;
92}
93
94EOLIAN static Efl_Interpolator *
95_efl_animation_interpolator_get(Eo *eo_obj EINA_UNUSED,
96 Efl_Animation_Data *pd)
97{
98 return pd->interpolator;
99}
100
101EOLIAN static double
102_efl_animation_animation_apply(Eo *eo_obj,
103 Efl_Animation_Data *pd EINA_UNUSED,
104 double progress,
105 Efl_Canvas_Object *target EINA_UNUSED)
106{
107 Efl_Interpolator *interpolator = efl_animation_interpolator_get(eo_obj);
108 if (interpolator)
109 progress = efl_interpolator_interpolate(interpolator, progress);
110
111 return progress;
112}
113
114EOLIAN static double
115_efl_animation_efl_playable_length_get(Eo *eo_obj, Efl_Animation_Data *pd EINA_UNUSED)
116{
117 if (efl_animation_repeat_count_get(eo_obj) == EFL_ANIMATION_REPEAT_INFINITE)
118 {
119 //TODO: what's correct?
120 return (double)EFL_ANIMATION_REPEAT_INFINITE;
121 }
122
123 return (efl_animation_duration_get(eo_obj) * (efl_animation_repeat_count_get(eo_obj) + 1));
124}
125
126EOLIAN static Eina_Bool
127_efl_animation_efl_playable_playable_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd EINA_UNUSED)
128{
129 return EINA_TRUE;
130}
131
132EOLIAN static Eina_Bool
133_efl_animation_efl_playable_seekable_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd EINA_UNUSED)
134{
135 return EINA_TRUE;
136}
137
138#include "efl_animation.eo.c"
diff --git a/src/lib/evas/canvas/efl_animation_alpha_private.h b/src/lib/evas/canvas/efl_animation_alpha_private.h
deleted file mode 100644
index d1861df..0000000
--- a/src/lib/evas/canvas/efl_animation_alpha_private.h
+++ /dev/null
@@ -1,19 +0,0 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5#include "efl_animation_private.h"
6
7#define EFL_ANIMATION_ALPHA_DATA_GET(o, pd) \
8 Efl_Animation_Alpha_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_ALPHA_CLASS)
9
10typedef struct _Efl_Animation_Alpha_Property
11{
12 double alpha;
13} Efl_Animation_Alpha_Property;
14
15typedef struct _Efl_Animation_Alpha_Data
16{
17 Efl_Animation_Alpha_Property from;
18 Efl_Animation_Alpha_Property to;
19} Efl_Animation_Alpha_Data;
diff --git a/src/lib/evas/canvas/efl_animation_group.eo b/src/lib/evas/canvas/efl_animation_group.eo
deleted file mode 100644
index ab42604..0000000
--- a/src/lib/evas/canvas/efl_animation_group.eo
+++ /dev/null
@@ -1,32 +0,0 @@
1import efl_animation_types;
2
3abstract Efl.Animation.Group (Efl.Animation)
4{
5 [[Efl group animation abstract class]]
6 data: Efl_Animation_Group_Data;
7 methods {
8 animation_add {
9 [[Add the given animation to the animation group.]]
10 params {
11 @in animation: Efl.Animation; [[The animation which needs to be added to the animation group]]
12 }
13 }
14 animation_del {
15 [[Delete the given animation from the animation group.]]
16 params {
17 @in animation: Efl.Animation; [[The animation which needs to be deleted from the animation group]]
18 }
19 }
20 animations_get {
21 [[Get the animations of the animation group.]]
22 return: list<Efl.Animation>; [[The animations of the animation group]]
23 }
24 }
25 implements {
26 Efl.Object.constructor;
27 Efl.Object.destructor;
28 Efl.Animation.duration { set; }
29 Efl.Animation.final_state_keep { set; }
30 Efl.Animation.interpolator { set; }
31 }
32}
diff --git a/src/lib/evas/canvas/efl_animation_group_parallel.eo b/src/lib/evas/canvas/efl_animation_group_parallel.eo
deleted file mode 100644
index 944e2ad..0000000
--- a/src/lib/evas/canvas/efl_animation_group_parallel.eo
+++ /dev/null
@@ -1,13 +0,0 @@
1import efl_animation_types;
2
3class Efl.Animation.Group.Parallel (Efl.Animation.Group)
4{
5 [[Efl group parallel animation class]]
6 data: null;
7 methods {
8 }
9 implements {
10 Efl.Animation.duration { get; }
11 Efl.Animation.animation_apply;
12 }
13}
diff --git a/src/lib/evas/canvas/efl_animation_group_private.h b/src/lib/evas/canvas/efl_animation_group_private.h
deleted file mode 100644
index 28c6b8b..0000000
--- a/src/lib/evas/canvas/efl_animation_group_private.h
+++ /dev/null
@@ -1,15 +0,0 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5
6#define MY_CLASS EFL_ANIMATION_GROUP_CLASS
7#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
8
9#define EFL_ANIMATION_GROUP_DATA_GET(o, pd) \
10 Efl_Animation_Group_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_GROUP_CLASS)
11
12typedef struct _Efl_Animation_Group_Data
13{
14 Eina_List *animations;
15} Efl_Animation_Group_Data;
diff --git a/src/lib/evas/canvas/efl_animation_group_sequential.eo b/src/lib/evas/canvas/efl_animation_group_sequential.eo
deleted file mode 100644
index 2124f23..0000000
--- a/src/lib/evas/canvas/efl_animation_group_sequential.eo
+++ /dev/null
@@ -1,13 +0,0 @@
1import efl_animation_types;
2
3class Efl.Animation.Group.Sequential (Efl.Animation.Group)
4{
5 [[Efl group sequential animation class]]
6 data: null;
7 methods {
8 }
9 implements {
10 Efl.Animation.duration { get; }
11 Efl.Animation.animation_apply;
12 }
13}
diff --git a/src/lib/evas/canvas/efl_animation_rotate_private.h b/src/lib/evas/canvas/efl_animation_rotate_private.h
deleted file mode 100644
index 5cbd648..0000000
--- a/src/lib/evas/canvas/efl_animation_rotate_private.h
+++ /dev/null
@@ -1,35 +0,0 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5#include "efl_animation_private.h"
6
7#define EFL_ANIMATION_ROTATE_DATA_GET(o, pd) \
8 Efl_Animation_Rotate_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_ROTATE_CLASS)
9
10typedef struct _Efl_Animation_Rotate_Property
11{
12 double degree;
13} Efl_Animation_Rotate_Property;
14
15typedef struct _Efl_Animation_Rotate_Absolute_Pivot
16{
17 Evas_Coord cx, cy;
18} Efl_Animation_Rotate_Absolute_Pivot;
19
20typedef struct _Efl_Animation_Rotate_Relative_Pivot
21{
22 Efl_Canvas_Object *obj;
23 double cx, cy;
24} Efl_Animation_Rotate_Relative_Pivot;
25
26typedef struct _Efl_Animation_Rotate_Data
27{
28 Efl_Animation_Rotate_Property from;
29 Efl_Animation_Rotate_Property to;
30
31 Efl_Animation_Rotate_Absolute_Pivot abs_pivot;
32 Efl_Animation_Rotate_Relative_Pivot rel_pivot;
33
34 Eina_Bool use_rel_pivot;
35} Efl_Animation_Rotate_Data;
diff --git a/src/lib/evas/canvas/efl_animation_scale_private.h b/src/lib/evas/canvas/efl_animation_scale_private.h
deleted file mode 100644
index 603eac3..0000000
--- a/src/lib/evas/canvas/efl_animation_scale_private.h
+++ /dev/null
@@ -1,35 +0,0 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5#include "efl_animation_private.h"
6
7#define EFL_ANIMATION_SCALE_DATA_GET(o, pd) \
8 Efl_Animation_Scale_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_SCALE_CLASS)
9
10typedef struct _Efl_Animation_Scale_Property
11{
12 double scale_x, scale_y;
13} Efl_Animation_Scale_Property;
14
15typedef struct _Efl_Animation_Scale_Absolute_Pivot
16{
17 Evas_Coord cx, cy;
18} Efl_Animation_Scale_Absolute_Pivot;
19
20typedef struct _Efl_Animation_Scale_Relative_Pivot
21{
22 Efl_Canvas_Object *obj;
23 double cx, cy;
24} Efl_Animation_Scale_Relative_Pivot;
25
26typedef struct _Efl_Animation_Scale_Data
27{
28 Efl_Animation_Scale_Property from;
29 Efl_Animation_Scale_Property to;
30
31 Efl_Animation_Scale_Absolute_Pivot abs_pivot;
32 Efl_Animation_Scale_Relative_Pivot rel_pivot;
33
34 Eina_Bool use_rel_pivot;
35} Efl_Animation_Scale_Data;
diff --git a/src/lib/evas/canvas/efl_animation_translate_private.h b/src/lib/evas/canvas/efl_animation_translate_private.h
deleted file mode 100644
index 05f2f7c..0000000
--- a/src/lib/evas/canvas/efl_animation_translate_private.h
+++ /dev/null
@@ -1,22 +0,0 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5#include "efl_animation_private.h"
6
7#define EFL_ANIMATION_TRANSLATE_DATA_GET(o, pd) \
8 Efl_Animation_Translate_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_TRANSLATE_CLASS)
9
10typedef struct _Efl_Animation_Translate_Property
11{
12 Evas_Coord move_x, move_y;
13 Evas_Coord x, y;
14} Efl_Animation_Translate_Property;
15
16typedef struct _Efl_Animation_Translate_Data
17{
18 Efl_Animation_Translate_Property from;
19 Efl_Animation_Translate_Property to;
20
21 Eina_Bool use_rel_move;
22} Efl_Animation_Translate_Data;
diff --git a/src/lib/evas/canvas/efl_canvas_animation.c b/src/lib/evas/canvas/efl_canvas_animation.c
new file mode 100644
index 0000000..8aee04d
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_animation.c
@@ -0,0 +1,138 @@
1#include "efl_canvas_animation_private.h"
2
3#define MY_CLASS EFL_CANVAS_ANIMATION_CLASS
4
5EOLIAN static void
6_efl_canvas_animation_duration_set(Eo *eo_obj EINA_UNUSED,
7 Efl_Canvas_Animation_Data *pd,
8 double sec)
9{
10 pd->duration = sec;
11}
12
13EOLIAN static double
14_efl_canvas_animation_duration_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Animation_Data *pd)
15{
16 return pd->duration;
17}
18
19EOLIAN static void
20_efl_canvas_animation_final_state_keep_set(Eo *eo_obj EINA_UNUSED,
21 Efl_Canvas_Animation_Data *pd,
22 Eina_Bool keep)
23{
24 if (pd->keep_final_state == keep) return;
25
26 pd->keep_final_state = !!keep;
27}
28
29EOLIAN static Eina_Bool
30_efl_canvas_animation_final_state_keep_get(Eo *eo_obj EINA_UNUSED,
31 Efl_Canvas_Animation_Data *pd)
32{
33 return pd->keep_final_state;
34}
35
36EOLIAN static void
37_efl_canvas_animation_repeat_mode_set(Eo *eo_obj EINA_UNUSED,
38 Efl_Canvas_Animation_Data *pd,
39 Efl_Canvas_Animation_Repeat_Mode mode)
40{
41 if ((mode == EFL_CANVAS_ANIMATION_REPEAT_MODE_RESTART) ||
42 (mode == EFL_CANVAS_ANIMATION_REPEAT_MODE_REVERSE))
43 pd->repeat_mode = mode;
44}
45
46EOLIAN static Efl_Canvas_Animation_Repeat_Mode
47_efl_canvas_animation_repeat_mode_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Animation_Data *pd)
48{
49 return pd->repeat_mode;
50}
51
52EOLIAN static void
53_efl_canvas_animation_repeat_count_set(Eo *eo_obj EINA_UNUSED,
54 Efl_Canvas_Animation_Data *pd,
55 int count)
56{
57 //EFL_ANIMATION_REPEAT_INFINITE repeats animation infinitely
58 if ((count < 0) && (count != EFL_ANIMATION_REPEAT_INFINITE)) return;
59
60 pd->repeat_count = count;
61}
62
63EOLIAN static int
64_efl_canvas_animation_repeat_count_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Animation_Data *pd)
65{
66 return pd->repeat_count;
67}
68
69EOLIAN static void
70_efl_canvas_animation_start_delay_set(Eo *eo_obj EINA_UNUSED,
71 Efl_Canvas_Animation_Data *pd,
72 double sec)
73{
74 if (sec < 0.0) return;
75
76 pd->start_delay_time = sec;
77}
78
79EOLIAN static double
80_efl_canvas_animation_start_delay_get(Eo *eo_obj EINA_UNUSED,
81 Efl_Canvas_Animation_Data *pd)
82{
83 return pd->start_delay_time;
84}
85
86EOLIAN static void
87_efl_canvas_animation_interpolator_set(Eo *eo_obj EINA_UNUSED,
88 Efl_Canvas_Animation_Data *pd,
89 Efl_Interpolator *interpolator)
90{
91 pd->interpolator = interpolator;
92}
93
94EOLIAN static Efl_Interpolator *
95_efl_canvas_animation_interpolator_get(Eo *eo_obj EINA_UNUSED,
96 Efl_Canvas_Animation_Data *pd)
97{
98 return pd->interpolator;
99}
100
101EOLIAN static double
102_efl_canvas_animation_animation_apply(Eo *eo_obj,
103 Efl_Canvas_Animation_Data *pd EINA_UNUSED,
104 double progress,
105 Efl_Canvas_Object *target EINA_UNUSED)
106{
107 Efl_Interpolator *interpolator = efl_animation_interpolator_get(eo_obj);
108 if (interpolator)
109 progress = efl_interpolator_interpolate(interpolator, progress);
110
111 return progress;
112}
113
114EOLIAN static double
115_efl_canvas_animation_efl_playable_length_get(Eo *eo_obj, Efl_Canvas_Animation_Data *pd EINA_UNUSED)
116{
117 if (efl_animation_repeat_count_get(eo_obj) == EFL_ANIMATION_REPEAT_INFINITE)
118 {
119 //TODO: what's correct?
120 return (double)EFL_ANIMATION_REPEAT_INFINITE;
121 }
122
123 return (efl_animation_duration_get(eo_obj) * (efl_animation_repeat_count_get(eo_obj) + 1));
124}
125
126EOLIAN static Eina_Bool
127_efl_canvas_animation_efl_playable_playable_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Animation_Data *pd EINA_UNUSED)
128{
129 return EINA_TRUE;
130}
131
132EOLIAN static Eina_Bool
133_efl_canvas_animation_efl_playable_seekable_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Animation_Data *pd EINA_UNUSED)
134{
135 return EINA_TRUE;
136}
137
138#include "efl_canvas_animation.eo.c"
diff --git a/src/lib/evas/canvas/efl_animation.eo b/src/lib/evas/canvas/efl_canvas_animation.eo
index 35f5739..b3a2b22 100644
--- a/src/lib/evas/canvas/efl_animation.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation.eo
@@ -1,8 +1,9 @@
1import efl_animation_types; 1import efl_canvas_animation_types;
2 2
3class Efl.Animation (Efl.Object, Efl.Playable) 3class Efl.Canvas.Animation (Efl.Object, Efl.Playable)
4{ 4{
5 [[Efl animation class]] 5 [[Efl animation class]]
6 eo_prefix: efl_animation;
6 methods { 7 methods {
7 @property final_state_keep { 8 @property final_state_keep {
8 [[Keep final state property]] 9 [[Keep final state property]]
@@ -31,7 +32,7 @@ class Efl.Animation (Efl.Object, Efl.Playable)
31 get { 32 get {
32 } 33 }
33 values { 34 values {
34 mode: Efl.Animation.Repeat_Mode; [[Repeat mode. EFL_ANIMATION_REPEAT_MODE_RESTART restarts animation when the animation ends and EFL_ANIMATION_REPEAT_MODE_REVERSE reverses animation when the animation ends.]] 35 mode: Efl.Canvas.Animation.Repeat_Mode; [[Repeat mode. EFL_ANIMATION_REPEAT_MODE_RESTART restarts animation when the animation ends and EFL_ANIMATION_REPEAT_MODE_REVERSE reverses animation when the animation ends.]]
35 } 36 }
36 } 37 }
37 @property repeat_count { 38 @property repeat_count {
diff --git a/src/lib/evas/canvas/efl_animation_alpha.c b/src/lib/evas/canvas/efl_canvas_animation_alpha.c
index 4da7165..8210142 100644
--- a/src/lib/evas/canvas/efl_animation_alpha.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_alpha.c
@@ -1,10 +1,10 @@
1#include "efl_animation_alpha_private.h" 1#include "efl_canvas_animation_alpha_private.h"
2 2
3#define MY_CLASS EFL_ANIMATION_ALPHA_CLASS 3#define MY_CLASS EFL_CANVAS_ANIMATION_ALPHA_CLASS
4 4
5EOLIAN static void 5EOLIAN static void
6_efl_animation_alpha_alpha_set(Eo *eo_obj EINA_UNUSED, 6_efl_canvas_animation_alpha_alpha_set(Eo *eo_obj EINA_UNUSED,
7 Efl_Animation_Alpha_Data *pd, 7 Efl_Canvas_Animation_Alpha_Data *pd,
8 double from_alpha, 8 double from_alpha,
9 double to_alpha) 9 double to_alpha)
10{ 10{
@@ -13,8 +13,8 @@ _efl_animation_alpha_alpha_set(Eo *eo_obj EINA_UNUSED,
13} 13}
14 14
15EOLIAN static void 15EOLIAN static void
16_efl_animation_alpha_alpha_get(Eo *eo_obj EINA_UNUSED, 16_efl_canvas_animation_alpha_alpha_get(Eo *eo_obj EINA_UNUSED,
17 Efl_Animation_Alpha_Data *pd, 17 Efl_Canvas_Animation_Alpha_Data *pd,
18 double *from_alpha, 18 double *from_alpha,
19 double *to_alpha) 19 double *to_alpha)
20{ 20{
@@ -26,8 +26,8 @@ _efl_animation_alpha_alpha_get(Eo *eo_obj EINA_UNUSED,
26 26
27 27
28EOLIAN static double 28EOLIAN static double
29_efl_animation_alpha_efl_animation_animation_apply(Eo *eo_obj, 29_efl_canvas_animation_alpha_efl_canvas_animation_animation_apply(Eo *eo_obj,
30 Efl_Animation_Alpha_Data *pd EINA_UNUSED, 30 Efl_Canvas_Animation_Alpha_Data *pd EINA_UNUSED,
31 double progress, 31 double progress,
32 Efl_Canvas_Object *target) 32 Efl_Canvas_Object *target)
33{ 33{
@@ -50,8 +50,8 @@ _efl_animation_alpha_efl_animation_animation_apply(Eo *eo_obj,
50} 50}
51 51
52EOLIAN static Efl_Object * 52EOLIAN static Efl_Object *
53_efl_animation_alpha_efl_object_constructor(Eo *eo_obj, 53_efl_canvas_animation_alpha_efl_object_constructor(Eo *eo_obj,
54 Efl_Animation_Alpha_Data *pd) 54 Efl_Canvas_Animation_Alpha_Data *pd)
55{ 55{
56 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 56 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
57 57
@@ -61,4 +61,4 @@ _efl_animation_alpha_efl_object_constructor(Eo *eo_obj,
61 return eo_obj; 61 return eo_obj;
62} 62}
63 63
64#include "efl_animation_alpha.eo.c" 64#include "efl_canvas_animation_alpha.eo.c"
diff --git a/src/lib/evas/canvas/efl_animation_alpha.eo b/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
index ab10138..78e2792 100644
--- a/src/lib/evas/canvas/efl_animation_alpha.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
@@ -1,9 +1,10 @@
1import efl_animation_types; 1import efl_canvas_animation_types;
2 2
3class Efl.Animation.Alpha (Efl.Animation) 3class Efl.Canvas.Animation.Alpha (Efl.Canvas.Animation)
4{ 4{
5 [[Efl alpha animation class]] 5 [[Efl alpha animation class]]
6 data: Efl_Animation_Alpha_Data; 6 eo_prefix: efl_animation_alpha;
7 data: Efl_Canvas_Animation_Alpha_Data;
7 methods { 8 methods {
8 @property alpha { 9 @property alpha {
9 [[Alpha property]] 10 [[Alpha property]]
@@ -19,6 +20,6 @@ class Efl.Animation.Alpha (Efl.Animation)
19 } 20 }
20 implements { 21 implements {
21 Efl.Object.constructor; 22 Efl.Object.constructor;
22 Efl.Animation.animation_apply; 23 Efl.Canvas.Animation.animation_apply;
23 } 24 }
24} 25}
diff --git a/src/lib/evas/canvas/efl_canvas_animation_alpha_private.h b/src/lib/evas/canvas/efl_canvas_animation_alpha_private.h
new file mode 100644
index 0000000..fc0b9e6
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_animation_alpha_private.h
@@ -0,0 +1,19 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5#include "efl_canvas_animation_private.h"
6
7#define EFL_ANIMATION_ALPHA_DATA_GET(o, pd) \
8 Efl_Canvas_Animation_Alpha_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_ALPHA_CLASS)
9
10typedef struct _Efl_Canvas_Animation_Alpha_Property
11{
12 double alpha;
13} Efl_Canvas_Animation_Alpha_Property;
14
15typedef struct _Efl_Canvas_Animation_Alpha_Data
16{
17 Efl_Canvas_Animation_Alpha_Property from;
18 Efl_Canvas_Animation_Alpha_Property to;
19} Efl_Canvas_Animation_Alpha_Data;
diff --git a/src/lib/evas/canvas/efl_animation_group.c b/src/lib/evas/canvas/efl_canvas_animation_group.c
index 1792f0e..9049e5b 100644
--- a/src/lib/evas/canvas/efl_animation_group.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_group.c
@@ -1,9 +1,9 @@
1#include "efl_animation_group_private.h" 1#include "efl_canvas_animation_group_private.h"
2 2
3EOLIAN static void 3EOLIAN static void
4_efl_animation_group_animation_add(Eo *eo_obj, 4_efl_canvas_animation_group_animation_add(Eo *eo_obj,
5 Efl_Animation_Group_Data *pd, 5 Efl_Canvas_Animation_Group_Data *pd,
6 Efl_Animation *animation) 6 Efl_Canvas_Animation *animation)
7{ 7{
8 if (!animation) return; 8 if (!animation) return;
9 9
@@ -21,9 +21,9 @@ _efl_animation_group_animation_add(Eo *eo_obj,
21} 21}
22 22
23EOLIAN static void 23EOLIAN static void
24_efl_animation_group_animation_del(Eo *eo_obj EINA_UNUSED, 24_efl_canvas_animation_group_animation_del(Eo *eo_obj EINA_UNUSED,
25 Efl_Animation_Group_Data *pd, 25 Efl_Canvas_Animation_Group_Data *pd,
26 Efl_Animation *animation) 26 Efl_Canvas_Animation *animation)
27{ 27{
28 Eina_List *list; 28 Eina_List *list;
29 if (!animation) return; 29 if (!animation) return;
@@ -42,15 +42,15 @@ _efl_animation_group_animation_del(Eo *eo_obj EINA_UNUSED,
42} 42}
43 43
44EOLIAN static Eina_List * 44EOLIAN static Eina_List *
45_efl_animation_group_animations_get(Eo *eo_obj EINA_UNUSED, 45_efl_canvas_animation_group_animations_get(Eo *eo_obj EINA_UNUSED,
46 Efl_Animation_Group_Data *pd) 46 Efl_Canvas_Animation_Group_Data *pd)
47{ 47{
48 return pd->animations; 48 return pd->animations;
49} 49}
50 50
51EOLIAN static void 51EOLIAN static void
52_efl_animation_group_efl_animation_duration_set(Eo *eo_obj, 52_efl_canvas_animation_group_efl_canvas_animation_duration_set(Eo *eo_obj,
53 Efl_Animation_Group_Data *pd, 53 Efl_Canvas_Animation_Group_Data *pd,
54 double duration) 54 double duration)
55{ 55{
56 if (duration == EFL_ANIMATION_GROUP_DURATION_NONE) goto end; 56 if (duration == EFL_ANIMATION_GROUP_DURATION_NONE) goto end;
@@ -58,7 +58,7 @@ _efl_animation_group_efl_animation_duration_set(Eo *eo_obj,
58 if (duration < 0.0) return; 58 if (duration < 0.0) return;
59 59
60 Eina_List *l; 60 Eina_List *l;
61 Efl_Animation *anim; 61 Efl_Canvas_Animation *anim;
62 EINA_LIST_FOREACH(pd->animations, l, anim) 62 EINA_LIST_FOREACH(pd->animations, l, anim)
63 { 63 {
64 efl_animation_duration_set(anim, duration); 64 efl_animation_duration_set(anim, duration);
@@ -69,12 +69,12 @@ end:
69} 69}
70 70
71EOLIAN static void 71EOLIAN static void
72_efl_animation_group_efl_animation_final_state_keep_set(Eo *eo_obj, 72_efl_canvas_animation_group_efl_canvas_animation_final_state_keep_set(Eo *eo_obj,
73 Efl_Animation_Group_Data *pd, 73 Efl_Canvas_Animation_Group_Data *pd,
74 Eina_Bool keep_final_state) 74 Eina_Bool keep_final_state)
75{ 75{
76 Eina_List *l; 76 Eina_List *l;
77 Efl_Animation *anim; 77 Efl_Canvas_Animation *anim;
78 EINA_LIST_FOREACH(pd->animations, l, anim) 78 EINA_LIST_FOREACH(pd->animations, l, anim)
79 { 79 {
80 efl_animation_final_state_keep_set(anim, keep_final_state); 80 efl_animation_final_state_keep_set(anim, keep_final_state);
@@ -84,12 +84,12 @@ _efl_animation_group_efl_animation_final_state_keep_set(Eo *eo_obj,
84} 84}
85 85
86EOLIAN static void 86EOLIAN static void
87_efl_animation_group_efl_animation_interpolator_set(Eo *eo_obj, 87_efl_canvas_animation_group_efl_canvas_animation_interpolator_set(Eo *eo_obj,
88 Efl_Animation_Group_Data *pd, 88 Efl_Canvas_Animation_Group_Data *pd,
89 Efl_Interpolator *interpolator) 89 Efl_Interpolator *interpolator)
90{ 90{
91 Eina_List *l; 91 Eina_List *l;
92 Efl_Animation *anim; 92 Efl_Canvas_Animation *anim;
93 EINA_LIST_FOREACH(pd->animations, l, anim) 93 EINA_LIST_FOREACH(pd->animations, l, anim)
94 { 94 {
95 efl_animation_interpolator_set(anim, interpolator); 95 efl_animation_interpolator_set(anim, interpolator);
@@ -99,8 +99,8 @@ _efl_animation_group_efl_animation_interpolator_set(Eo *eo_obj,
99} 99}
100 100
101EOLIAN static Efl_Object * 101EOLIAN static Efl_Object *
102_efl_animation_group_efl_object_constructor(Eo *eo_obj, 102_efl_canvas_animation_group_efl_object_constructor(Eo *eo_obj,
103 Efl_Animation_Group_Data *pd) 103 Efl_Canvas_Animation_Group_Data *pd)
104{ 104{
105 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 105 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
106 106
@@ -113,10 +113,10 @@ _efl_animation_group_efl_object_constructor(Eo *eo_obj,
113} 113}
114 114
115EOLIAN static void 115EOLIAN static void
116_efl_animation_group_efl_object_destructor(Eo *eo_obj, 116_efl_canvas_animation_group_efl_object_destructor(Eo *eo_obj,
117 Efl_Animation_Group_Data *pd) 117 Efl_Canvas_Animation_Group_Data *pd)
118{ 118{
119 Efl_Animation *anim; 119 Efl_Canvas_Animation *anim;
120 120
121 EINA_LIST_FREE(pd->animations, anim) 121 EINA_LIST_FREE(pd->animations, anim)
122 efl_unref(anim); 122 efl_unref(anim);
@@ -124,4 +124,4 @@ _efl_animation_group_efl_object_destructor(Eo *eo_obj,
124 efl_destructor(efl_super(eo_obj, MY_CLASS)); 124 efl_destructor(efl_super(eo_obj, MY_CLASS));
125} 125}
126 126
127#include "efl_animation_group.eo.c" 127#include "efl_canvas_animation_group.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group.eo b/src/lib/evas/canvas/efl_canvas_animation_group.eo
new file mode 100644
index 0000000..13a0cd5
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_animation_group.eo
@@ -0,0 +1,33 @@
1import efl_canvas_animation_types;
2
3abstract Efl.Canvas.Animation.Group (Efl.Canvas.Animation)
4{
5 [[Efl group animation abstract class]]
6 eo_prefix: efl_animation_group;
7 data: Efl_Canvas_Animation_Group_Data;
8 methods {
9 animation_add {
10 [[Add the given animation to the animation group.]]
11 params {
12 @in animation: Efl.Canvas.Animation; [[The animation which needs to be added to the animation group]]
13 }
14 }
15 animation_del {
16 [[Delete the given animation from the animation group.]]
17 params {
18 @in animation: Efl.Canvas.Animation; [[The animation which needs to be deleted from the animation group]]
19 }
20 }
21 animations_get {
22 [[Get the animations of the animation group.]]
23 return: list<Efl.Canvas.Animation>; [[The animations of the animation group]]
24 }
25 }
26 implements {
27 Efl.Object.constructor;
28 Efl.Object.destructor;
29 Efl.Canvas.Animation.duration { set; }
30 Efl.Canvas.Animation.final_state_keep { set; }
31 Efl.Canvas.Animation.interpolator { set; }
32 }
33}
diff --git a/src/lib/evas/canvas/efl_animation_group_parallel.c b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.c
index d85d527..725ae69 100644
--- a/src/lib/evas/canvas/efl_animation_group_parallel.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.c
@@ -1,9 +1,9 @@
1#include "efl_animation_group_parallel_private.h" 1#include "efl_canvas_animation_group_parallel_private.h"
2 2
3#define MY_CLASS EFL_ANIMATION_GROUP_PARALLEL_CLASS 3#define MY_CLASS EFL_CANVAS_ANIMATION_GROUP_PARALLEL_CLASS
4 4
5EOLIAN static double 5EOLIAN static double
6_efl_animation_group_parallel_efl_animation_animation_apply(Eo *eo_obj, 6_efl_canvas_animation_group_parallel_efl_canvas_animation_animation_apply(Eo *eo_obj,
7 void *_pd EINA_UNUSED, 7 void *_pd EINA_UNUSED,
8 double progress, 8 double progress,
9 Efl_Canvas_Object *target) 9 Efl_Canvas_Object *target)
@@ -20,7 +20,7 @@ _efl_animation_group_parallel_efl_animation_animation_apply(Eo *eo_obj,
20 group_elapsed_time = group_length * progress; 20 group_elapsed_time = group_length * progress;
21 21
22 Eina_List *l; 22 Eina_List *l;
23 Efl_Animation *anim; 23 Efl_Canvas_Animation *anim;
24 EINA_LIST_FOREACH(group_anim, l, anim) 24 EINA_LIST_FOREACH(group_anim, l, anim)
25 { 25 {
26 anim_length = efl_playable_length_get(anim); 26 anim_length = efl_playable_length_get(anim);
@@ -53,7 +53,7 @@ _efl_animation_group_parallel_efl_animation_animation_apply(Eo *eo_obj,
53} 53}
54 54
55EOLIAN static double 55EOLIAN static double
56_efl_animation_group_parallel_efl_animation_duration_get(Eo *eo_obj, void *_pd EINA_UNUSED) 56_efl_canvas_animation_group_parallel_efl_canvas_animation_duration_get(Eo *eo_obj, void *_pd EINA_UNUSED)
57{ 57{
58 double child_total_duration; 58 double child_total_duration;
59 double total_duration = 0.0; 59 double total_duration = 0.0;
@@ -62,7 +62,7 @@ _efl_animation_group_parallel_efl_animation_duration_get(Eo *eo_obj, void *_pd E
62 if (!animations) return 0.0; 62 if (!animations) return 0.0;
63 63
64 Eina_List *l; 64 Eina_List *l;
65 Efl_Animation *anim; 65 Efl_Canvas_Animation *anim;
66 EINA_LIST_FOREACH(animations, l, anim) 66 EINA_LIST_FOREACH(animations, l, anim)
67 { 67 {
68 child_total_duration = efl_playable_length_get(anim); 68 child_total_duration = efl_playable_length_get(anim);
@@ -74,4 +74,4 @@ _efl_animation_group_parallel_efl_animation_duration_get(Eo *eo_obj, void *_pd E
74 return total_duration; 74 return total_duration;
75} 75}
76 76
77#include "efl_animation_group_parallel.eo.c" 77#include "efl_canvas_animation_group_parallel.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
new file mode 100644
index 0000000..b5db2ce
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
@@ -0,0 +1,14 @@
1import efl_canvas_animation_types;
2
3class Efl.Canvas.Animation.Group.Parallel (Efl.Canvas.Animation.Group)
4{
5 [[Efl group parallel animation class]]
6 eo_prefix: efl_animation_group_parallel;
7 data: null;
8 methods {
9 }
10 implements {
11 Efl.Canvas.Animation.duration { get; }
12 Efl.Canvas.Animation.animation_apply;
13 }
14}
diff --git a/src/lib/evas/canvas/efl_animation_group_parallel_private.h b/src/lib/evas/canvas/efl_canvas_animation_group_parallel_private.h
index c3498a7..332e3b6 100644
--- a/src/lib/evas/canvas/efl_animation_group_parallel_private.h
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_parallel_private.h
@@ -2,4 +2,4 @@
2 2
3#include "evas_common_private.h" 3#include "evas_common_private.h"
4#include <Ecore.h> 4#include <Ecore.h>
5#include "efl_animation_private.h" 5#include "efl_canvas_animation_private.h"
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_private.h b/src/lib/evas/canvas/efl_canvas_animation_group_private.h
new file mode 100644
index 0000000..685e8f6
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_private.h
@@ -0,0 +1,15 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5
6#define MY_CLASS EFL_CANVAS_ANIMATION_GROUP_CLASS
7#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
8
9#define EFL_ANIMATION_GROUP_DATA_GET(o, pd) \
10 Efl_Canvas_Animation_Group_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_GROUP_CLASS)
11
12typedef struct _Efl_Canvas_Animation_Group_Data
13{
14 Eina_List *animations;
15} Efl_Canvas_Animation_Group_Data;
diff --git a/src/lib/evas/canvas/efl_animation_group_sequential.c b/src/lib/evas/canvas/efl_canvas_animation_group_sequential.c
index 8bc8384..c6aade5 100644
--- a/src/lib/evas/canvas/efl_animation_group_sequential.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_sequential.c
@@ -1,9 +1,9 @@
1#include "efl_animation_group_sequential_private.h" 1#include "efl_canvas_animation_group_sequential_private.h"
2 2
3#define MY_CLASS EFL_ANIMATION_GROUP_SEQUENTIAL_CLASS 3#define MY_CLASS EFL_CANVAS_ANIMATION_GROUP_SEQUENTIAL_CLASS
4 4
5EOLIAN static double 5EOLIAN static double
6_efl_animation_group_sequential_efl_animation_animation_apply(Eo *eo_obj, 6_efl_canvas_animation_group_sequential_efl_canvas_animation_animation_apply(Eo *eo_obj,
7 void *_pd EINA_UNUSED, 7 void *_pd EINA_UNUSED,
8 double progress, 8 double progress,
9 Efl_Canvas_Object *target) 9 Efl_Canvas_Object *target)
@@ -22,7 +22,7 @@ _efl_animation_group_sequential_efl_animation_animation_apply(Eo *eo_obj,
22 group_elapsed_time = group_length * progress; 22 group_elapsed_time = group_length * progress;
23 23
24 Eina_List *l; 24 Eina_List *l;
25 Efl_Animation *anim; 25 Efl_Canvas_Animation *anim;
26 EINA_LIST_FOREACH(group_anim, l, anim) 26 EINA_LIST_FOREACH(group_anim, l, anim)
27 { 27 {
28 anim_start_delay = efl_animation_start_delay_get(anim); 28 anim_start_delay = efl_animation_start_delay_get(anim);
@@ -58,7 +58,7 @@ _efl_animation_group_sequential_efl_animation_animation_apply(Eo *eo_obj,
58} 58}
59 59
60EOLIAN static double 60EOLIAN static double
61_efl_animation_group_sequential_efl_animation_duration_get(Eo *eo_obj, void *_pd EINA_UNUSED) 61_efl_canvas_animation_group_sequential_efl_canvas_animation_duration_get(Eo *eo_obj, void *_pd EINA_UNUSED)
62{ 62{
63 double total_duration = 0.0; 63 double total_duration = 0.0;
64 double child_total_duration; 64 double child_total_duration;
@@ -67,7 +67,7 @@ _efl_animation_group_sequential_efl_animation_duration_get(Eo *eo_obj, void *_pd
67 if (!animations) return 0.0; 67 if (!animations) return 0.0;
68 68
69 Eina_List *l; 69 Eina_List *l;
70 Efl_Animation *anim; 70 Efl_Canvas_Animation *anim;
71 EINA_LIST_FOREACH(animations, l, anim) 71 EINA_LIST_FOREACH(animations, l, anim)
72 { 72 {
73 child_total_duration = efl_playable_length_get(anim); 73 child_total_duration = efl_playable_length_get(anim);
@@ -78,4 +78,4 @@ _efl_animation_group_sequential_efl_animation_duration_get(Eo *eo_obj, void *_pd
78 return total_duration; 78 return total_duration;
79} 79}
80 80
81#include "efl_animation_group_sequential.eo.c" 81#include "efl_canvas_animation_group_sequential.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo b/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo
new file mode 100644
index 0000000..0e02e90
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo
@@ -0,0 +1,13 @@
1import efl_canvas_animation_types;
2
3class Efl.Canvas.Animation.Group.Sequential (Efl.Canvas.Animation.Group)
4{
5 [[Efl group sequential animation class]]
6 data: null;
7 methods {
8 }
9 implements {
10 Efl.Canvas.Animation.duration { get; }
11 Efl.Canvas.Animation.animation_apply;
12 }
13}
diff --git a/src/lib/evas/canvas/efl_animation_group_sequential_private.h b/src/lib/evas/canvas/efl_canvas_animation_group_sequential_private.h
index c3498a7..332e3b6 100644
--- a/src/lib/evas/canvas/efl_animation_group_sequential_private.h
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_sequential_private.h
@@ -2,4 +2,4 @@
2 2
3#include "evas_common_private.h" 3#include "evas_common_private.h"
4#include <Ecore.h> 4#include <Ecore.h>
5#include "efl_animation_private.h" 5#include "efl_canvas_animation_private.h"
diff --git a/src/lib/evas/canvas/efl_animation_player.c b/src/lib/evas/canvas/efl_canvas_animation_player.c
index 50af3d3..032bf57 100644
--- a/src/lib/evas/canvas/efl_animation_player.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.c
@@ -1,15 +1,15 @@
1#include "efl_animation_player_private.h" 1#include "efl_canvas_animation_player_private.h"
2 2
3static void 3static void
4_target_del_cb(void *data, const Efl_Event *event EINA_UNUSED) 4_target_del_cb(void *data, const Efl_Event *event EINA_UNUSED)
5{ 5{
6 Efl_Animation_Player_Data *pd = data; 6 Efl_Canvas_Animation_Player_Data *pd = data;
7 pd->target = NULL; 7 pd->target = NULL;
8} 8}
9 9
10EOLIAN static void 10EOLIAN static void
11_efl_animation_player_target_set(Eo *eo_obj EINA_UNUSED, 11_efl_canvas_animation_player_target_set(Eo *eo_obj EINA_UNUSED,
12 Efl_Animation_Player_Data *pd, 12 Efl_Canvas_Animation_Player_Data *pd,
13 Efl_Canvas_Object *target) 13 Efl_Canvas_Object *target)
14{ 14{
15 efl_event_callback_add(target, EFL_EVENT_DEL, _target_del_cb, pd); 15 efl_event_callback_add(target, EFL_EVENT_DEL, _target_del_cb, pd);
@@ -18,35 +18,35 @@ _efl_animation_player_target_set(Eo *eo_obj EINA_UNUSED,
18} 18}
19 19
20EOLIAN static Efl_Canvas_Object * 20EOLIAN static Efl_Canvas_Object *
21_efl_animation_player_target_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Player_Data *pd) 21_efl_canvas_animation_player_target_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Animation_Player_Data *pd)
22{ 22{
23 return pd->target; 23 return pd->target;
24} 24}
25 25
26EOLIAN static void 26EOLIAN static void
27_efl_animation_player_auto_del_set(Eo *eo_obj EINA_UNUSED, 27_efl_canvas_animation_player_auto_del_set(Eo *eo_obj EINA_UNUSED,
28 Efl_Animation_Player_Data *pd, 28 Efl_Canvas_Animation_Player_Data *pd,
29 Eina_Bool auto_del) 29 Eina_Bool auto_del)
30{ 30{
31 pd->auto_del = auto_del; 31 pd->auto_del = auto_del;
32} 32}
33 33
34EOLIAN static Eina_Bool 34EOLIAN static Eina_Bool
35_efl_animation_player_auto_del_get(Eo *eo_obj EINA_UNUSED, 35_efl_canvas_animation_player_auto_del_get(Eo *eo_obj EINA_UNUSED,
36 Efl_Animation_Player_Data *pd) 36 Efl_Canvas_Animation_Player_Data *pd)
37{ 37{
38 return pd->auto_del; 38 return pd->auto_del;
39} 39}
40 40
41EOLIAN static void 41EOLIAN static void
42_efl_animation_player_animation_set(Eo *eo_obj, 42_efl_canvas_animation_player_animation_set(Eo *eo_obj,
43 Efl_Animation_Player_Data *pd, 43 Efl_Canvas_Animation_Player_Data *pd,
44 Efl_Animation *anim) 44 Efl_Canvas_Animation *anim)
45{ 45{
46 if (anim == pd->animation) 46 if (anim == pd->animation)
47 return; 47 return;
48 48
49 if (!efl_isa(anim, EFL_ANIMATION_CLASS)) 49 if (!efl_isa(anim, EFL_CANVAS_ANIMATION_CLASS))
50 { 50 {
51 ERR("Passed argument [%p]:[%s] is not an Efl.Animation", 51 ERR("Passed argument [%p]:[%s] is not an Efl.Animation",
52 anim, efl_class_name_get(efl_class_get(anim))); 52 anim, efl_class_name_get(efl_class_get(anim)));
@@ -62,9 +62,9 @@ _efl_animation_player_animation_set(Eo *eo_obj,
62 efl_ref(pd->animation); 62 efl_ref(pd->animation);
63} 63}
64 64
65EOLIAN static Efl_Animation * 65EOLIAN static Efl_Canvas_Animation *
66_efl_animation_player_animation_get(Eo *eo_obj EINA_UNUSED, 66_efl_canvas_animation_player_animation_get(Eo *eo_obj EINA_UNUSED,
67 Efl_Animation_Player_Data *pd) 67 Efl_Canvas_Animation_Player_Data *pd)
68{ 68{
69 return pd->animation; 69 return pd->animation;
70} 70}
@@ -105,7 +105,7 @@ _animator_cb(void *data)
105 105
106 efl_animation_apply(anim, pd->progress, efl_animation_player_target_get(eo_obj)); 106 efl_animation_apply(anim, pd->progress, efl_animation_player_target_get(eo_obj));
107 107
108 Efl_Animation_Player_Running_Event_Info event_info; 108 Efl_Canvas_Animation_Player_Running_Event_Info event_info;
109 event_info.progress = pd->progress; 109 event_info.progress = pd->progress;
110 efl_event_callback_call(eo_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, 110 efl_event_callback_call(eo_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING,
111 &event_info); 111 &event_info);
@@ -122,7 +122,7 @@ _animator_cb(void *data)
122 if (pd->remaining_repeat_count > 0) 122 if (pd->remaining_repeat_count > 0)
123 pd->remaining_repeat_count--; 123 pd->remaining_repeat_count--;
124 124
125 if (efl_animation_repeat_mode_get(anim) == EFL_ANIMATION_REPEAT_MODE_REVERSE) 125 if (efl_animation_repeat_mode_get(anim) == EFL_CANVAS_ANIMATION_REPEAT_MODE_REVERSE)
126 { 126 {
127 pd->is_direction_forward = !pd->is_direction_forward; 127 pd->is_direction_forward = !pd->is_direction_forward;
128 } 128 }
@@ -139,7 +139,7 @@ _animator_cb(void *data)
139} 139}
140 140
141static void 141static void
142_start(Eo *eo_obj, Efl_Animation_Player_Data *pd) 142_start(Eo *eo_obj, Efl_Canvas_Animation_Player_Data *pd)
143{ 143{
144 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 144 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
145 145
@@ -175,8 +175,8 @@ _start_delay_timer_cb(void *data)
175} 175}
176 176
177EOLIAN static void 177EOLIAN static void
178_efl_animation_player_efl_player_start(Eo *eo_obj, 178_efl_canvas_animation_player_efl_player_start(Eo *eo_obj,
179 Efl_Animation_Player_Data *pd) 179 Efl_Canvas_Animation_Player_Data *pd)
180{ 180{
181 double start_delay; 181 double start_delay;
182 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 182 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
@@ -199,8 +199,8 @@ _efl_animation_player_efl_player_start(Eo *eo_obj,
199} 199}
200 200
201EOLIAN static void 201EOLIAN static void
202_efl_animation_player_efl_player_stop(Eo *eo_obj, 202_efl_canvas_animation_player_efl_player_stop(Eo *eo_obj,
203 Efl_Animation_Player_Data *pd) 203 Efl_Canvas_Animation_Player_Data *pd)
204{ 204{
205 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 205 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
206 Eina_Bool play = efl_player_play_get(eo_obj); 206 Eina_Bool play = efl_player_play_get(eo_obj);
@@ -209,7 +209,7 @@ _efl_animation_player_efl_player_stop(Eo *eo_obj,
209 efl_player_play_set(eo_obj, EINA_FALSE); 209 efl_player_play_set(eo_obj, EINA_FALSE);
210 //Reset the state of the target to the initial state 210 //Reset the state of the target to the initial state
211 if ((efl_animation_final_state_keep_get(anim)) && 211 if ((efl_animation_final_state_keep_get(anim)) &&
212 (efl_animation_repeat_mode_get(anim) != EFL_ANIMATION_REPEAT_MODE_REVERSE) && 212 (efl_animation_repeat_mode_get(anim) != EFL_CANVAS_ANIMATION_REPEAT_MODE_REVERSE) &&
213 (!(efl_animation_repeat_count_get(anim) & 1))) 213 (!(efl_animation_repeat_count_get(anim) & 1)))
214 { 214 {
215 pd->progress = 1.0; 215 pd->progress = 1.0;
@@ -231,8 +231,8 @@ _efl_animation_player_efl_player_stop(Eo *eo_obj,
231} 231}
232 232
233EOLIAN static void 233EOLIAN static void
234_efl_animation_player_efl_player_play_set(Eo *eo_obj, 234_efl_canvas_animation_player_efl_player_play_set(Eo *eo_obj,
235 Efl_Animation_Player_Data *pd, 235 Efl_Canvas_Animation_Player_Data *pd,
236 Eina_Bool play) 236 Eina_Bool play)
237{ 237{
238 if (efl_player_play_get(eo_obj) == !!play) 238 if (efl_player_play_get(eo_obj) == !!play)
@@ -259,35 +259,35 @@ _efl_animation_player_efl_player_play_set(Eo *eo_obj,
259} 259}
260 260
261EOLIAN static Eina_Bool 261EOLIAN static Eina_Bool
262_efl_animation_player_efl_player_play_get(Eo *eo_obj EINA_UNUSED, 262_efl_canvas_animation_player_efl_player_play_get(Eo *eo_obj EINA_UNUSED,
263 Efl_Animation_Player_Data *pd) 263 Efl_Canvas_Animation_Player_Data *pd)
264{ 264{
265 return pd->is_play; 265 return pd->is_play;
266} 266}
267 267
268EOLIAN static Eina_Bool 268EOLIAN static Eina_Bool
269_efl_animation_player_efl_player_playable_get(Eo *eo_obj, 269_efl_canvas_animation_player_efl_player_playable_get(Eo *eo_obj,
270 Efl_Animation_Player_Data *pd EINA_UNUSED) 270 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
271{ 271{
272 Efl_Animation *anim = efl_animation_player_animation_get(eo_obj); 272 Efl_Canvas_Animation *anim = efl_animation_player_animation_get(eo_obj);
273 273
274 return efl_playable_get(anim); 274 return efl_playable_get(anim);
275} 275}
276 276
277EOLIAN static double 277EOLIAN static double
278_efl_animation_player_efl_player_pos_get(Eo *eo_obj, 278_efl_canvas_animation_player_efl_player_pos_get(Eo *eo_obj,
279 Efl_Animation_Player_Data *pd EINA_UNUSED) 279 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
280{ 280{
281 //TODO: this is not correct 281 //TODO: this is not correct
282 Efl_Animation *anim = efl_animation_player_animation_get(eo_obj); 282 Efl_Canvas_Animation *anim = efl_animation_player_animation_get(eo_obj);
283 double length = efl_player_length_get(anim); 283 double length = efl_player_length_get(anim);
284 284
285 return length * efl_player_progress_get(anim); 285 return length * efl_player_progress_get(anim);
286} 286}
287 287
288EOLIAN static void 288EOLIAN static void
289_efl_animation_player_efl_player_pos_set(Eo *eo_obj, 289_efl_canvas_animation_player_efl_player_pos_set(Eo *eo_obj,
290 Efl_Animation_Player_Data *pd EINA_UNUSED, 290 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED,
291 double sec) 291 double sec)
292{ 292{
293 //TODO: this is not correct 293 //TODO: this is not correct
@@ -301,15 +301,15 @@ _efl_animation_player_efl_player_pos_set(Eo *eo_obj,
301} 301}
302 302
303EOLIAN static double 303EOLIAN static double
304_efl_animation_player_efl_player_progress_get(Eo *eo_obj EINA_UNUSED, 304_efl_canvas_animation_player_efl_player_progress_get(Eo *eo_obj EINA_UNUSED,
305 Efl_Animation_Player_Data *pd) 305 Efl_Canvas_Animation_Player_Data *pd)
306{ 306{
307 return pd->progress; 307 return pd->progress;
308} 308}
309 309
310EOLIAN static void 310EOLIAN static void
311_efl_animation_player_efl_player_play_speed_set(Eo *eo_obj EINA_UNUSED, 311_efl_canvas_animation_player_efl_player_play_speed_set(Eo *eo_obj EINA_UNUSED,
312 Efl_Animation_Player_Data *pd, 312 Efl_Canvas_Animation_Player_Data *pd,
313 double play_speed) 313 double play_speed)
314{ 314{
315 //TODO: check reverse play case. 315 //TODO: check reverse play case.
@@ -319,31 +319,31 @@ _efl_animation_player_efl_player_play_speed_set(Eo *eo_obj EINA_UNUSED,
319} 319}
320 320
321EOLIAN static double 321EOLIAN static double
322_efl_animation_player_efl_player_play_speed_get(Eo *eo_obj EINA_UNUSED, 322_efl_canvas_animation_player_efl_player_play_speed_get(Eo *eo_obj EINA_UNUSED,
323 Efl_Animation_Player_Data *pd) 323 Efl_Canvas_Animation_Player_Data *pd)
324{ 324{
325 return pd->play_speed; 325 return pd->play_speed;
326} 326}
327 327
328EOLIAN static double 328EOLIAN static double
329_efl_animation_player_efl_player_length_get(Eo *eo_obj, 329_efl_canvas_animation_player_efl_player_length_get(Eo *eo_obj,
330 Efl_Animation_Player_Data *pd EINA_UNUSED) 330 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
331{ 331{
332 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 332 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
333 return efl_playable_length_get(anim); 333 return efl_playable_length_get(anim);
334} 334}
335 335
336EOLIAN static Eina_Bool 336EOLIAN static Eina_Bool
337_efl_animation_player_efl_player_seekable_get(Eo *eo_obj EINA_UNUSED, 337_efl_canvas_animation_player_efl_player_seekable_get(Eo *eo_obj EINA_UNUSED,
338 Efl_Animation_Player_Data *pd EINA_UNUSED) 338 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
339{ 339{
340 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 340 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
341 return efl_playable_seekable_get(anim); 341 return efl_playable_seekable_get(anim);
342} 342}
343 343
344EOLIAN static Efl_Object * 344EOLIAN static Efl_Object *
345_efl_animation_player_efl_object_constructor(Eo *eo_obj, 345_efl_canvas_animation_player_efl_object_constructor(Eo *eo_obj,
346 Efl_Animation_Player_Data *pd) 346 Efl_Canvas_Animation_Player_Data *pd)
347{ 347{
348 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 348 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
349 349
@@ -360,8 +360,8 @@ _efl_animation_player_efl_object_constructor(Eo *eo_obj,
360} 360}
361 361
362EOLIAN static void 362EOLIAN static void
363_efl_animation_player_efl_object_destructor(Eo *eo_obj, 363_efl_canvas_animation_player_efl_object_destructor(Eo *eo_obj,
364 Efl_Animation_Player_Data *pd) 364 Efl_Canvas_Animation_Player_Data *pd)
365{ 365{
366 if (pd->animator) 366 if (pd->animator)
367 { 367 {
@@ -381,4 +381,4 @@ _efl_animation_player_efl_object_destructor(Eo *eo_obj,
381EWAPI const Efl_Event_Description _EFL_ANIMATION_PLAYER_EVENT_PRE_STARTED = 381EWAPI const Efl_Event_Description _EFL_ANIMATION_PLAYER_EVENT_PRE_STARTED =
382 EFL_EVENT_DESCRIPTION("pre_started"); 382 EFL_EVENT_DESCRIPTION("pre_started");
383 383
384#include "efl_animation_player.eo.c" 384#include "efl_canvas_animation_player.eo.c"
diff --git a/src/lib/evas/canvas/efl_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo
index 6dc9ce3..606ec9b 100644
--- a/src/lib/evas/canvas/efl_animation_player.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo
@@ -1,14 +1,15 @@
1import efl_animation_types; 1import efl_canvas_animation_types;
2 2
3class Efl.Animation.Player (Efl.Object, Efl.Player) 3class Efl.Canvas.Animation.Player (Efl.Object, Efl.Player)
4{ 4{
5 [[Efl animation object class]] 5 [[Efl animation object class]]
6 eo_prefix: efl_animation_player;
6 methods { 7 methods {
7 @property animation { 8 @property animation {
8 set {} 9 set {}
9 get {} 10 get {}
10 values { 11 values {
11 animation: Efl.Animation; 12 animation: Efl.Canvas.Animation;
12 } 13 }
13 } 14 }
14 @property auto_del { 15 @property auto_del {
diff --git a/src/lib/evas/canvas/efl_animation_player_private.h b/src/lib/evas/canvas/efl_canvas_animation_player_private.h
index 9b1a1fa..f0128aa 100644
--- a/src/lib/evas/canvas/efl_animation_player_private.h
+++ b/src/lib/evas/canvas/efl_canvas_animation_player_private.h
@@ -3,7 +3,7 @@
3#include "evas_common_private.h" 3#include "evas_common_private.h"
4#include <Ecore.h> 4#include <Ecore.h>
5 5
6#define MY_CLASS EFL_ANIMATION_PLAYER_CLASS 6#define MY_CLASS EFL_CANVAS_ANIMATION_PLAYER_CLASS
7#define MY_CLASS_NAME efl_class_name_get(MY_CLASS) 7#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
8 8
9#if 0 9#if 0
@@ -17,7 +17,7 @@ typedef struct _Target_State
17} Target_State; 17} Target_State;
18#endif 18#endif
19 19
20typedef struct _Efl_Animation_Player_Data 20typedef struct _Efl_Canvas_Animation_Player_Data
21{ 21{
22 Ecore_Animator *animator; 22 Ecore_Animator *animator;
23 Ecore_Timer *start_delay_timer; 23 Ecore_Timer *start_delay_timer;
@@ -29,7 +29,7 @@ typedef struct _Efl_Animation_Player_Data
29 double pause_begin; 29 double pause_begin;
30 } time; 30 } time;
31 31
32 Efl_Animation *animation; 32 Efl_Canvas_Animation *animation;
33 Efl_Canvas_Object *target; 33 Efl_Canvas_Object *target;
34 34
35 double progress; 35 double progress;
@@ -43,10 +43,10 @@ typedef struct _Efl_Animation_Player_Data
43 Eina_Bool is_play : 1; 43 Eina_Bool is_play : 1;
44 Eina_Bool keep_final_state : 1; 44 Eina_Bool keep_final_state : 1;
45 Eina_Bool is_direction_forward : 1; 45 Eina_Bool is_direction_forward : 1;
46} Efl_Animation_Player_Data; 46} Efl_Canvas_Animation_Player_Data;
47 47
48#define EFL_ANIMATION_PLAYER_DATA_GET(o, pd) \ 48#define EFL_ANIMATION_PLAYER_DATA_GET(o, pd) \
49 Efl_Animation_Player_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_PLAYER_CLASS) 49 Efl_Canvas_Animation_Player_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_PLAYER_CLASS)
50 50
51#define EFL_ANIMATION_PLAYER_ANIMATION_GET(o, anim) \ 51#define EFL_ANIMATION_PLAYER_ANIMATION_GET(o, anim) \
52 Efl_Animation *anim = efl_animation_player_animation_get(o) 52 Efl_Canvas_Animation *anim = efl_animation_player_animation_get(o)
diff --git a/src/lib/evas/canvas/efl_animation_private.h b/src/lib/evas/canvas/efl_canvas_animation_private.h
index bcadf35..c1fe16f 100644
--- a/src/lib/evas/canvas/efl_animation_private.h
+++ b/src/lib/evas/canvas/efl_canvas_animation_private.h
@@ -3,26 +3,26 @@
3#include "evas_common_private.h" 3#include "evas_common_private.h"
4#include <Ecore.h> 4#include <Ecore.h>
5 5
6typedef struct _Efl_Animation_Data 6typedef struct _Efl_Canvas_Animation_Data
7{ 7{
8 double duration; 8 double duration;
9 9
10 double start_delay_time; 10 double start_delay_time;
11 11
12 Efl_Animation_Repeat_Mode repeat_mode; 12 Efl_Canvas_Animation_Repeat_Mode repeat_mode;
13 int repeat_count; 13 int repeat_count;
14 14
15 Efl_Interpolator *interpolator; 15 Efl_Interpolator *interpolator;
16 16
17 Eina_Bool keep_final_state : 1; 17 Eina_Bool keep_final_state : 1;
18} Efl_Animation_Data; 18} Efl_Canvas_Animation_Data;
19 19
20#define EFL_ANIMATION_DATA_GET(o, pd) \ 20#define EFL_ANIMATION_DATA_GET(o, pd) \
21 Efl_Animation_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_CLASS) 21 Efl_Canvas_Animation_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_CLASS)
22 22
23#define GET_STATUS(from, to, progress) \ 23#define GET_STATUS(from, to, progress) \
24 ((from) + (((to) - (from)) * (progress))) 24 ((from) + (((to) - (from)) * (progress)))
25 25
26#define FINAL_STATE_IS_REVERSE(anim) \ 26#define FINAL_STATE_IS_REVERSE(anim) \
27 ((efl_animation_repeat_mode_get(anim) == EFL_ANIMATION_REPEAT_MODE_REVERSE) && \ 27 ((efl_animation_repeat_mode_get(anim) == EFL_CANVAS_ANIMATION_REPEAT_MODE_REVERSE) && \
28 (efl_animation_repeat_count_get(anim) & 1)) 28 (efl_animation_repeat_count_get(anim) & 1))
diff --git a/src/lib/evas/canvas/efl_animation_rotate.c b/src/lib/evas/canvas/efl_canvas_animation_rotate.c
index 72d30dc..2a3f06c 100644
--- a/src/lib/evas/canvas/efl_animation_rotate.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_rotate.c
@@ -1,6 +1,6 @@
1#include "efl_animation_rotate_private.h" 1#include "efl_canvas_animation_rotate_private.h"
2 2
3#define MY_CLASS EFL_ANIMATION_ROTATE_CLASS 3#define MY_CLASS EFL_CANVAS_ANIMATION_ROTATE_CLASS
4 4
5static double 5static double
6_rotation_get(Eo *target) 6_rotation_get(Eo *target)
@@ -16,8 +16,8 @@ _rotation_get(Eo *target)
16} 16}
17 17
18EOLIAN static void 18EOLIAN static void
19_efl_animation_rotate_rotate_set(Eo *eo_obj EINA_UNUSED, 19_efl_canvas_animation_rotate_rotate_set(Eo *eo_obj EINA_UNUSED,
20 Efl_Animation_Rotate_Data *pd, 20 Efl_Canvas_Animation_Rotate_Data *pd,
21 double from_degree, 21 double from_degree,
22 double to_degree, 22 double to_degree,
23 Efl_Canvas_Object *pivot, 23 Efl_Canvas_Object *pivot,
@@ -35,8 +35,8 @@ _efl_animation_rotate_rotate_set(Eo *eo_obj EINA_UNUSED,
35} 35}
36 36
37EOLIAN static void 37EOLIAN static void
38_efl_animation_rotate_rotate_get(Eo *eo_obj EINA_UNUSED, 38_efl_canvas_animation_rotate_rotate_get(Eo *eo_obj EINA_UNUSED,
39 Efl_Animation_Rotate_Data *pd, 39 Efl_Canvas_Animation_Rotate_Data *pd,
40 double *from_degree, 40 double *from_degree,
41 double *to_degree, 41 double *to_degree,
42 Efl_Canvas_Object **pivot, 42 Efl_Canvas_Object **pivot,
@@ -66,8 +66,8 @@ _efl_animation_rotate_rotate_get(Eo *eo_obj EINA_UNUSED,
66} 66}
67 67
68EOLIAN static void 68EOLIAN static void
69_efl_animation_rotate_rotate_absolute_set(Eo *eo_obj EINA_UNUSED, 69_efl_canvas_animation_rotate_rotate_absolute_set(Eo *eo_obj EINA_UNUSED,
70 Efl_Animation_Rotate_Data *pd, 70 Efl_Canvas_Animation_Rotate_Data *pd,
71 double from_degree, 71 double from_degree,
72 double to_degree, 72 double to_degree,
73 Evas_Coord cx, 73 Evas_Coord cx,
@@ -82,8 +82,8 @@ _efl_animation_rotate_rotate_absolute_set(Eo *eo_obj EINA_UNUSED,
82} 82}
83 83
84EOLIAN static void 84EOLIAN static void
85_efl_animation_rotate_rotate_absolute_get(Eo *eo_obj EINA_UNUSED, 85_efl_canvas_animation_rotate_rotate_absolute_get(Eo *eo_obj EINA_UNUSED,
86 Efl_Animation_Rotate_Data *pd, 86 Efl_Canvas_Animation_Rotate_Data *pd,
87 double *from_degree, 87 double *from_degree,
88 double *to_degree, 88 double *to_degree,
89 Evas_Coord *cx, 89 Evas_Coord *cx,
@@ -109,8 +109,8 @@ _efl_animation_rotate_rotate_absolute_get(Eo *eo_obj EINA_UNUSED,
109} 109}
110 110
111EOLIAN static double 111EOLIAN static double
112_efl_animation_rotate_efl_animation_animation_apply(Eo *eo_obj, 112_efl_canvas_animation_rotate_efl_canvas_animation_animation_apply(Eo *eo_obj,
113 Efl_Animation_Rotate_Data *pd, 113 Efl_Canvas_Animation_Rotate_Data *pd,
114 double progress, 114 double progress,
115 Efl_Canvas_Object *target) 115 Efl_Canvas_Object *target)
116{ 116{
@@ -141,8 +141,8 @@ _efl_animation_rotate_efl_animation_animation_apply(Eo *eo_obj,
141} 141}
142 142
143EOLIAN static Efl_Object * 143EOLIAN static Efl_Object *
144_efl_animation_rotate_efl_object_constructor(Eo *eo_obj, 144_efl_canvas_animation_rotate_efl_object_constructor(Eo *eo_obj,
145 Efl_Animation_Rotate_Data *pd) 145 Efl_Canvas_Animation_Rotate_Data *pd)
146{ 146{
147 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 147 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
148 148
@@ -161,4 +161,4 @@ _efl_animation_rotate_efl_object_constructor(Eo *eo_obj,
161 return eo_obj; 161 return eo_obj;
162} 162}
163 163
164#include "efl_animation_rotate.eo.c" 164#include "efl_canvas_animation_rotate.eo.c"
diff --git a/src/lib/evas/canvas/efl_animation_rotate.eo b/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
index 14c9901..d092d2a 100644
--- a/src/lib/evas/canvas/efl_animation_rotate.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
@@ -1,9 +1,10 @@
1import efl_animation_types; 1import efl_canvas_animation_types;
2 2
3class Efl.Animation.Rotate (Efl.Animation) 3class Efl.Canvas.Animation.Rotate (Efl.Canvas.Animation)
4{ 4{
5 [[Efl rotate animation class]] 5 [[Efl rotate animation class]]
6 data: Efl_Animation_Rotate_Data; 6 eo_prefix: efl_animation_rotate;
7 data: Efl_Canvas_Animation_Rotate_Data;
7 methods { 8 methods {
8 @property rotate { 9 @property rotate {
9 [[Rotate property]] 10 [[Rotate property]]
@@ -35,6 +36,6 @@ class Efl.Animation.Rotate (Efl.Animation)
35 } 36 }
36 implements { 37 implements {
37 Efl.Object.constructor; 38 Efl.Object.constructor;
38 Efl.Animation.animation_apply; 39 Efl.Canvas.Animation.animation_apply;
39 } 40 }
40} 41}
diff --git a/src/lib/evas/canvas/efl_canvas_animation_rotate_private.h b/src/lib/evas/canvas/efl_canvas_animation_rotate_private.h
new file mode 100644
index 0000000..e50db39
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_animation_rotate_private.h
@@ -0,0 +1,35 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5#include "efl_canvas_animation_private.h"
6
7#define EFL_ANIMATION_ROTATE_DATA_GET(o, pd) \
8 Efl_Canvas_Animation_Rotate_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_ROTATE_CLASS)
9
10typedef struct _Efl_Canvas_Animation_Rotate_Property
11{
12 double degree;
13} Efl_Canvas_Animation_Rotate_Property;
14
15typedef struct _Efl_Canvas_Animation_Rotate_Absolute_Pivot
16{
17 Evas_Coord cx, cy;
18} Efl_Canvas_Animation_Rotate_Absolute_Pivot;
19
20typedef struct _Efl_Canvas_Animation_Rotate_Relative_Pivot
21{
22 Efl_Canvas_Object *obj;
23 double cx, cy;
24} Efl_Canvas_Animation_Rotate_Relative_Pivot;
25
26typedef struct _Efl_Canvas_Animation_Rotate_Data
27{
28 Efl_Canvas_Animation_Rotate_Property from;
29 Efl_Canvas_Animation_Rotate_Property to;
30
31 Efl_Canvas_Animation_Rotate_Absolute_Pivot abs_pivot;
32 Efl_Canvas_Animation_Rotate_Relative_Pivot rel_pivot;
33
34 Eina_Bool use_rel_pivot;
35} Efl_Canvas_Animation_Rotate_Data;
diff --git a/src/lib/evas/canvas/efl_animation_scale.c b/src/lib/evas/canvas/efl_canvas_animation_scale.c
index dbb4b76..67449c2 100644
--- a/src/lib/evas/canvas/efl_animation_scale.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_scale.c
@@ -1,12 +1,12 @@
1#include "efl_animation_scale_private.h" 1#include "efl_canvas_animation_scale_private.h"
2 2
3#define MY_CLASS EFL_ANIMATION_SCALE_CLASS 3#define MY_CLASS EFL_CANVAS_ANIMATION_SCALE_CLASS
4 4
5static Efl_Animation_Scale_Property 5static Efl_Canvas_Animation_Scale_Property
6_scale_get(Eo *target) 6_scale_get(Eo *target)
7{ 7{
8 double x1, x2, x3, y1, y2, y3, w, h; 8 double x1, x2, x3, y1, y2, y3, w, h;
9 Efl_Animation_Scale_Property scale; 9 Efl_Canvas_Animation_Scale_Property scale;
10 Eina_Rect geometry; 10 Eina_Rect geometry;
11 11
12 geometry = efl_gfx_geometry_get(target); 12 geometry = efl_gfx_geometry_get(target);
@@ -24,8 +24,8 @@ _scale_get(Eo *target)
24} 24}
25 25
26EOLIAN static void 26EOLIAN static void
27_efl_animation_scale_scale_set(Eo *eo_obj EINA_UNUSED, 27_efl_canvas_animation_scale_scale_set(Eo *eo_obj EINA_UNUSED,
28 Efl_Animation_Scale_Data *pd, 28 Efl_Canvas_Animation_Scale_Data *pd,
29 double from_scale_x, 29 double from_scale_x,
30 double from_scale_y, 30 double from_scale_y,
31 double to_scale_x, 31 double to_scale_x,
@@ -48,8 +48,8 @@ _efl_animation_scale_scale_set(Eo *eo_obj EINA_UNUSED,
48} 48}
49 49
50EOLIAN static void 50EOLIAN static void
51_efl_animation_scale_scale_get(Eo *eo_obj EINA_UNUSED, 51_efl_canvas_animation_scale_scale_get(Eo *eo_obj EINA_UNUSED,
52 Efl_Animation_Scale_Data *pd, 52 Efl_Canvas_Animation_Scale_Data *pd,
53 double *from_scale_x, 53 double *from_scale_x,
54 double *from_scale_y, 54 double *from_scale_y,
55 double *to_scale_x, 55 double *to_scale_x,
@@ -87,8 +87,8 @@ _efl_animation_scale_scale_get(Eo *eo_obj EINA_UNUSED,
87} 87}
88 88
89EOLIAN static void 89EOLIAN static void
90_efl_animation_scale_scale_absolute_set(Eo *eo_obj EINA_UNUSED, 90_efl_canvas_animation_scale_scale_absolute_set(Eo *eo_obj EINA_UNUSED,
91 Efl_Animation_Scale_Data *pd, 91 Efl_Canvas_Animation_Scale_Data *pd,
92 double from_scale_x, 92 double from_scale_x,
93 double from_scale_y, 93 double from_scale_y,
94 double to_scale_x, 94 double to_scale_x,
@@ -109,8 +109,8 @@ _efl_animation_scale_scale_absolute_set(Eo *eo_obj EINA_UNUSED,
109} 109}
110 110
111EOLIAN static void 111EOLIAN static void
112_efl_animation_scale_scale_absolute_get(Eo *eo_obj EINA_UNUSED, 112_efl_canvas_animation_scale_scale_absolute_get(Eo *eo_obj EINA_UNUSED,
113 Efl_Animation_Scale_Data *pd, 113 Efl_Canvas_Animation_Scale_Data *pd,
114 double *from_scale_x, 114 double *from_scale_x,
115 double *from_scale_y, 115 double *from_scale_y,
116 double *to_scale_x, 116 double *to_scale_x,
@@ -144,13 +144,13 @@ _efl_animation_scale_scale_absolute_get(Eo *eo_obj EINA_UNUSED,
144} 144}
145 145
146EOLIAN static double 146EOLIAN static double
147_efl_animation_scale_efl_animation_animation_apply(Eo *eo_obj, 147_efl_canvas_animation_scale_efl_canvas_animation_animation_apply(Eo *eo_obj,
148 Efl_Animation_Scale_Data *pd, 148 Efl_Canvas_Animation_Scale_Data *pd,
149 double progress, 149 double progress,
150 Efl_Canvas_Object *target) 150 Efl_Canvas_Object *target)
151{ 151{
152 Efl_Animation_Scale_Property prev_scale; 152 Efl_Canvas_Animation_Scale_Property prev_scale;
153 Efl_Animation_Scale_Property new_scale; 153 Efl_Canvas_Animation_Scale_Property new_scale;
154 154
155 progress = efl_animation_apply(efl_super(eo_obj, MY_CLASS), progress, target); 155 progress = efl_animation_apply(efl_super(eo_obj, MY_CLASS), progress, target);
156 if (!target) return progress; 156 if (!target) return progress;
@@ -179,8 +179,8 @@ _efl_animation_scale_efl_animation_animation_apply(Eo *eo_obj,
179} 179}
180 180
181EOLIAN static Efl_Object * 181EOLIAN static Efl_Object *
182_efl_animation_scale_efl_object_constructor(Eo *eo_obj, 182_efl_canvas_animation_scale_efl_object_constructor(Eo *eo_obj,
183 Efl_Animation_Scale_Data *pd) 183 Efl_Canvas_Animation_Scale_Data *pd)
184{ 184{
185 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 185 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
186 186
@@ -201,4 +201,4 @@ _efl_animation_scale_efl_object_constructor(Eo *eo_obj,
201 return eo_obj; 201 return eo_obj;
202} 202}
203 203
204#include "efl_animation_scale.eo.c" 204#include "efl_canvas_animation_scale.eo.c"
diff --git a/src/lib/evas/canvas/efl_animation_scale.eo b/src/lib/evas/canvas/efl_canvas_animation_scale.eo
index 312ac4e..f3112ed 100644
--- a/src/lib/evas/canvas/efl_animation_scale.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_scale.eo
@@ -1,9 +1,10 @@
1import efl_animation_types; 1import efl_canvas_animation_types;
2 2
3class Efl.Animation.Scale (Efl.Animation) 3class Efl.Canvas.Animation.Scale (Efl.Canvas.Animation)
4{ 4{
5 [[Efl scale animation class]] 5 [[Efl scale animation class]]
6 data: Efl_Animation_Scale_Data; 6 eo_prefix: efl_animation_scale;
7 data: Efl_Canvas_Animation_Scale_Data;
7 methods { 8 methods {
8 @property scale { 9 @property scale {
9 [[Scale property]] 10 [[Scale property]]
@@ -39,6 +40,6 @@ class Efl.Animation.Scale (Efl.Animation)
39 } 40 }
40 implements { 41 implements {
41 Efl.Object.constructor; 42 Efl.Object.constructor;
42 Efl.Animation.animation_apply; 43 Efl.Canvas.Animation.animation_apply;
43 } 44 }
44} 45}
diff --git a/src/lib/evas/canvas/efl_canvas_animation_scale_private.h b/src/lib/evas/canvas/efl_canvas_animation_scale_private.h
new file mode 100644
index 0000000..020d9fd
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_animation_scale_private.h
@@ -0,0 +1,35 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5#include "efl_canvas_animation_private.h"
6
7#define EFL_ANIMATION_SCALE_DATA_GET(o, pd) \
8 Efl_Canvas_Animation_Scale_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_SCALE_CLASS)
9
10typedef struct _Efl_Canvas_Animation_Scale_Property
11{
12 double scale_x, scale_y;
13} Efl_Canvas_Animation_Scale_Property;
14
15typedef struct _Efl_Canvas_Animation_Scale_Absolute_Pivot
16{
17 Evas_Coord cx, cy;
18} Efl_Canvas_Animation_Scale_Absolute_Pivot;
19
20typedef struct _Efl_Canvas_Animation_Scale_Relative_Pivot
21{
22 Efl_Canvas_Object *obj;
23 double cx, cy;
24} Efl_Canvas_Animation_Scale_Relative_Pivot;
25
26typedef struct _Efl_Canvas_Animation_Scale_Data
27{
28 Efl_Canvas_Animation_Scale_Property from;
29 Efl_Canvas_Animation_Scale_Property to;
30
31 Efl_Canvas_Animation_Scale_Absolute_Pivot abs_pivot;
32 Efl_Canvas_Animation_Scale_Relative_Pivot rel_pivot;
33
34 Eina_Bool use_rel_pivot;
35} Efl_Canvas_Animation_Scale_Data;
diff --git a/src/lib/evas/canvas/efl_animation_translate.c b/src/lib/evas/canvas/efl_canvas_animation_translate.c
index 4464c59..361ed63 100644
--- a/src/lib/evas/canvas/efl_animation_translate.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_translate.c
@@ -1,6 +1,6 @@
1#include "efl_animation_translate_private.h" 1#include "efl_canvas_animation_translate_private.h"
2 2
3#define MY_CLASS EFL_ANIMATION_TRANSLATE_CLASS 3#define MY_CLASS EFL_CANVAS_ANIMATION_TRANSLATE_CLASS
4 4
5typedef struct __Translate_Property_Double 5typedef struct __Translate_Property_Double
6{ 6{
@@ -26,8 +26,8 @@ _translation_get(Eo *target)
26} 26}
27 27
28EOLIAN static void 28EOLIAN static void
29_efl_animation_translate_translate_set(Eo *eo_obj EINA_UNUSED, 29_efl_canvas_animation_translate_translate_set(Eo *eo_obj EINA_UNUSED,
30 Efl_Animation_Translate_Data *pd, 30 Efl_Canvas_Animation_Translate_Data *pd,
31 Evas_Coord from_x, 31 Evas_Coord from_x,
32 Evas_Coord from_y, 32 Evas_Coord from_y,
33 Evas_Coord to_x, 33 Evas_Coord to_x,
@@ -43,8 +43,8 @@ _efl_animation_translate_translate_set(Eo *eo_obj EINA_UNUSED,
43} 43}
44 44
45EOLIAN static void 45EOLIAN static void
46_efl_animation_translate_translate_get(Eo *eo_obj EINA_UNUSED, 46_efl_canvas_animation_translate_translate_get(Eo *eo_obj EINA_UNUSED,
47 Efl_Animation_Translate_Data *pd, 47 Efl_Canvas_Animation_Translate_Data *pd,
48 Evas_Coord *from_x, 48 Evas_Coord *from_x,
49 Evas_Coord *from_y, 49 Evas_Coord *from_y,
50 Evas_Coord *to_x, 50 Evas_Coord *to_x,
@@ -68,8 +68,8 @@ _efl_animation_translate_translate_get(Eo *eo_obj EINA_UNUSED,
68} 68}
69 69
70EOLIAN static void 70EOLIAN static void
71_efl_animation_translate_translate_absolute_set(Eo *eo_obj EINA_UNUSED, 71_efl_canvas_animation_translate_translate_absolute_set(Eo *eo_obj EINA_UNUSED,
72 Efl_Animation_Translate_Data *pd, 72 Efl_Canvas_Animation_Translate_Data *pd,
73 Evas_Coord from_x, 73 Evas_Coord from_x,
74 Evas_Coord from_y, 74 Evas_Coord from_y,
75 Evas_Coord to_x, 75 Evas_Coord to_x,
@@ -85,8 +85,8 @@ _efl_animation_translate_translate_absolute_set(Eo *eo_obj EINA_UNUSED,
85} 85}
86 86
87EOLIAN static void 87EOLIAN static void
88_efl_animation_translate_translate_absolute_get(Eo *eo_obj EINA_UNUSED, 88_efl_canvas_animation_translate_translate_absolute_get(Eo *eo_obj EINA_UNUSED,
89 Efl_Animation_Translate_Data *pd, 89 Efl_Canvas_Animation_Translate_Data *pd,
90 Evas_Coord *from_x, 90 Evas_Coord *from_x,
91 Evas_Coord *from_y, 91 Evas_Coord *from_y,
92 Evas_Coord *to_x, 92 Evas_Coord *to_x,
@@ -110,8 +110,8 @@ _efl_animation_translate_translate_absolute_get(Eo *eo_obj EINA_UNUSED,
110} 110}
111 111
112EOLIAN static double 112EOLIAN static double
113_efl_animation_translate_efl_animation_animation_apply(Eo *eo_obj, 113_efl_canvas_animation_translate_efl_canvas_animation_animation_apply(Eo *eo_obj,
114 Efl_Animation_Translate_Data *pd, 114 Efl_Canvas_Animation_Translate_Data *pd,
115 double progress, 115 double progress,
116 Efl_Canvas_Object *target) 116 Efl_Canvas_Object *target)
117{ 117{
@@ -139,8 +139,8 @@ _efl_animation_translate_efl_animation_animation_apply(Eo *eo_obj,
139} 139}
140 140
141EOLIAN static Efl_Object * 141EOLIAN static Efl_Object *
142_efl_animation_translate_efl_object_constructor(Eo *eo_obj, 142_efl_canvas_animation_translate_efl_object_constructor(Eo *eo_obj,
143 Efl_Animation_Translate_Data *pd) 143 Efl_Canvas_Animation_Translate_Data *pd)
144{ 144{
145 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 145 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
146 146
@@ -159,4 +159,4 @@ _efl_animation_translate_efl_object_constructor(Eo *eo_obj,
159 return eo_obj; 159 return eo_obj;
160} 160}
161 161
162#include "efl_animation_translate.eo.c" 162#include "efl_canvas_animation_translate.eo.c"
diff --git a/src/lib/evas/canvas/efl_animation_translate.eo b/src/lib/evas/canvas/efl_canvas_animation_translate.eo
index 59e0c5e..a8be5cb 100644
--- a/src/lib/evas/canvas/efl_animation_translate.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_translate.eo
@@ -1,9 +1,10 @@
1import efl_animation_types; 1import efl_canvas_animation_types;
2 2
3class Efl.Animation.Translate (Efl.Animation) 3class Efl.Canvas.Animation.Translate (Efl.Canvas.Animation)
4{ 4{
5 [[Efl translate animation class]] 5 [[Efl translate animation class]]
6 data: Efl_Animation_Translate_Data; 6 eo_prefix: efl_animation_translate;
7 data: Efl_Canvas_Animation_Translate_Data;
7 methods { 8 methods {
8 @property translate { 9 @property translate {
9 [[Translate property]] 10 [[Translate property]]
@@ -34,6 +35,6 @@ class Efl.Animation.Translate (Efl.Animation)
34 } 35 }
35 implements { 36 implements {
36 Efl.Object.constructor; 37 Efl.Object.constructor;
37 Efl.Animation.animation_apply; 38 Efl.Canvas.Animation.animation_apply;
38 } 39 }
39} 40}
diff --git a/src/lib/evas/canvas/efl_canvas_animation_translate_private.h b/src/lib/evas/canvas/efl_canvas_animation_translate_private.h
new file mode 100644
index 0000000..17c4b6d
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_animation_translate_private.h
@@ -0,0 +1,22 @@
1#define EFL_ANIMATION_PROTECTED
2
3#include "evas_common_private.h"
4#include <Ecore.h>
5#include "efl_canvas_animation_private.h"
6
7#define EFL_ANIMATION_TRANSLATE_DATA_GET(o, pd) \
8 Efl_Canvas_Animation_Translate_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_TRANSLATE_CLASS)
9
10typedef struct _Efl_Canvas_Animation_Translate_Property
11{
12 Evas_Coord move_x, move_y;
13 Evas_Coord x, y;
14} Efl_Canvas_Animation_Translate_Property;
15
16typedef struct _Efl_Canvas_Animation_Translate_Data
17{
18 Efl_Canvas_Animation_Translate_Property from;
19 Efl_Canvas_Animation_Translate_Property to;
20
21 Eina_Bool use_rel_move;
22} Efl_Canvas_Animation_Translate_Data;
diff --git a/src/lib/evas/canvas/efl_animation_types.eot b/src/lib/evas/canvas/efl_canvas_animation_types.eot
index 8eaf5fd..6c069a0 100644
--- a/src/lib/evas/canvas/efl_animation_types.eot
+++ b/src/lib/evas/canvas/efl_canvas_animation_types.eot
@@ -1,9 +1,9 @@
1// ---------------------------------------------------------------------------- 1// ----------------------------------------------------------------------------
2// All the below types are for Efl Animation 2// All the below types are for Efl Animation
3 3
4struct Efl.Animation.Player.Running_Event_Info; [[Information of running event]] 4struct Efl.Canvas.Animation.Player.Running_Event_Info; [[Information of running event]]
5 5
6enum Efl.Animation.Repeat_Mode 6enum Efl.Canvas.Animation.Repeat_Mode
7{ 7{
8 [[Animation repeat mode]] 8 [[Animation repeat mode]]
9 9
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 7d85781..0d17ba8 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -1,5 +1,5 @@
1import efl_text_types; 1import efl_text_types;
2import efl_animation_types; 2import efl_canvas_animation_types;
3 3
4abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, 4abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
5 Efl.Input.Interface, Efl.Gfx.Size.Hint, 5 Efl.Input.Interface, Efl.Gfx.Size.Hint,
@@ -584,7 +584,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, E
584 [[The event description for which the given $animation is set.]] 584 [[The event description for which the given $animation is set.]]
585 } 585 }
586 values { 586 values {
587 animation: Efl.Animation; 587 animation: Efl.Canvas.Animation;
588 [[The animation which starts when the given $event_name 588 [[The animation which starts when the given $event_name
589 happens to the object.]] 589 happens to the object.]]
590 } 590 }
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 3b7950e..49d0586 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -45,7 +45,7 @@ typedef struct _Event_Animation
45 45
46 const Efl_Event_Description *desc; 46 const Efl_Event_Description *desc;
47 47
48 Efl_Animation *anim; 48 Efl_Canvas_Animation *anim;
49} Event_Animation; 49} Event_Animation;
50 50
51static Eina_Bool 51static Eina_Bool
@@ -2460,13 +2460,13 @@ EOLIAN void
2460_efl_canvas_object_event_animation_set(Eo *eo_obj, 2460_efl_canvas_object_event_animation_set(Eo *eo_obj,
2461 Evas_Object_Protected_Data *pd, 2461 Evas_Object_Protected_Data *pd,
2462 const Efl_Event_Description *desc, 2462 const Efl_Event_Description *desc,
2463 Efl_Animation *animation) 2463 Efl_Canvas_Animation *animation)
2464{ 2464{
2465 Event_Animation *event_anim = _event_animation_find(pd, desc); 2465 Event_Animation *event_anim = _event_animation_find(pd, desc);
2466 2466
2467 if (!pd->anim_player) 2467 if (!pd->anim_player)
2468 { 2468 {
2469 pd->anim_player = efl_add(EFL_ANIMATION_PLAYER_CLASS, eo_obj, 2469 pd->anim_player = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, eo_obj,
2470 efl_animation_player_target_set(efl_added, eo_obj)); 2470 efl_animation_player_target_set(efl_added, eo_obj));
2471 } 2471 }
2472 2472
@@ -2504,7 +2504,7 @@ _efl_canvas_object_event_animation_set(Eo *eo_obj,
2504 eina_inlist_append(pd->event_anims, EINA_INLIST_GET(event_anim)); 2504 eina_inlist_append(pd->event_anims, EINA_INLIST_GET(event_anim));
2505} 2505}
2506 2506
2507EOLIAN Efl_Animation * 2507EOLIAN Efl_Canvas_Animation *
2508_efl_canvas_object_event_animation_get(Eo *eo_obj EINA_UNUSED, 2508_efl_canvas_object_event_animation_get(Eo *eo_obj EINA_UNUSED,
2509 Evas_Object_Protected_Data *pd, 2509 Evas_Object_Protected_Data *pd,
2510 const Efl_Event_Description *desc) 2510 const Efl_Event_Description *desc)