summaryrefslogtreecommitdiff
path: root/src/lib/ecore/ecore_anim.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore/ecore_anim.c')
-rw-r--r--src/lib/ecore/ecore_anim.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index a5f4d9d..d54e92f 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -319,7 +319,7 @@ _do_tick(void)
319 eina_inlist_remove(EINA_INLIST_GET(animators), 319 eina_inlist_remove(EINA_INLIST_GET(animators),
320 EINA_INLIST_GET(animator)); 320 EINA_INLIST_GET(animator));
321 321
322 eo_do(animator->obj, eo_parent_set(NULL)); 322 eo_parent_set(animator->obj, NULL);
323 if (eo_destructed_is(animator->obj)) 323 if (eo_destructed_is(animator->obj))
324 eo_manual_free(animator->obj); 324 eo_manual_free(animator->obj);
325 else 325 else
@@ -372,8 +372,7 @@ ecore_animator_add(Ecore_Task_Cb func,
372{ 372{
373 Ecore_Animator *animator = NULL; 373 Ecore_Animator *animator = NULL;
374 374
375 animator = eo_add(MY_CLASS, _ecore_parent, 375 animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_constructor(eoid, func, data));
376 ecore_animator_constructor(func, data));
377 return animator; 376 return animator;
378} 377}
379 378
@@ -389,8 +388,7 @@ ecore_animator_timeline_add(double runtime,
389 const void *data) 388 const void *data)
390{ 389{
391 Ecore_Animator *animator; 390 Ecore_Animator *animator;
392 animator = eo_add(MY_CLASS, _ecore_parent, 391 animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_timeline_constructor(eoid, runtime, func, data));
393 ecore_animator_timeline_constructor(runtime, func, data));
394 return animator; 392 return animator;
395} 393}
396 394
@@ -682,7 +680,7 @@ _ecore_animator_eo_base_destructor(Eo *obj, Ecore_Animator_Data *pd)
682 pd->delete_me = EINA_TRUE; 680 pd->delete_me = EINA_TRUE;
683 animators_delete_me++; 681 animators_delete_me++;
684 682
685 eo_do_super(obj, MY_CLASS, eo_destructor()); 683 eo_destructor(eo_super(obj, MY_CLASS));
686} 684}
687 685
688EOLIAN static Eo * 686EOLIAN static Eo *
@@ -693,7 +691,7 @@ _ecore_animator_eo_base_finalize(Eo *obj, Ecore_Animator_Data *pd)
693 return NULL; 691 return NULL;
694 } 692 }
695 693
696 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 694 return eo_finalize(eo_super(obj, MY_CLASS));
697} 695}
698 696
699EAPI void 697EAPI void
@@ -718,7 +716,7 @@ EAPI void
718ecore_animator_freeze(Ecore_Animator *animator) 716ecore_animator_freeze(Ecore_Animator *animator)
719{ 717{
720 ECORE_ANIMATOR_CHECK(animator); 718 ECORE_ANIMATOR_CHECK(animator);
721 eo_do(animator, eo_event_freeze()); 719 eo_event_freeze(animator);
722} 720}
723 721
724EOLIAN static void 722EOLIAN static void
@@ -738,7 +736,7 @@ EAPI void
738ecore_animator_thaw(Ecore_Animator *animator) 736ecore_animator_thaw(Ecore_Animator *animator)
739{ 737{
740 ECORE_ANIMATOR_CHECK(animator); 738 ECORE_ANIMATOR_CHECK(animator);
741 eo_do(animator, eo_event_thaw()); 739 eo_event_thaw(animator);
742} 740}
743 741
744EOLIAN static void 742EOLIAN static void
@@ -813,7 +811,7 @@ _ecore_animator_shutdown(void)
813 if (animator->suspended) animators_suspended--; 811 if (animator->suspended) animators_suspended--;
814 animators = (Ecore_Animator_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators)); 812 animators = (Ecore_Animator_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators));
815 813
816 eo_do(animator->obj, eo_parent_set(NULL)); 814 eo_parent_set(animator->obj, NULL);
817 if (eo_destructed_is(animator->obj)) 815 if (eo_destructed_is(animator->obj))
818 eo_manual_free(animator->obj); 816 eo_manual_free(animator->obj);
819 else 817 else