summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-01-28 17:06:16 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-02-01 14:21:27 -0800
commit9108215bf643870db0904f25c2afecca8a52540c (patch)
treed08c77dbb4f0a3f75ab42963e03892b18bf6d030
parent8014b0c70d69439007125ea740fa331460ead50f (diff)
photocam: switch to efl.core.animator.
-rw-r--r--src/lib/elm_photocam.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 6e63fc9b6..97d878e5e 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -789,8 +789,8 @@ _zoom_anim_cb(void *data,
789 { 789 {
790 sd->no_smooth--; 790 sd->no_smooth--;
791 if (!sd->no_smooth) _smooth_update(data); 791 if (!sd->no_smooth) _smooth_update(data);
792 eo_do(evas_object_evas_get(obj), 792 eo_do(obj,
793 eo_event_callback_del(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj)); 793 eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj));
794 eo_do(obj, eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL)); 794 eo_do(obj, eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL));
795 } 795 }
796 796
@@ -1087,8 +1087,8 @@ _bounce_eval(void *data,
1087 1087
1088 eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE)); 1088 eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE));
1089 1089
1090 eo_do(evas_object_evas_get(obj), 1090 eo_do(obj,
1091 eo_event_callback_del(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _bounce_eval, obj)); 1091 eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj));
1092 return EO_CALLBACK_CONTINUE; 1092 return EO_CALLBACK_CONTINUE;
1093} 1093}
1094 1094
@@ -1097,8 +1097,8 @@ _elm_photocam_bounce_reset(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED)
1097{ 1097{
1098 Eina_Bool r; 1098 Eina_Bool r;
1099 1099
1100 eo_do(evas_object_evas_get(obj), 1100 eo_do(obj,
1101 r = eo_event_callback_del(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _bounce_eval, obj)); 1101 r = eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj));
1102 if (r) _zoom_do(obj, 1.0); 1102 if (r) _zoom_do(obj, 1.0);
1103} 1103}
1104 1104
@@ -1107,8 +1107,8 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd)
1107{ 1107{
1108 Eina_Bool r; 1108 Eina_Bool r;
1109 1109
1110 eo_do(evas_object_evas_get(obj), 1110 eo_do(obj,
1111 r = eo_event_callback_del(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj)); 1111 r = eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj));
1112 if (r) 1112 if (r)
1113 { 1113 {
1114 sd->no_smooth--; 1114 sd->no_smooth--;
@@ -1313,8 +1313,8 @@ _g_layer_zoom_end_cb(void *data,
1313 sd->g_layer_zoom.bounce.t_end = t + 1313 sd->g_layer_zoom.bounce.t_end = t +
1314 _elm_config->page_scroll_friction; 1314 _elm_config->page_scroll_friction;
1315 1315
1316 eo_do(evas_object_evas_get(obj), 1316 eo_do(obj,
1317 eo_event_callback_add(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _bounce_eval, obj)); 1317 eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj));
1318 } 1318 }
1319 else 1319 else
1320 { 1320 {
@@ -1483,9 +1483,9 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd)
1483 ecore_job_del(sd->calc_job); 1483 ecore_job_del(sd->calc_job);
1484 ecore_timer_del(sd->scr_timer); 1484 ecore_timer_del(sd->scr_timer);
1485 ecore_timer_del(sd->long_timer); 1485 ecore_timer_del(sd->long_timer);
1486 eo_do(evas_object_evas_get(obj), 1486 eo_do(obj,
1487 eo_event_callback_del(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj), 1487 eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj),
1488 eo_event_callback_del(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _bounce_eval, obj)); 1488 eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj));
1489 1489
1490 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 1490 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
1491} 1491}
@@ -1956,9 +1956,9 @@ done:
1956 } 1956 }
1957 else 1957 else
1958 { 1958 {
1959 eo_do(evas_object_evas_get(obj), 1959 eo_do(obj,
1960 an = eo_event_callback_del(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj), 1960 an = eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj),
1961 eo_event_callback_add(EVAS_CANVAS_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj)); 1961 eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj));
1962 if (!an) 1962 if (!an)
1963 { 1963 {
1964 sd->no_smooth++; 1964 sd->no_smooth++;