summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-03-10 13:13:45 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-03-10 13:14:29 -0800
commit633d2557c8a79ceeb02f6064a47e205093685b2e (patch)
tree78a5f030e280ee89b4518af2b6e5b7988a4a553f
parent60ca712654d58998e62d621b3a586abb151c6868 (diff)
efl: followup with renaming efl animator.
-rw-r--r--src/bin/test_anim.c2
-rw-r--r--src/lib/elc_naviframe.c4
-rw-r--r--src/lib/elm_genlist.c4
-rw-r--r--src/lib/elm_interface_scrollable.c6
-rw-r--r--src/lib/elm_map.c6
-rw-r--r--src/lib/elm_panel.c4
-rw-r--r--src/lib/elm_photocam.c18
7 files changed, 22 insertions, 22 deletions
diff --git a/src/bin/test_anim.c b/src/bin/test_anim.c
index a688a1961..24125bcff 100644
--- a/src/bin/test_anim.c
+++ b/src/bin/test_anim.c
@@ -93,5 +93,5 @@ test_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
93 evas_object_resize(win, 480, 800); 93 evas_object_resize(win, 480, 800);
94 evas_object_show(win); 94 evas_object_show(win);
95 95
96 eo_event_callback_add(win, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick, NULL); 96 eo_event_callback_add(win, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
97} 97}
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 29e92a37d..757ffc701 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1437,7 +1437,7 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED)
1437 free(nfo); 1437 free(nfo);
1438 } 1438 }
1439 1439
1440 eo_event_callback_del(nfd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, nfd); 1440 eo_event_callback_del(nfd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, nfd);
1441 return EO_CALLBACK_CONTINUE; 1441 return EO_CALLBACK_CONTINUE;
1442} 1442}
1443 1443
@@ -1522,7 +1522,7 @@ static void
1522_schedule_deferred(Elm_Naviframe_Op *nfo, Elm_Naviframe_Data *sd) 1522_schedule_deferred(Elm_Naviframe_Op *nfo, Elm_Naviframe_Data *sd)
1523{ 1523{
1524 if (!sd->ops) 1524 if (!sd->ops)
1525 eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, sd); 1525 eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, sd);
1526 1526
1527 sd->ops = eina_list_append(sd->ops, nfo); 1527 sd->ops = eina_list_append(sd->ops, nfo);
1528} 1528}
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 3573492e1..70711cdd7 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2433,7 +2433,7 @@ _elm_genlist_tree_effect_setup(Elm_Genlist_Data *sd)
2433 evas_object_stack_below(sd->event_block_rect, sd->stack[1]); 2433 evas_object_stack_below(sd->event_block_rect, sd->stack[1]);
2434 evas_object_show(sd->event_block_rect); 2434 evas_object_show(sd->event_block_rect);
2435 sd->start_time = ecore_time_get(); 2435 sd->start_time = ecore_time_get();
2436 eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj); 2436 eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
2437 sd->tree_effect_animator = 1; 2437 sd->tree_effect_animator = 1;
2438 return EINA_TRUE; 2438 return EINA_TRUE;
2439 } 2439 }
@@ -2446,7 +2446,7 @@ _elm_genlist_tree_effect_stop(Elm_Genlist_Data *sd)
2446 if (sd->tree_effect_animator) 2446 if (sd->tree_effect_animator)
2447 { 2447 {
2448 sd->tree_effect_animator = 0; 2448 sd->tree_effect_animator = 0;
2449 eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj); 2449 eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
2450 } 2450 }
2451} 2451}
2452 2452
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 3b49929b2..196244137 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -31,12 +31,12 @@
31 } 31 }
32 32
33#define ELM_ANIMATOR_CONNECT(Obj, Bool, Callback, Data) \ 33#define ELM_ANIMATOR_CONNECT(Obj, Bool, Callback, Data) \
34 eo_event_callback_del(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ 34 eo_event_callback_del(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
35 eo_event_callback_add(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ 35 eo_event_callback_add(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
36 Bool = 1; 36 Bool = 1;
37 37
38#define ELM_ANIMATOR_DISCONNECT(Obj, Bool, Callback, Data) \ 38#define ELM_ANIMATOR_DISCONNECT(Obj, Bool, Callback, Data) \
39 eo_event_callback_del(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ 39 eo_event_callback_del(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
40 Bool = 0; 40 Bool = 0;
41 41
42static const char SIG_CHANGED[] = "changed"; 42static const char SIG_CHANGED[] = "changed";
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index d6d94ba2b..ecc75dc50 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1207,9 +1207,9 @@ _zoom_animator_set(Elm_Map_Data *sd,
1207 Eina_Bool r = EINA_FALSE; 1207 Eina_Bool r = EINA_FALSE;
1208 1208
1209 sd->zoom_animator = !!callback; 1209 sd->zoom_animator = !!callback;
1210 r = eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj); 1210 r = eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj);
1211 r |= eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj); 1211 r |= eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj);
1212 if (callback) eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, callback, sd->obj); 1212 if (callback) eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, callback, sd->obj);
1213 1213
1214 return r; 1214 return r;
1215} 1215}
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 17fb5693f..95a52e442 100644
--- a/src/lib/elm_panel.c
+++ b/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
1125 break; 1125 break;
1126 } 1126 }
1127 1127
1128 eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj); 1128 eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
1129} 1129}
1130 1130
1131EOLIAN static void 1131EOLIAN static void
@@ -1379,7 +1379,7 @@ _elm_panel_scrollable_content_size_set(Eo *obj, Elm_Panel_Data *sd, double ratio
1379 break; 1379 break;
1380 } 1380 }
1381 1381
1382 eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj); 1382 eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
1383} 1383}
1384 1384
1385EOLIAN static Eina_Bool 1385EOLIAN static Eina_Bool
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 6671ff35e..bf9946827 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -786,7 +786,7 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
786 { 786 {
787 sd->no_smooth--; 787 sd->no_smooth--;
788 if (!sd->no_smooth) _smooth_update(data); 788 if (!sd->no_smooth) _smooth_update(data);
789 eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); 789 eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
790 eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); 790 eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL);
791 } 791 }
792 792
@@ -1079,7 +1079,7 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED)
1079 1079
1080 elm_interface_scrollable_freeze_set(obj, EINA_FALSE); 1080 elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
1081 1081
1082 eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); 1082 eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
1083 return EO_CALLBACK_CONTINUE; 1083 return EO_CALLBACK_CONTINUE;
1084} 1084}
1085 1085
@@ -1088,7 +1088,7 @@ _elm_photocam_bounce_reset(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED)
1088{ 1088{
1089 Eina_Bool r; 1089 Eina_Bool r;
1090 1090
1091 r = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); 1091 r = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
1092 if (r) _zoom_do(obj, 1.0); 1092 if (r) _zoom_do(obj, 1.0);
1093} 1093}
1094 1094
@@ -1097,7 +1097,7 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd)
1097{ 1097{
1098 Eina_Bool r; 1098 Eina_Bool r;
1099 1099
1100 r = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); 1100 r = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
1101 if (r) 1101 if (r)
1102 { 1102 {
1103 sd->no_smooth--; 1103 sd->no_smooth--;
@@ -1302,7 +1302,7 @@ _g_layer_zoom_end_cb(void *data,
1302 sd->g_layer_zoom.bounce.t_end = t + 1302 sd->g_layer_zoom.bounce.t_end = t +
1303 _elm_config->page_scroll_friction; 1303 _elm_config->page_scroll_friction;
1304 1304
1305 eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); 1305 eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
1306 } 1306 }
1307 else 1307 else
1308 { 1308 {
@@ -1470,8 +1470,8 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd)
1470 ecore_job_del(sd->calc_job); 1470 ecore_job_del(sd->calc_job);
1471 ecore_timer_del(sd->scr_timer); 1471 ecore_timer_del(sd->scr_timer);
1472 ecore_timer_del(sd->long_timer); 1472 ecore_timer_del(sd->long_timer);
1473 eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); 1473 eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
1474 eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); 1474 eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
1475 1475
1476 evas_obj_smart_del(eo_super(obj, MY_CLASS)); 1476 evas_obj_smart_del(eo_super(obj, MY_CLASS));
1477} 1477}
@@ -1940,8 +1940,8 @@ done:
1940 } 1940 }
1941 else 1941 else
1942 { 1942 {
1943 an = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); 1943 an = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
1944 eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); 1944 eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
1945 if (!an) 1945 if (!an)
1946 { 1946 {
1947 sd->no_smooth++; 1947 sd->no_smooth++;