From daf66940b1a06de2681c91dcb8cf72d95a234e86 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sat, 17 Mar 2007 12:33:34 +0000 Subject: Unify the way functions are called from menus. 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 --- apps/menus/display_menu.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'apps/menus/display_menu.c') diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 23915dcfef..3714950223 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c @@ -149,7 +149,6 @@ static int set_bg_color(void) screens[SCREEN_MAIN].set_background(global_settings.bg_color); return res; } - static int reset_color(void) { global_settings.fg_color = LCD_DEFAULT_FG; @@ -159,14 +158,14 @@ static int reset_color(void) screens[SCREEN_MAIN].set_background(global_settings.bg_color); return 0; } -MENUITEM_FUNCTION(clear_main_bd, ID2P(LANG_CLEAR_BACKDROP), - clear_main_backdrop, NULL, Icon_NOICON); -MENUITEM_FUNCTION(set_bg_col, ID2P(LANG_BACKGROUND_COLOR), - set_bg_color, NULL, Icon_NOICON); -MENUITEM_FUNCTION(set_fg_col, ID2P(LANG_FOREGROUND_COLOR), - set_fg_color, NULL, Icon_NOICON); -MENUITEM_FUNCTION(reset_colors, ID2P(LANG_RESET_COLORS), - reset_color, NULL, Icon_NOICON); +MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), + clear_main_backdrop, NULL, 0, NULL, Icon_NOICON); +MENUITEM_FUNCTION(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), + set_bg_color, NULL, 0, NULL, Icon_NOICON); +MENUITEM_FUNCTION(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), + set_fg_color, NULL, 0, NULL, Icon_NOICON); +MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), + reset_color, NULL, 0, NULL, Icon_NOICON); #endif /* now the actual menu */ @@ -498,12 +497,12 @@ static int peak_meter_max(void) { settings_apply_pm_range(); return retval; } -MENUITEM_FUNCTION(peak_meter_scale_item, ID2P(LANG_PM_SCALE), - peak_meter_scale, NULL, Icon_NOICON); -MENUITEM_FUNCTION(peak_meter_min_item, ID2P(LANG_PM_MIN), - peak_meter_min, NULL, Icon_NOICON); -MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX), - peak_meter_max, NULL, Icon_NOICON); +MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), + peak_meter_scale, NULL, 0, NULL, Icon_NOICON); +MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), + peak_meter_min, NULL, 0, NULL, Icon_NOICON); +MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), + peak_meter_max, NULL, 0, NULL, Icon_NOICON); MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, &peak_meter_release, &peak_meter_hold, &peak_meter_clip_hold, @@ -534,14 +533,17 @@ static int browse_folder(void *param) } #ifdef HAVE_LCD_BITMAP -MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT), - browse_folder, (void*)&fonts, NULL, Icon_NOICON); +MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, + ID2P(LANG_CUSTOM_FONT), + browse_folder, (void*)&fonts, 0, NULL, Icon_NOICON); #endif -MENUITEM_FUNCTION_WPARAM(browse_wps, ID2P(LANG_WHILE_PLAYING), - browse_folder, (void*)&wps, NULL, Icon_NOICON); +MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, + ID2P(LANG_WHILE_PLAYING), + browse_folder, (void*)&wps, 0, NULL, Icon_NOICON); #ifdef HAVE_REMOTE_LCD -MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING), - browse_folder, (void*)&rwps, NULL, Icon_NOICON); +MENUITEM_FUNCTION(browse_rwps, MENU_FUNC_USEPARAM, + ID2P(LANG_REMOTE_WHILE_PLAYING), + browse_folder, (void*)&rwps, 0, NULL, Icon_NOICON); #endif MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); -- cgit v1.2.3