1 files changed, 22 insertions, 29 deletions

diff --git a/src/bin/elementary/test_efl_anim_start_delay.c b/src/bin/elementary/test_efl_anim_start_delay.c
index 63cab0f18e..c94b515b62 100644
--- a/src/bin/elementary/test_efl_anim_start_delay.c
+++ b/src/bin/elementary/test_efl_anim_start_delay.c
@@ -5,9 +5,9 @@
 
 typedef struct _App_Data
 {
-   Efl_Animation        *show_anim;
-   Efl_Animation        *hide_anim;
-   Efl_Animation_Object *anim_obj;
+   Efl_Canvas_Animation        *show_anim;
+   Efl_Canvas_Animation        *hide_anim;
+   Efl_Canvas_Animation_Player *anim_obj;
 
    Evas_Object          *start_delay_spin;
 
@@ -28,15 +28,13 @@ _anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED)
    printf("Animation has been ended!\n");
 
    elm_object_disabled_set(ad->start_delay_spin, EINA_FALSE);
-
-   ad->anim_obj = NULL;
 }
 
 static void
 _anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event)
 {
-   Efl_Animation_Object_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);
 }
 
@@ -45,9 +43,6 @@ _start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
 {
    App_Data *ad = data;
 
-   if (ad->anim_obj)
-     efl_animation_object_cancel(ad->anim_obj);
-
    ad->is_btn_visible = !(ad->is_btn_visible);
 
    double start_delay = elm_spinner_value_get(ad->start_delay_spin);
@@ -59,8 +54,8 @@ _start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
         efl_animation_start_delay_set(ad->show_anim, start_delay);
 
         //Create Animation Object from Animation
-        ad->anim_obj = efl_animation_object_create(ad->show_anim);
-        elm_object_text_set(obj, "Start Alpha Animation from 1.0 to 0.0");
+        efl_animation_player_animation_set(ad->anim_obj, ad->show_anim);
+        efl_text_set(obj, "Start Alpha Animation from 1.0 to 0.0");
      }
    else
      {
@@ -68,21 +63,12 @@ _start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
         efl_animation_start_delay_set(ad->hide_anim, start_delay);
 
         //Create Animation Object from Animation
-        ad->anim_obj = efl_animation_object_create(ad->hide_anim);
-        elm_object_text_set(obj, "Start Alpha Animation from 0.0 to 1.0");
+        efl_animation_player_animation_set(ad->anim_obj, ad->hide_anim);
+        efl_text_set(obj, "Start Alpha Animation from 0.0 to 1.0");
      }
 
-   //Register callback called when animation starts
-   efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_OBJECT_EVENT_STARTED, _anim_started_cb, NULL);
-
-   //Register callback called when animation ends
-   efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_OBJECT_EVENT_ENDED, _anim_ended_cb, ad);
-
-   //Register callback called while animation is executed
-   efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_OBJECT_EVENT_RUNNING, _anim_running_cb, NULL);
-
    //Let Animation Object start animation
-   efl_animation_object_start(ad->anim_obj);
+   efl_player_start(ad->anim_obj);
 }
 
 static void
@@ -112,17 +98,15 @@ test_efl_anim_start_delay(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    evas_object_show(btn);
 
    //Show Animation
-   Efl_Animation *show_anim = efl_add(EFL_ANIMATION_ALPHA_CLASS, NULL);
+   Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win);
    efl_animation_alpha_set(show_anim, 0.0, 1.0);
    efl_animation_duration_set(show_anim, 1.0);
-   efl_animation_target_set(show_anim, btn);
    efl_animation_final_state_keep_set(show_anim, EINA_TRUE);
 
    //Hide Animation
-   Efl_Animation *hide_anim = efl_add(EFL_ANIMATION_ALPHA_CLASS, NULL);
+   Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win);
    efl_animation_alpha_set(hide_anim, 1.0, 0.0);
    efl_animation_duration_set(hide_anim, 1.0);
-   efl_animation_target_set(hide_anim, btn);
    efl_animation_final_state_keep_set(hide_anim, EINA_TRUE);
 
 
@@ -150,7 +134,16 @@ test_efl_anim_start_delay(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    //Initialize App Data
    ad->show_anim = show_anim;
    ad->hide_anim = hide_anim;
-   ad->anim_obj = NULL;
+   ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win,
+                          efl_animation_player_target_set(efl_added, btn));
+
+   //Register callback called when animation starts
+   efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL);
+   //Register callback called when animation ends
+   efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, ad);
+   //Register callback called while animation is executed
+   efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL);
+
    ad->start_delay_spin = start_delay_spin;
    ad->is_btn_visible = EINA_TRUE;