From 7078261b44ddcdd7798b12855feaadeef97381dc Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 10 Mar 2016 13:13:45 -0800 Subject: [PATCH] efl: followup with renaming efl animator. --- legacy/elementary/src/bin/test_anim.c | 2 +- legacy/elementary/src/lib/elc_naviframe.c | 4 ++-- legacy/elementary/src/lib/elm_genlist.c | 4 ++-- legacy/elementary/src/lib/elm_interface_scrollable.c | 6 +++--- legacy/elementary/src/lib/elm_map.c | 6 +++--- legacy/elementary/src/lib/elm_panel.c | 4 ++-- legacy/elementary/src/lib/elm_photocam.c | 18 +++++++++--------- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/legacy/elementary/src/bin/test_anim.c b/legacy/elementary/src/bin/test_anim.c index a688a19..24125bc 100644 --- a/legacy/elementary/src/bin/test_anim.c +++ b/legacy/elementary/src/bin/test_anim.c @@ -93,5 +93,5 @@ test_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info evas_object_resize(win, 480, 800); evas_object_show(win); - eo_event_callback_add(win, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick, NULL); + eo_event_callback_add(win, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick, NULL); } diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 29e92a3..757ffc7 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -1437,7 +1437,7 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED) free(nfo); } - eo_event_callback_del(nfd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, nfd); + eo_event_callback_del(nfd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, nfd); return EO_CALLBACK_CONTINUE; } @@ -1522,7 +1522,7 @@ static void _schedule_deferred(Elm_Naviframe_Op *nfo, Elm_Naviframe_Data *sd) { if (!sd->ops) - eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, sd); + eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, sd); sd->ops = eina_list_append(sd->ops, nfo); } diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 3573492..70711cd 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -2433,7 +2433,7 @@ _elm_genlist_tree_effect_setup(Elm_Genlist_Data *sd) evas_object_stack_below(sd->event_block_rect, sd->stack[1]); evas_object_show(sd->event_block_rect); sd->start_time = ecore_time_get(); - eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj); + eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj); sd->tree_effect_animator = 1; return EINA_TRUE; } @@ -2446,7 +2446,7 @@ _elm_genlist_tree_effect_stop(Elm_Genlist_Data *sd) if (sd->tree_effect_animator) { sd->tree_effect_animator = 0; - eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj); + eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj); } } diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.c b/legacy/elementary/src/lib/elm_interface_scrollable.c index 3b49929..1962441 100644 --- a/legacy/elementary/src/lib/elm_interface_scrollable.c +++ b/legacy/elementary/src/lib/elm_interface_scrollable.c @@ -31,12 +31,12 @@ } #define ELM_ANIMATOR_CONNECT(Obj, Bool, Callback, Data) \ - eo_event_callback_del(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ - eo_event_callback_add(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ + eo_event_callback_del(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ + eo_event_callback_add(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ Bool = 1; #define ELM_ANIMATOR_DISCONNECT(Obj, Bool, Callback, Data) \ - eo_event_callback_del(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ + eo_event_callback_del(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ Bool = 0; static const char SIG_CHANGED[] = "changed"; diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c index d6d94ba..ecc75dc 100644 --- a/legacy/elementary/src/lib/elm_map.c +++ b/legacy/elementary/src/lib/elm_map.c @@ -1207,9 +1207,9 @@ _zoom_animator_set(Elm_Map_Data *sd, Eina_Bool r = EINA_FALSE; sd->zoom_animator = !!callback; - r = eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj); - r |= eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj); - if (callback) eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, callback, sd->obj); + r = eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj); + r |= eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj); + if (callback) eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, callback, sd->obj); return r; } diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c index 17fb569..95a52e4 100644 --- a/legacy/elementary/src/lib/elm_panel.c +++ b/legacy/elementary/src/lib/elm_panel.c @@ -1125,7 +1125,7 @@ _elm_panel_evas_object_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, E break; } - eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj); + eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj); } EOLIAN static void @@ -1379,7 +1379,7 @@ _elm_panel_scrollable_content_size_set(Eo *obj, Elm_Panel_Data *sd, double ratio break; } - eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj); + eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj); } EOLIAN static Eina_Bool diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c index 6671ff3..bf99468 100644 --- a/legacy/elementary/src/lib/elm_photocam.c +++ b/legacy/elementary/src/lib/elm_photocam.c @@ -786,7 +786,7 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) { sd->no_smooth--; if (!sd->no_smooth) _smooth_update(data); - eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); + eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); } @@ -1079,7 +1079,7 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED) elm_interface_scrollable_freeze_set(obj, EINA_FALSE); - eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); + eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); return EO_CALLBACK_CONTINUE; } @@ -1088,7 +1088,7 @@ _elm_photocam_bounce_reset(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED) { Eina_Bool r; - r = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); + r = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); if (r) _zoom_do(obj, 1.0); } @@ -1097,7 +1097,7 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd) { Eina_Bool r; - r = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); + r = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); if (r) { sd->no_smooth--; @@ -1302,7 +1302,7 @@ _g_layer_zoom_end_cb(void *data, sd->g_layer_zoom.bounce.t_end = t + _elm_config->page_scroll_friction; - eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); + eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); } else { @@ -1470,8 +1470,8 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd) ecore_job_del(sd->calc_job); ecore_timer_del(sd->scr_timer); ecore_timer_del(sd->long_timer); - eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); - eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); + eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); + eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); evas_obj_smart_del(eo_super(obj, MY_CLASS)); } @@ -1940,8 +1940,8 @@ done: } else { - an = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); - eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); + an = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); + eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); if (!an) { sd->no_smooth++; -- 2.7.4