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)
downloadefl-503bb0c8f9e9ccdf3e5e833af814d129c9b34c2f.tar.gz
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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)
static void
_anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
- Efl_Canvas_Animation_Player_Running_Event_Info *event_info = event->info;
- double progress = event_info->progress;
+ Efl_Canvas_Animation_Player_Event_Running *event_running = event->info;
+ double progress = event_running->progress;
printf("Animation is running! Current progress(%lf)\n", progress);
}
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;
#endif
-struct _Efl_Animation_Player_Running_Event_Info
-{
- double progress;
-};
-
#define EFL_ANIMATION_GROUP_DURATION_NONE -1
#define EFL_ANIMATION_PLAYER_GROUP_DURATION_NONE -1
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;
#define EFL_ANIMATION_PLAYER_REPEAT_INFINITE -1
-struct _Efl_Canvas_Animation_Player_Running_Event_Info
+struct _Efl_Canvas_Animation_Player_Event_Running
{
double progress;
};
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)
efl_animation_apply(anim, pd->progress, efl_animation_player_target_get(eo_obj));
- Efl_Canvas_Animation_Player_Running_Event_Info event_info;
- event_info.progress = pd->progress;
+ Efl_Canvas_Animation_Player_Event_Running event_running;
+ event_running.progress = pd->progress;
efl_event_callback_call(eo_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING,
- &event_info);
+ &event_running);
pd->time.prev = pd->time.current;
//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 @@
// ----------------------------------------------------------------------------
// All the below types are for Efl Animation
-struct Efl.Canvas.Animation.Player.Running_Event_Info; [[Information of running event]]
+struct Efl.Canvas.Animation.Player.Event_Running; [[Information of event running]]
enum Efl.Canvas.Animation.Repeat_Mode
{