summaryrefslogtreecommitdiff
path: root/src/lib/ecore/ecore_timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore/ecore_timer.c')
-rw-r--r--src/lib/ecore/ecore_timer.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 11a6ad1..7343a7f 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -93,7 +93,7 @@ ecore_timer_add(double in,
93 Ecore_Timer *timer = NULL; 93 Ecore_Timer *timer = NULL;
94 94
95 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 95 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
96 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(in, func, data)); 96 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(eoid, in, func, data));
97 return timer; 97 return timer;
98} 98}
99 99
@@ -232,7 +232,7 @@ EAPI void
232ecore_timer_freeze(Ecore_Timer *timer) 232ecore_timer_freeze(Ecore_Timer *timer)
233{ 233{
234 ECORE_TIMER_CHECK(timer); 234 ECORE_TIMER_CHECK(timer);
235 eo_do(timer, eo_event_freeze()); 235 eo_event_freeze(timer);
236} 236}
237 237
238EOLIAN static void 238EOLIAN static void
@@ -261,7 +261,7 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
261{ 261{
262 int r = 0; 262 int r = 0;
263 263
264 eo_do(timer, r = eo_event_freeze_count_get()); 264 r = eo_event_freeze_count_get(timer);
265 return !!r; 265 return !!r;
266} 266}
267 267
@@ -277,7 +277,7 @@ EAPI void
277ecore_timer_thaw(Ecore_Timer *timer) 277ecore_timer_thaw(Ecore_Timer *timer)
278{ 278{
279 ECORE_TIMER_CHECK(timer); 279 ECORE_TIMER_CHECK(timer);
280 eo_do(timer, eo_event_thaw()); 280 eo_event_thaw(timer);
281} 281}
282 282
283EOLIAN static void 283EOLIAN static void
@@ -357,7 +357,7 @@ _ecore_timer_loop_add(double in,
357 const void *data) 357 const void *data)
358{ 358{
359 Ecore_Timer *timer = NULL; 359 Ecore_Timer *timer = NULL;
360 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(in, func, data)); 360 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(eoid, in, func, data));
361 361
362 return timer; 362 return timer;
363} 363}
@@ -397,7 +397,7 @@ _ecore_timer_del(Ecore_Timer *obj)
397 if (timer->delete_me) 397 if (timer->delete_me)
398 timers_delete_me--; 398 timers_delete_me--;
399 399
400 eo_do(obj, eo_parent_set(NULL)); 400 eo_parent_set(obj, NULL);
401 401
402 if (eo_destructed_is(obj)) 402 if (eo_destructed_is(obj))
403 eo_manual_free(obj); 403 eo_manual_free(obj);
@@ -421,7 +421,7 @@ _ecore_timer_eo_base_destructor(Eo *obj, Ecore_Timer_Data *pd)
421 timers_delete_me++; 421 timers_delete_me++;
422 } 422 }
423 423
424 eo_do_super(obj, MY_CLASS, eo_destructor()); 424 eo_destructor(eo_super(obj, MY_CLASS));
425} 425}
426 426
427EOLIAN static Eo * 427EOLIAN static Eo *
@@ -432,7 +432,7 @@ _ecore_timer_eo_base_finalize(Eo *obj, Ecore_Timer_Data *pd)
432 return NULL; 432 return NULL;
433 } 433 }
434 434
435 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 435 return eo_finalize(eo_super(obj, MY_CLASS));
436} 436}
437 437
438void 438void
@@ -445,7 +445,7 @@ _ecore_timer_shutdown(void)
445 timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers)); 445 timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers));
446 446
447 eo_data_unref(timer->obj, timer); 447 eo_data_unref(timer->obj, timer);
448 eo_do(timer->obj, eo_parent_set(NULL)); 448 eo_parent_set(timer->obj, NULL);
449 if (eo_destructed_is(timer->obj)) 449 if (eo_destructed_is(timer->obj))
450 eo_manual_free(timer->obj); 450 eo_manual_free(timer->obj);
451 else 451 else
@@ -457,7 +457,7 @@ _ecore_timer_shutdown(void)
457 suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended)); 457 suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended));
458 458
459 eo_data_unref(timer->obj, timer); 459 eo_data_unref(timer->obj, timer);
460 eo_do(timer->obj, eo_parent_set(NULL)); 460 eo_parent_set(timer->obj, NULL);
461 if (eo_destructed_is(timer->obj)) 461 if (eo_destructed_is(timer->obj))
462 eo_manual_free(timer->obj); 462 eo_manual_free(timer->obj);
463 else 463 else
@@ -489,7 +489,7 @@ _ecore_timer_cleanup(void)
489 timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); 489 timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
490 490
491 eo_data_unref(timer->obj, timer); 491 eo_data_unref(timer->obj, timer);
492 eo_do(timer->obj, eo_parent_set(NULL)); 492 eo_parent_set(timer->obj, NULL);
493 if (eo_destructed_is(timer->obj)) 493 if (eo_destructed_is(timer->obj))
494 eo_manual_free(timer->obj); 494 eo_manual_free(timer->obj);
495 else 495 else
@@ -514,7 +514,7 @@ _ecore_timer_cleanup(void)
514 suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer)); 514 suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
515 515
516 eo_data_unref(timer->obj, timer); 516 eo_data_unref(timer->obj, timer);
517 eo_do(timer->obj, eo_parent_set(NULL)); 517 eo_parent_set(timer->obj, NULL);
518 if (eo_destructed_is(timer->obj)) 518 if (eo_destructed_is(timer->obj))
519 eo_manual_free(timer->obj); 519 eo_manual_free(timer->obj);
520 else 520 else