devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Unify the way functions are called from menus.

Browse source 
Optionally, the functions return value can be checked for a value to 
tell the menu to quit.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12821 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-03-17 12:33:34 +00:00
parent 86ecc9588b
commit daf66940b1
10 changed files with 209 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/menu.c
View file

@ -160,7 +160,6 @@ static void menu_get_icon(int selected_item, void * data, ICON * icon)
*icon = bitmap_icons_6x8[menu_icon];
break;
case MT_FUNCTION_CALL:
case MT_FUNCTION_WITH_PARAM:
case MT_RETURN_VALUE:
if (menu_icon == Icon_NOICON)
*icon = bitmap_icons_6x8[Icon_Menu_functioncall];
@ -545,14 +544,21 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
}
break;
case MT_FUNCTION_CALL:
{
int return_value;
action_signalscreenchange();
temp->function();
break;
case MT_FUNCTION_WITH_PARAM:
action_signalscreenchange();
temp->func_with_param->function(
temp->func_with_param->param);
if (temp->flags&MENU_FUNC_USEPARAM)
return_value = temp->function->function_w_param(
temp->function->param);
else
return_value = temp->function->function();
if (temp->flags&MENU_FUNC_CHECK_RETVAL)
{
if (return_value == temp->function->exit_value)
return return_value;
}
break;
}
case MT_SETTING:
case MT_SETTING_W_TEXT:
{