From: Enlightenment S. <no-...@en...> - 2011-05-19 09:34:34
|
Log: elementary/transit - modified to use eina_inlist instead of eina_list Author: hermet Date: 2011-05-19 02:34:26 -0700 (Thu, 19 May 2011) New Revision: 59525 Trac: http://trac.enlightenment.org/e/changeset/59525 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-05-19 09:28:43 UTC (rev 59524) +++ trunk/elementary/src/lib/elm_transit.c 2011-05-19 09:34:26 UTC (rev 59525) @@ -58,7 +58,7 @@ EINA_MAGIC; Ecore_Animator *animator; - Eina_List *effect_list; + Eina_Inlist *effect_list; Eina_List *objs; Elm_Transit *prev_chain_transit; Eina_List *next_chain_transits; @@ -90,6 +90,7 @@ struct _Elm_Transit_Effect_Module { + EINA_INLIST; Elm_Transit_Effect_Transition_Cb transition_cb; Elm_Transit_Effect_End_Cb end_cb; Elm_Transit_Effect *effect; @@ -193,26 +194,25 @@ } static void -_elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module, Eina_List *elist) +_elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module) { if (effect_module->end_cb) effect_module->end_cb(effect_module->effect, transit); - transit->effect_list = eina_list_remove_list(transit->effect_list, elist); + transit->effect_list = eina_inlist_remove(transit->effect_list, (Eina_Inlist*) effect_module); free(effect_module); } static void _remove_dead_effects(Elm_Transit *transit) { - Eina_List *elist, *elist_next; Elm_Transit_Effect_Module *effect_module; - EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect_module) + EINA_INLIST_FOREACH(transit->effect_list, effect_module) { if (effect_module->deleted) { - _elm_transit_effect_del(transit, effect_module, elist); + _elm_transit_effect_del(transit, effect_module); transit->effects_pending_del--; if (!transit->effects_pending_del) return; } @@ -222,9 +222,9 @@ static void _elm_transit_del(Elm_Transit *transit) { - Eina_List *elist, *elist_next; Elm_Transit_Effect_Module *effect_module; Elm_Transit *chain_transit; + Eina_List *elist, *elist_next; EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) { @@ -238,8 +238,8 @@ if (transit->animator) ecore_animator_del(transit->animator); - EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect_module) - _elm_transit_effect_del(transit, effect_module, elist); + EINA_INLIST_FOREACH(transit->effect_list, effect_module) + _elm_transit_effect_del(transit, effect_module); while (transit->objs) _elm_transit_object_remove(transit, eina_list_data_get(transit->objs)); @@ -266,11 +266,10 @@ static void _transit_animate_op(Elm_Transit *transit, double progress) { - Eina_List *elist; Elm_Transit_Effect_Module *effect_module; transit->walking++; - EINA_LIST_FOREACH(transit->effect_list, elist, effect_module) + EINA_INLIST_FOREACH(transit->effect_list, effect_module) { if (transit->deleted) break; if (!effect_module->deleted) @@ -436,9 +435,8 @@ ELM_TRANSIT_CHECK_OR_RETURN(transit); EINA_SAFETY_ON_NULL_RETURN(transition_cb); Elm_Transit_Effect_Module *effect_module; - Eina_List *elist; - EINA_LIST_FOREACH(transit->effect_list, elist, effect_module) + EINA_INLIST_FOREACH(transit->effect_list, effect_module) if ((effect_module->transition_cb == transition_cb) && (effect_module->effect == effect)) return; effect_module = ELM_NEW(Elm_Transit_Effect_Module); @@ -448,7 +446,7 @@ effect_module->transition_cb = transition_cb; effect_module->effect = effect; - transit->effect_list = eina_list_append(transit->effect_list, effect_module); + transit->effect_list = eina_inlist_append(transit->effect_list, (Eina_Inlist*) effect_module); } /** @@ -474,10 +472,9 @@ { ELM_TRANSIT_CHECK_OR_RETURN(transit); EINA_SAFETY_ON_NULL_RETURN(transition_cb); - Eina_List *elist, *elist_next; Elm_Transit_Effect_Module *effect_module; - EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect_module) + EINA_INLIST_FOREACH(transit->effect_list, effect_module) { if ((effect_module->transition_cb == transition_cb) && (effect_module->effect == effect)) { @@ -488,7 +485,7 @@ } else { - _elm_transit_effect_del(transit, effect_module, elist); + _elm_transit_effect_del(transit, effect_module); if (!transit->effect_list) elm_transit_del(transit); } return; |