summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-10 22:24:28 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-10 22:38:32 +0900
commit503bb0c8f9e9ccdf3e5e833af814d129c9b34c2f (patch)
tree4c08816bef08cf71f72af5c2fc22c54941d1964b
parentc705139623cd01b80a5daee1b14f1daea9e22e65 (diff)
efl_canvas_animation_player: Change Running_Event_Info to Event_Running
To synchronize other types of event info, Efl_Canvas_Animation_Player_Running_Event_Info is changed to Efl_Canvas_Animation_Player_Event_Running. Remove unused struct.
-rw-r--r--src/bin/elementary/test_efl_anim_alpha.c4
-rw-r--r--src/bin/elementary/test_efl_anim_group_parallel.c4
-rw-r--r--src/bin/elementary/test_efl_anim_group_sequential.c4
-rw-r--r--src/bin/elementary/test_efl_anim_interpolator.c4
-rw-r--r--src/bin/elementary/test_efl_anim_pause.c4
-rw-r--r--src/bin/elementary/test_efl_anim_repeat.c4
-rw-r--r--src/bin/elementary/test_efl_anim_rotate.c4
-rw-r--r--src/bin/elementary/test_efl_anim_scale.c4
-rw-r--r--src/bin/elementary/test_efl_anim_start_delay.c4
-rw-r--r--src/bin/elementary/test_efl_anim_translate.c4
-rw-r--r--src/lib/evas/Evas_Common.h5
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.c6
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_types.eot2
14 files changed, 25 insertions, 30 deletions
diff --git a/src/bin/elementary/test_efl_anim_alpha.c b/src/bin/elementary/test_efl_anim_alpha.c
index f98793cd71..0a42b920eb 100644
--- a/src/bin/elementary/test_efl_anim_alpha.c
+++ b/src/bin/elementary/test_efl_anim_alpha.c
@@ -27,8 +27,8 @@ _anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
27static void 27static void
28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
29{ 29{
30 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 30 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
31 double progress = event_info->progress; 31 double progress = event_running->progress;
32 printf("Animation is running! Current progress(%lf)\n", progress); 32 printf("Animation is running! Current progress(%lf)\n", progress);
33} 33}
34 34
diff --git a/src/bin/elementary/test_efl_anim_group_parallel.c b/src/bin/elementary/test_efl_anim_group_parallel.c
index c1c5d1a157..b7128883d0 100644
--- a/src/bin/elementary/test_efl_anim_group_parallel.c
+++ b/src/bin/elementary/test_efl_anim_group_parallel.c
@@ -28,8 +28,8 @@ _anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
28static void 28static void
29_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 29_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
30{ 30{
31 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 31 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
32 double progress = event_info->progress; 32 double progress = event_running->progress;
33 printf("Animation is running! Current progress(%lf)\n", progress); 33 printf("Animation is running! Current progress(%lf)\n", progress);
34} 34}
35 35
diff --git a/src/bin/elementary/test_efl_anim_group_sequential.c b/src/bin/elementary/test_efl_anim_group_sequential.c
index fe2d32324d..655c37c571 100644
--- a/src/bin/elementary/test_efl_anim_group_sequential.c
+++ b/src/bin/elementary/test_efl_anim_group_sequential.c
@@ -27,8 +27,8 @@ _anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
27static void 27static void
28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
29{ 29{
30 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 30 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
31 double progress = event_info->progress; 31 double progress = event_running->progress;
32 printf("Animation is running! Current progress(%lf)\n", progress); 32 printf("Animation is running! Current progress(%lf)\n", progress);
33} 33}
34 34
diff --git a/src/bin/elementary/test_efl_anim_interpolator.c b/src/bin/elementary/test_efl_anim_interpolator.c
index d70fb561f8..66e9004fb7 100644
--- a/src/bin/elementary/test_efl_anim_interpolator.c
+++ b/src/bin/elementary/test_efl_anim_interpolator.c
@@ -100,8 +100,8 @@ _anim_ended_cb(void *data, const Efl_Event *event)
100static void 100static void
101_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 101_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
102{ 102{
103 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 103 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
104 double progress = event_info->progress; 104 double progress = event_running->progress;
105 printf("Animation is running! Current progress(%lf)\n", progress); 105 printf("Animation is running! Current progress(%lf)\n", progress);
106} 106}
107 107
diff --git a/src/bin/elementary/test_efl_anim_pause.c b/src/bin/elementary/test_efl_anim_pause.c
index 3ba71cf71a..c73b7bcf6c 100644
--- a/src/bin/elementary/test_efl_anim_pause.c
+++ b/src/bin/elementary/test_efl_anim_pause.c
@@ -38,8 +38,8 @@ _anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED)
38static void 38static void
39_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 39_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
40{ 40{
41 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 41 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
42 double progress = event_info->progress; 42 double progress = event_running->progress;
43 printf("Animation is running! Current progress(%lf)\n", progress); 43 printf("Animation is running! Current progress(%lf)\n", progress);
44} 44}
45 45
diff --git a/src/bin/elementary/test_efl_anim_repeat.c b/src/bin/elementary/test_efl_anim_repeat.c
index e02ba75aa5..50df2035c8 100644
--- a/src/bin/elementary/test_efl_anim_repeat.c
+++ b/src/bin/elementary/test_efl_anim_repeat.c
@@ -62,8 +62,8 @@ _anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED)
62static void 62static void
63_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 63_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
64{ 64{
65 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 65 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
66 double progress = event_info->progress; 66 double progress = event_running->progress;
67 printf("Animation is running! Current progress(%lf)\n", progress); 67 printf("Animation is running! Current progress(%lf)\n", progress);
68} 68}
69 69
diff --git a/src/bin/elementary/test_efl_anim_rotate.c b/src/bin/elementary/test_efl_anim_rotate.c
index ff19b4cf97..454ca0f262 100644
--- a/src/bin/elementary/test_efl_anim_rotate.c
+++ b/src/bin/elementary/test_efl_anim_rotate.c
@@ -27,8 +27,8 @@ _anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
27static void 27static void
28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
29{ 29{
30 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 30 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
31 double progress = event_info->progress; 31 double progress = event_running->progress;
32 printf("Animation is running! Current progress(%lf)\n", progress); 32 printf("Animation is running! Current progress(%lf)\n", progress);
33} 33}
34 34
diff --git a/src/bin/elementary/test_efl_anim_scale.c b/src/bin/elementary/test_efl_anim_scale.c
index d3641bf02c..bd380bd145 100644
--- a/src/bin/elementary/test_efl_anim_scale.c
+++ b/src/bin/elementary/test_efl_anim_scale.c
@@ -27,8 +27,8 @@ _anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
27static void 27static void
28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
29{ 29{
30 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 30 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
31 double progress = event_info->progress; 31 double progress = event_running->progress;
32 printf("Animation is running! Current progress(%lf)\n", progress); 32 printf("Animation is running! Current progress(%lf)\n", progress);
33} 33}
34 34
diff --git a/src/bin/elementary/test_efl_anim_start_delay.c b/src/bin/elementary/test_efl_anim_start_delay.c
index 768ba0c694..c94b515b62 100644
--- a/src/bin/elementary/test_efl_anim_start_delay.c
+++ b/src/bin/elementary/test_efl_anim_start_delay.c
@@ -33,8 +33,8 @@ _anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED)
33static void 33static void
34_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 34_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
35{ 35{
36 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 36 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
37 double progress = event_info->progress; 37 double progress = event_running->progress;
38 printf("Animation is running! Current progress(%lf)\n", progress); 38 printf("Animation is running! Current progress(%lf)\n", progress);
39} 39}
40 40
diff --git a/src/bin/elementary/test_efl_anim_translate.c b/src/bin/elementary/test_efl_anim_translate.c
index e3faebebe8..a562d17d65 100644
--- a/src/bin/elementary/test_efl_anim_translate.c
+++ b/src/bin/elementary/test_efl_anim_translate.c
@@ -27,8 +27,8 @@ _anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
27static void 27static void
28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) 28_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
29{ 29{
30 Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info; 30 Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
31 double progress = event_info->progress; 31 double progress = event_running->progress;
32 printf("Animation is running! Current progress(%lf)\n", progress); 32 printf("Animation is running! Current progress(%lf)\n", progress);
33} 33}
34 34
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index ee1f28b0bc..b7e8d586fe 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -3445,11 +3445,6 @@ typedef Eo Efl_Animation_Group_Sequential;
3445 3445
3446#endif 3446#endif
3447 3447
3448struct _Efl_Animation_Player_Running_Event_Info
3449{
3450 double progress;
3451};
3452
3453#define EFL_ANIMATION_GROUP_DURATION_NONE -1 3448#define EFL_ANIMATION_GROUP_DURATION_NONE -1
3454#define EFL_ANIMATION_PLAYER_GROUP_DURATION_NONE -1 3449#define EFL_ANIMATION_PLAYER_GROUP_DURATION_NONE -1
3455 3450
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 0401a13727..7a44a0985d 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -131,7 +131,7 @@ typedef Eo Efl_Canvas_Animation_Group_Sequential;
131#define EFL_ANIMATION_PLAYER_REPEAT_INFINITE -1 131#define EFL_ANIMATION_PLAYER_REPEAT_INFINITE -1
132 132
133 133
134struct _Efl_Canvas_Animation_Player_Running_Event_Info 134struct _Efl_Canvas_Animation_Player_Event_Running
135{ 135{
136 double progress; 136 double progress;
137}; 137};
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.c b/src/lib/evas/canvas/efl_canvas_animation_player.c
index 032bf57de7..1117c495ab 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.c
@@ -105,10 +105,10 @@ _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_Canvas_Animation_Player_Running_Event_Info event_info; 108 Efl_Canvas_Animation_Player_Event_Running event_running;
109 event_info.progress = pd->progress; 109 event_running.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_running);
112 pd->time.prev = pd->time.current; 112 pd->time.prev = pd->time.current;
113 113
114 //Not end. Keep going. 114 //Not end. Keep going.
diff --git a/src/lib/evas/canvas/efl_canvas_animation_types.eot b/src/lib/evas/canvas/efl_canvas_animation_types.eot
index 6c069a08c5..6961b27e4a 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_types.eot
+++ b/src/lib/evas/canvas/efl_canvas_animation_types.eot
@@ -1,7 +1,7 @@
1// ---------------------------------------------------------------------------- 1// ----------------------------------------------------------------------------
2// All the below types are for Efl Animation 2// All the below types are for Efl Animation
3 3
4struct Efl.Canvas.Animation.Player.Running_Event_Info; [[Information of running event]] 4struct Efl.Canvas.Animation.Player.Event_Running; [[Information of event running]]
5 5
6enum Efl.Canvas.Animation.Repeat_Mode 6enum Efl.Canvas.Animation.Repeat_Mode
7{ 7{