cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=45bc4f30eb5ff01c5f78623375e2128a5e6587bf
commit 45bc4f30eb5ff01c5f78623375e2128a5e6587bf
Author: Cedric Bail <ced...@osg.samsung.com>
Date: Wed May 18 01:56:21 2016 -0700
efl: change name of animator,tick event in C.
---
src/bin/elementary/test_anim.c | 2 +-
src/lib/ecore_evas/ecore_evas.c | 6 +++---
src/lib/edje/edje_load.c | 2 +-
src/lib/edje/edje_program.c | 4 ++--
src/lib/efl/interfaces/efl_animator.eo | 1 +
src/lib/elementary/elc_naviframe.c | 4 ++--
src/lib/elementary/elm_genlist.c | 4 ++--
src/lib/elementary/elm_interface_scrollable.c | 6 +++---
src/lib/elementary/elm_map.c | 6 +++---
src/lib/elementary/elm_panel.c | 4 ++--
src/lib/elementary/elm_photocam.c | 18 +++++++++---------
src/lib/evas/canvas/evas_object_main.c | 10 +++++-----
12 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/src/bin/elementary/test_anim.c b/src/bin/elementary/test_anim.c
index 24125bc..346a3b6 100644
--- a/src/bin/elementary/test_anim.c
+++ b/src/bin/elementary/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_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick,
NULL);
+ eo_event_callback_add(win, EFL_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
}
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index effe584..dffb915 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3104,7 +3104,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle
*viewport)
a.update_area = *viewport;
}
- eo_event_callback_call(ee->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, &a);
+ eo_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
// FIXME: We do not support partial animator in the subcanvas
EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee)
@@ -3164,7 +3164,7 @@ _check_animator_event_catcher_add(void *data, const
Eo_Event *event)
for (i = 0; array[i].desc != NULL; i++)
{
- if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
+ if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
{
if (ee->anim_count++ > 0) return EO_CALLBACK_CONTINUE;
INF("Setting up animator for %p from '%s' with title '%s'.",
ee->evas, ee->driver, ee->prop.title);
@@ -3200,7 +3200,7 @@ _check_animator_event_catcher_del(void *data, const
Eo_Event *event)
for (i = 0; array[i].desc != NULL; i++)
{
- if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
+ if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
{
if ((--ee->anim_count) > 0) return EO_CALLBACK_CONTINUE;
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index cacf058..e6bdeea 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1725,7 +1725,7 @@ _edje_file_del(Edje *ed)
free(runp);
}
_edje_animators = eina_list_remove(_edje_animators, ed);
- eo_event_callback_del(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK,
_edje_timer_cb, ed);
+ eo_event_callback_del(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
ecore_animator_del(ed->animator);
ed->animator = NULL;
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 21bf96c..6580e5e 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -433,7 +433,7 @@ _edje_program_run_cleanup(Edje *ed, Edje_Running_Program
*runp)
ed->actions = eina_list_remove(ed->actions, runp);
if (!ed->actions)
{
- eo_event_callback_del(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK,
_edje_timer_cb, ed);
+ eo_event_callback_del(ed->obj, EFL_EVENT_ANIMATOR_TICK,
_edje_timer_cb, ed);
ecore_animator_del(ed->animator);
ed->animator = NULL;
}
@@ -737,7 +737,7 @@ low_mem_current:
if (!ed->actions)
{
if (ed->canvas_animator)
- eo_event_callback_add(ed->obj,
EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
+ eo_event_callback_add(ed->obj, EFL_EVENT_ANIMATOR_TICK,
_edje_timer_cb, ed);
else
ed->animator = ecore_animator_add(_edje_animator_cb, ed);
}
diff --git a/src/lib/efl/interfaces/efl_animator.eo
b/src/lib/efl/interfaces/efl_animator.eo
index 2fcb4a7..f451f8a 100644
--- a/src/lib/efl/interfaces/efl_animator.eo
+++ b/src/lib/efl/interfaces/efl_animator.eo
@@ -6,6 +6,7 @@ struct Efl.Event.Animator_Tick {
interface Efl.Animator {
eo_prefix: efl_animator;
+ event_prefix: efl;
events {
animator,tick: Efl.Event.Animator_Tick; [[Animator tick synchronized
with screen vsync if possible.]]
}
diff --git a/src/lib/elementary/elc_naviframe.c
b/src/lib/elementary/elc_naviframe.c
index 7667cf4..2504f04 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/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_ANIMATOR_EVENT_ANIMATOR_TICK,
_deferred, nfd);
+ eo_event_callback_del(nfd->obj, EFL_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_ANIMATOR_EVENT_ANIMATOR_TICK,
_deferred, sd);
+ eo_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, sd);
sd->ops = eina_list_append(sd->ops, nfo);
}
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index afb41cf..db67e9d 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -2432,7 +2432,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_ANIMATOR_EVENT_ANIMATOR_TICK,
_tree_effect_animator_cb, sd->obj);
+ eo_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK,
_tree_effect_animator_cb, sd->obj);
sd->tree_effect_animator = 1;
return EINA_TRUE;
}
@@ -2445,7 +2445,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_ANIMATOR_EVENT_ANIMATOR_TICK,
_tree_effect_animator_cb, sd->obj);
+ eo_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK,
_tree_effect_animator_cb, sd->obj);
}
}
diff --git a/src/lib/elementary/elm_interface_scrollable.c
b/src/lib/elementary/elm_interface_scrollable.c
index 6c465b6..a94784c 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -31,12 +31,12 @@
}
#define ELM_ANIMATOR_CONNECT(Obj, Bool, 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); \
+ eo_event_callback_del(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
+ eo_event_callback_add(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
Bool = 1;
#define ELM_ANIMATOR_DISCONNECT(Obj, Bool, Callback, Data) \
- eo_event_callback_del(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback,
Data); \
+ eo_event_callback_del(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
Bool = 0;
static const char SIG_CHANGED[] = "changed";
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 18cfe95..8146ad0 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -1210,9 +1210,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_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);
+ r = eo_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb,
sd->obj);
+ r |= eo_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK,
_zoom_bring_anim_cb, sd->obj);
+ if (callback) eo_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK,
callback, sd->obj);
return r;
}
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 5d81e03..3b4dbf1 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/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_ANIMATOR_EVENT_ANIMATOR_TICK,
_elm_panel_anim_cb, obj);
+ eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb,
obj);
}
EOLIAN static void
@@ -1378,7 +1378,7 @@ _elm_panel_scrollable_content_size_set(Eo *obj,
Elm_Panel_Data *sd, double ratio
break;
}
- eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK,
_elm_panel_anim_cb, obj);
+ eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb,
obj);
}
EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/elm_photocam.c
b/src/lib/elementary/elm_photocam.c
index d90554c..fda0298 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/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_ANIMATOR_EVENT_ANIMATOR_TICK,
_zoom_anim_cb, obj);
+ eo_event_callback_del(obj, EFL_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_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval,
obj);
+ eo_event_callback_del(obj, EFL_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_ANIMATOR_EVENT_ANIMATOR_TICK,
_bounce_eval, obj);
+ r = eo_event_callback_del(obj, EFL_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_ANIMATOR_EVENT_ANIMATOR_TICK,
_zoom_anim_cb, obj);
+ r = eo_event_callback_del(obj, EFL_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_ANIMATOR_EVENT_ANIMATOR_TICK,
_bounce_eval, obj);
+ eo_event_callback_add(obj, EFL_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_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb,
obj);
- eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval,
obj);
+ eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+ eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
evas_obj_smart_del(eo_super(obj, MY_CLASS));
}
@@ -1939,8 +1939,8 @@ done:
}
else
{
- 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);
+ an = eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK,
_zoom_anim_cb, obj);
+ eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb,
obj);
if (!an)
{
sd->no_smooth++;
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index 45bc61f..5d8ba2a 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -89,7 +89,7 @@ _animator_repeater(void *data, const Eo_Event *event)
{
Evas_Object_Protected_Data *obj = data;
- eo_event_callback_call(obj->object, EFL_ANIMATOR_EVENT_ANIMATOR_TICK,
event->info);
+ eo_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info);
DBG("Emitting animator tick on %p.", obj->object);
return EO_CALLBACK_CONTINUE;
@@ -104,11 +104,11 @@ _check_event_catcher_add(void *data, const Eo_Event
*event)
for (i = 0; array[i].desc != NULL; i++)
{
- if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
+ if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
{
if (obj->animator_ref++ > 0) break;
- eo_event_callback_add(obj->layer->evas->evas,
EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
+ eo_event_callback_add(obj->layer->evas->evas,
EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
INF("Registering an animator tick on canvas %p for object %p.",
obj->layer->evas->evas, obj->object);
}
@@ -130,11 +130,11 @@ _check_event_catcher_del(void *data, const Eo_Event
*event)
for (i = 0; array[i].desc != NULL; i++)
{
- if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
+ if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
{
if ((--obj->animator_ref) > 0) break;
- eo_event_callback_del(obj->layer->evas->evas,
EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
+ eo_event_callback_del(obj->layer->evas->evas,
EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
INF("Unregistering an animator tick on canvas %p for object %p.",
obj->layer->evas->evas, obj->object);
}
--
