len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the exit_value variable.. set the MENU_FUNC_CHECK_RETVAL fla and

Browse source 
return 1 if you want your funciton to quit the menus.
save settings after clearing the background so it persists


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12827 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-03-18 07:03:43 +00:00
parent b5e587c081
commit e54d8e1388
9 changed files with 75 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/menu.c
View file

@ -556,7 +556,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
return_value = temp->function->function(); return_value = temp->function->function();
if (temp->flags&MENU_FUNC_CHECK_RETVAL) if (temp->flags&MENU_FUNC_CHECK_RETVAL)
{ {
if (return_value == temp->function->exit_value) if (return_value == 1)
{ {
done = true; done = true;
ret = return_value; ret = return_value;

14
apps/menu.h
View file

@ -46,7 +46,6 @@ struct menu_func {
int (*function)(void); int (*function)(void);
}; };
void *param; /* passed to function_w_param */ void *param; /* passed to function_w_param */
int exit_value; /* exit do_menu() if function returns this value */
}; };
#define MENU_TYPE_MASK 0xF /* MT_* type */ #define MENU_TYPE_MASK 0xF /* MT_* type */
@ -151,24 +150,23 @@ bool do_setting_from_menu(const struct menu_item_ex *temp);
/* Use this to put a function call into the menu. /* Use this to put a function call into the menu.
When the user selects this item the function will be run, When the user selects this item the function will be run,
unless MENU_FUNC_IGNORE_RETVAL is set, when it exits the user unless MENU_FUNC_IGNORE_RETVAL is set, the return value
will be back in the menu and return value is ignored, will be checked, returning 1 will exit do_menu(); */
else if it returns exit_if do_mneu() will exit */
#define MENUITEM_FUNCTION(name, flags, str, func, param, \ #define MENUITEM_FUNCTION(name, flags, str, func, param, \
exit_if, callback, icon) \ callback, icon) \
static const struct menu_callback_with_desc name##_ = {callback,str,icon}; \ static const struct menu_callback_with_desc name##_ = {callback,str,icon}; \
static const struct menu_func name##__ = {{(void*)func}, param, exit_if}; \ static const struct menu_func name##__ = {{(void*)func}, param}; \
/* should be const, but recording_settings wont let us do that */ \ /* should be const, but recording_settings wont let us do that */ \
const struct menu_item_ex name = \ const struct menu_item_ex name = \
{ MT_FUNCTION_CALL|MENU_HAS_DESC|flags, \ { MT_FUNCTION_CALL|MENU_HAS_DESC|flags, \
{ .function = & name##__}, {.callback_and_desc = & name##_}}; { .function = & name##__}, {.callback_and_desc = & name##_}};
/* As above, except the text is dynamic */ /* As above, except the text is dynamic */
#define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, param, exit_if, \ #define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, param, \
text_callback, text_cb_data, callback, icon) \ text_callback, text_cb_data, callback, icon) \
static const struct menu_get_name_and_icon name##_ \ static const struct menu_get_name_and_icon name##_ \
= {callback,text_callback,text_cb_data,icon}; \ = {callback,text_callback,text_cb_data,icon}; \
static const struct menu_func name##__ = {{(void*)func}, param, exit_if}; \ static const struct menu_func name##__ = {{(void*)func}, param}; \
static const struct menu_item_ex name = \ static const struct menu_item_ex name = \
{ MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \
{ .function = & name##__}, {.menu_get_name_and_icon = & name##_}}; { .function = & name##__}, {.menu_get_name_and_icon = & name##_}};

21
apps/menus/display_menu.c
View file

@ -124,6 +124,7 @@ static int clear_main_backdrop(void)
global_settings.backdrop_file[0]=0; global_settings.backdrop_file[0]=0;
unload_main_backdrop(); unload_main_backdrop();
show_main_backdrop(); show_main_backdrop();
settings_save();
return 0; return 0;
} }
@ -159,13 +160,13 @@ static int reset_color(void)
return 0; return 0;
} }
MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP),
clear_main_backdrop, NULL, 0, NULL, Icon_NOICON); clear_main_backdrop, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), MENUITEM_FUNCTION(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR),
set_bg_color, NULL, 0, NULL, Icon_NOICON); set_bg_color, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), MENUITEM_FUNCTION(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR),
set_fg_color, NULL, 0, NULL, Icon_NOICON); set_fg_color, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS),
reset_color, NULL, 0, NULL, Icon_NOICON); reset_color, NULL, NULL, Icon_NOICON);
#endif #endif
/* now the actual menu */ /* now the actual menu */
@ -498,11 +499,11 @@ static int peak_meter_max(void) {
return retval; return retval;
} }
MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE),
peak_meter_scale, NULL, 0, NULL, Icon_NOICON); peak_meter_scale, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN),
peak_meter_min, NULL, 0, NULL, Icon_NOICON); peak_meter_min, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX),
peak_meter_max, NULL, 0, NULL, Icon_NOICON); peak_meter_max, NULL, NULL, Icon_NOICON);
MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON,
&peak_meter_release, &peak_meter_hold, &peak_meter_release, &peak_meter_hold,
&peak_meter_clip_hold, &peak_meter_clip_hold,
@ -535,15 +536,15 @@ static int browse_folder(void *param)
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM,
ID2P(LANG_CUSTOM_FONT), ID2P(LANG_CUSTOM_FONT),
browse_folder, (void*)&fonts, 0, NULL, Icon_NOICON); browse_folder, (void*)&fonts, NULL, Icon_NOICON);
#endif #endif
MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM,
ID2P(LANG_WHILE_PLAYING), ID2P(LANG_WHILE_PLAYING),
browse_folder, (void*)&wps, 0, NULL, Icon_NOICON); browse_folder, (void*)&wps, NULL, Icon_NOICON);
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
MENUITEM_FUNCTION(browse_rwps, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION(browse_rwps, MENU_FUNC_USEPARAM,
ID2P(LANG_REMOTE_WHILE_PLAYING), ID2P(LANG_REMOTE_WHILE_PLAYING),
browse_folder, (void*)&rwps, 0, NULL, Icon_NOICON); browse_folder, (void*)&rwps, NULL, Icon_NOICON);
#endif #endif
MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL);

22
apps/menus/eq_menu.c
View file

@ -143,19 +143,19 @@ MENUITEM_SETTING(gain_3, &global_settings.eq_band3_gain, dsp_set_coefs_callback)
MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback); MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback);
MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM, do_option, (void*)&gain_0, MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM, do_option, (void*)&gain_0,
0, gainitem_get_name, &global_settings.eq_band0_cutoff, gainitem_get_name, &global_settings.eq_band0_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MENUITEM_FUNCTION_DYNTEXT(gain_item_1, MENU_FUNC_USEPARAM, do_option, (void*)&gain_1, MENUITEM_FUNCTION_DYNTEXT(gain_item_1, MENU_FUNC_USEPARAM, do_option, (void*)&gain_1,
0, gainitem_get_name, &global_settings.eq_band1_cutoff, gainitem_get_name, &global_settings.eq_band1_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MENUITEM_FUNCTION_DYNTEXT(gain_item_2, MENU_FUNC_USEPARAM, do_option, (void*)&gain_2, MENUITEM_FUNCTION_DYNTEXT(gain_item_2, MENU_FUNC_USEPARAM, do_option, (void*)&gain_2,
0, gainitem_get_name, &global_settings.eq_band2_cutoff, gainitem_get_name, &global_settings.eq_band2_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MENUITEM_FUNCTION_DYNTEXT(gain_item_3, MENU_FUNC_USEPARAM, do_option, (void*)&gain_3, MENUITEM_FUNCTION_DYNTEXT(gain_item_3, MENU_FUNC_USEPARAM, do_option, (void*)&gain_3,
0, gainitem_get_name, &global_settings.eq_band3_cutoff, gainitem_get_name, &global_settings.eq_band3_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MENUITEM_FUNCTION_DYNTEXT(gain_item_4, MENU_FUNC_USEPARAM, do_option, (void*)&gain_4, MENUITEM_FUNCTION_DYNTEXT(gain_item_4, MENU_FUNC_USEPARAM, do_option, (void*)&gain_4,
0, gainitem_get_name, &global_settings.eq_band4_cutoff, gainitem_get_name, &global_settings.eq_band4_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0, MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0,
@ -193,13 +193,13 @@ int do_center_band_menu(void* param)
MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL,
Icon_EQ, &cutoff_0, &q_0, &gain_0); Icon_EQ, &cutoff_0, &q_0, &gain_0);
MENUITEM_FUNCTION_DYNTEXT(band_1_menu, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION_DYNTEXT(band_1_menu, MENU_FUNC_USEPARAM,
do_center_band_menu, (void*)1, 0, do_center_band_menu, (void*)1,
centerband_get_name, (void*)1, NULL, Icon_EQ); centerband_get_name, (void*)1, NULL, Icon_EQ);
MENUITEM_FUNCTION_DYNTEXT(band_2_menu, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION_DYNTEXT(band_2_menu, MENU_FUNC_USEPARAM,
do_center_band_menu, (void*)2, 0, do_center_band_menu, (void*)2,
centerband_get_name, (void*)2, NULL, Icon_EQ); centerband_get_name, (void*)2, NULL, Icon_EQ);
MENUITEM_FUNCTION_DYNTEXT(band_3_menu, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION_DYNTEXT(band_3_menu, MENU_FUNC_USEPARAM,
do_center_band_menu, (void*)3, 0, do_center_band_menu, (void*)3,
centerband_get_name, (void*)3, NULL, Icon_EQ); centerband_get_name, (void*)3, NULL, Icon_EQ);
MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL,
Icon_EQ, &cutoff_4, &q_4, &gain_4); Icon_EQ, &cutoff_4, &q_4, &gain_4);
@ -629,12 +629,12 @@ bool eq_browse_presets(void)
MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL),
(int(*)(void))eq_menu_graphical, NULL, 0, NULL, (int(*)(void))eq_menu_graphical, NULL, NULL,
Icon_EQ); Icon_EQ);
MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE),
(int(*)(void))eq_save_preset, NULL, 0, NULL, Icon_NOICON); (int(*)(void))eq_save_preset, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), MENUITEM_FUNCTION(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE),
(int(*)(void))eq_browse_presets, NULL, 0, NULL, Icon_NOICON); (int(*)(void))eq_browse_presets, NULL, NULL, Icon_NOICON);
MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ,
&eq_enable, &eq_graphical, &eq_precut, &gain_menu, &eq_enable, &eq_graphical, &eq_precut, &gain_menu,

26
apps/menus/main_menu.c
View file

@ -96,13 +96,13 @@ static int write_settings_file(void* param)
} }
MENUITEM_FUNCTION(browse_configs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG), MENUITEM_FUNCTION(browse_configs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG),
browse_folder, (void*)&config, 0, NULL, Icon_NOICON); browse_folder, (void*)&config, NULL, Icon_NOICON);
MENUITEM_FUNCTION(save_settings_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_SETTINGS), MENUITEM_FUNCTION(save_settings_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_SETTINGS),
write_settings_file, (void*)SETTINGS_SAVE_ALL, 0, NULL, Icon_NOICON); write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(save_theme_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_THEME), MENUITEM_FUNCTION(save_theme_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_THEME),
write_settings_file, (void*)SETTINGS_SAVE_THEME, 0, NULL, Icon_NOICON); write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, Icon_NOICON);
MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET), MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET),
reset_settings, NULL, 0, NULL, Icon_NOICON); reset_settings, NULL, NULL, Icon_NOICON);
MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config,
&browse_configs, &reset_settings_item, &browse_configs, &reset_settings_item,
@ -341,7 +341,7 @@ static bool show_info(void)
return false; return false;
} }
MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU), MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU),
(menu_function)show_info, NULL, 0, NULL, Icon_NOICON); (menu_function)show_info, NULL, NULL, Icon_NOICON);
/* sleep Menu */ /* sleep Menu */
@ -374,22 +374,22 @@ static int sleep_timer(void)
} }
MENUITEM_FUNCTION(sleep_timer_call, 0, ID2P(LANG_SLEEP_TIMER), sleep_timer, MENUITEM_FUNCTION(sleep_timer_call, 0, ID2P(LANG_SLEEP_TIMER), sleep_timer,
NULL, 0, NULL, Icon_Menu_setting); /* make it look like a NULL, NULL, Icon_Menu_setting); /* make it look like a
setting to the user */ setting to the user */
MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_VERSION), MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_VERSION),
(menu_function)show_credits, NULL, 0, NULL, Icon_NOICON); (menu_function)show_credits, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME),
(menu_function)view_runtime, NULL, 0, NULL, Icon_NOICON); (menu_function)view_runtime, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG),
(menu_function)debug_menu, NULL, 0, NULL, Icon_NOICON); (menu_function)debug_menu, NULL, NULL, Icon_NOICON);
#ifdef SIMULATOR #ifdef SIMULATOR
MENUITEM_FUNCTION(simulate_usb_item, 0, ID2P(LANG_USB), MENUITEM_FUNCTION(simulate_usb_item, 0, ID2P(LANG_USB),
(menu_function)simulate_usb, NULL, 0, NULL, Icon_NOICON); (menu_function)simulate_usb, NULL, NULL, Icon_NOICON);
#ifdef ROCKBOX_HAS_LOGF #ifdef ROCKBOX_HAS_LOGF
MENUITEM_FUNCTION(logfdisplay_item, 0, "logf", MENUITEM_FUNCTION(logfdisplay_item, 0, "logf",
(int (*)(void)) logfdisplay, NULL, 0, NULL, Icon_NOICON); (int (*)(void)) logfdisplay, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(logfdump_item, 0, "logfdump", MENUITEM_FUNCTION(logfdump_item, 0, "logfdump",
(int (*)(void)) logfdump, NULL, 0, NULL, Icon_NOICON); (int (*)(void)) logfdump, NULL, NULL, Icon_NOICON);
#endif #endif
#endif #endif
@ -410,7 +410,7 @@ MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, Icon_Questionmark,
/* MAIN MENU */ /* MAIN MENU */
MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_THEME), MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_THEME),
browse_folder, (void*)&theme, 0, NULL, Icon_Folder); browse_folder, (void*)&theme, NULL, Icon_Folder);
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
int mainmenu_callback(int action,const struct menu_item_ex *this_item) int mainmenu_callback(int action,const struct menu_item_ex *this_item)

8
apps/menus/playlist_menu.c
View file

@ -63,15 +63,15 @@ int save_playlist_screen(struct playlist_info* playlist)
return 0; return 0;
} }
MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST),
(int(*)(void))create_playlist, NULL, 0, NULL, Icon_NOICON); (int(*)(void))create_playlist, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(view_playlist, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), MENUITEM_FUNCTION(view_playlist, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST),
(int(*)(void))playlist_viewer, NULL, 0, NULL, Icon_NOICON); (int(*)(void))playlist_viewer, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST),
(int(*)(void*))save_playlist_screen, (int(*)(void*))save_playlist_screen,
NULL, 0, NULL, Icon_NOICON); NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(catalog, 0, ID2P(LANG_CATALOG), MENUITEM_FUNCTION(catalog, 0, ID2P(LANG_CATALOG),
(int(*)(void))catalog_view_playlists, (int(*)(void))catalog_view_playlists,
NULL, 0, NULL, Icon_NOICON); NULL, NULL, Icon_NOICON);
MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL);
MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL); MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL);

20
apps/menus/recording_menu.c
View file

@ -91,7 +91,7 @@ static int recsource_func(void)
n_opts, NULL ); n_opts, NULL );
} }
MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE),
recsource_func, NULL, 0, recmenu_callback, Icon_Menu_setting); recsource_func, NULL, recmenu_callback, Icon_Menu_setting);
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
/* Makes an options list from a source list of options and indexes */ /* Makes an options list from a source list of options and indexes */
@ -206,7 +206,7 @@ static int recfrequency_func(void)
#endif /* CONFIG_CODEC == SWCODEC */ #endif /* CONFIG_CODEC == SWCODEC */
} /* recfrequency */ } /* recfrequency */
MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_RECORDING_FREQUENCY), MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_RECORDING_FREQUENCY),
recfrequency_func, NULL, 0, NULL, Icon_Menu_setting); recfrequency_func, NULL, NULL, Icon_Menu_setting);
static int recchannels_func(void) static int recchannels_func(void)
@ -254,7 +254,7 @@ static int recchannels_func(void)
#endif /* CONFIG_CODEC == SWCODEC */ #endif /* CONFIG_CODEC == SWCODEC */
} }
MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_RECORDING_CHANNELS), MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_RECORDING_CHANNELS),
recchannels_func, NULL, 0, NULL, Icon_Menu_setting); recchannels_func, NULL, NULL, Icon_Menu_setting);
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
@ -280,11 +280,11 @@ static int recformat_func(void)
return res; return res;
} /* recformat */ } /* recformat */
MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_RECORDING_FORMAT), MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_RECORDING_FORMAT),
recformat_func, NULL, 0, NULL, Icon_Menu_setting); recformat_func, NULL, NULL, Icon_Menu_setting);
MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS),
(int(*)(void))enc_global_config_menu, (int(*)(void))enc_global_config_menu,
NULL, 0, NULL, Icon_Submenu); NULL, NULL, Icon_Submenu);
#endif /* CONFIG_CODEC == SWCODEC */ #endif /* CONFIG_CODEC == SWCODEC */
@ -325,7 +325,7 @@ static int recdirectory_func(void)
names, 2, NULL ); names, 2, NULL );
} }
MENUITEM_FUNCTION(recdirectory, 0, ID2P(LANG_RECORD_DIRECTORY), MENUITEM_FUNCTION(recdirectory, 0, ID2P(LANG_RECORD_DIRECTORY),
recdirectory_func, NULL, 0, NULL, Icon_Menu_setting); recdirectory_func, NULL, NULL, Icon_Menu_setting);
MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL);
@ -364,9 +364,9 @@ static int agc_cliptime_func(void)
INT, names, 5, NULL ); INT, names, 5, NULL );
} }
MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORD_AGC_PRESET), MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORD_AGC_PRESET),
agc_preset_func, NULL, 0, NULL, Icon_Menu_setting); agc_preset_func, NULL, NULL, Icon_Menu_setting);
MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORD_AGC_CLIPTIME), MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORD_AGC_CLIPTIME),
agc_cliptime_func, NULL, 0, NULL, Icon_Menu_setting); agc_cliptime_func, NULL, NULL, Icon_Menu_setting);
#endif /* HAVE_AGC */ #endif /* HAVE_AGC */
/** Rec trigger **/ /** Rec trigger **/
@ -798,7 +798,7 @@ bool rectrigger(void)
} }
MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER),
(int(*)(void))rectrigger, NULL, 0, NULL, Icon_Menu_setting); (int(*)(void))rectrigger, NULL, NULL, Icon_Menu_setting);
@ -838,4 +838,4 @@ bool recording_menu(bool no_source)
}; };
MENUITEM_FUNCTION(recording_settings, MENU_FUNC_USEPARAM, ID2P(LANG_RECORDING_SETTINGS), MENUITEM_FUNCTION(recording_settings, MENU_FUNC_USEPARAM, ID2P(LANG_RECORDING_SETTINGS),
(int (*)(void*))recording_menu, 0, 0, NULL, Icon_NOICON); (int (*)(void*))recording_menu, 0, NULL, Icon_NOICON);

16
apps/menus/settings_menu.c
View file

@ -64,16 +64,16 @@ MENUITEM_SETTING(tagcache_ram, &global_settings.tagcache_ram, NULL);
MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL);
MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE),
(int(*)(void))tagcache_rebuild_with_splash, (int(*)(void))tagcache_rebuild_with_splash,
NULL, 0, NULL, Icon_NOICON); NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE),
(int(*)(void))tagcache_update_with_splash, (int(*)(void))tagcache_update_with_splash,
NULL, 0, NULL, Icon_NOICON); NULL, NULL, Icon_NOICON);
MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL);
MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT),
(int(*)(void))tagtree_export, NULL, 0, (int(*)(void))tagtree_export, NULL,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT),
(int(*)(void))tagtree_import, NULL, 0, (int(*)(void))tagtree_import, NULL,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON,
#ifdef HAVE_TC_RAMCACHE #ifdef HAVE_TC_RAMCACHE
@ -221,7 +221,7 @@ static int timedate_set(void)
} }
MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_TIME), MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_TIME),
timedate_set, NULL, 0, NULL, Icon_NOICON); timedate_set, NULL, NULL, Icon_NOICON);
MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL);
MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat); MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat);
#endif #endif
@ -231,7 +231,7 @@ MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL);
#ifdef HAVE_RTC_ALARM #ifdef HAVE_RTC_ALARM
MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU),
(menu_function)alarm_screen, NULL, 0, NULL, Icon_NOICON); (menu_function)alarm_screen, NULL, NULL, Icon_NOICON);
#if CONFIG_TUNER || defined(HAVE_RECORDING) #if CONFIG_TUNER || defined(HAVE_RECORDING)
#if CONFIG_TUNER && !defined(HAVE_RECORDING) #if CONFIG_TUNER && !defined(HAVE_RECORDING)
@ -281,7 +281,7 @@ static int alarm_setting(void)
} }
MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN),
alarm_setting, NULL, 0, alarm_callback, Icon_Menu_setting); alarm_setting, NULL, alarm_callback, Icon_Menu_setting);
#endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */
#endif /* HAVE_RTC_ALARM */ #endif /* HAVE_RTC_ALARM */
@ -415,7 +415,7 @@ static int language_browse(void)
return (int)rockbox_browse(LANG_DIR, SHOW_LNG); return (int)rockbox_browse(LANG_DIR, SHOW_LNG);
} }
MENUITEM_FUNCTION(browse_langs, 0, ID2P(LANG_LANGUAGE), language_browse, MENUITEM_FUNCTION(browse_langs, 0, ID2P(LANG_LANGUAGE), language_browse,
NULL, 0, NULL, Icon_Language); NULL, NULL, Icon_Language);
MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0,
Icon_General_settings_menu, Icon_General_settings_menu,

22
apps/recorder/radio.c
View file

@ -1225,10 +1225,10 @@ static int clear_preset_list(void)
MENUITEM_FUNCTION(radio_edit_preset_item, 0, MENUITEM_FUNCTION(radio_edit_preset_item, 0,
ID2P(LANG_FM_EDIT_PRESET), ID2P(LANG_FM_EDIT_PRESET),
radio_edit_preset, NULL, 0, NULL, Icon_NOICON); radio_edit_preset, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(radio_delete_preset_item, 0, MENUITEM_FUNCTION(radio_delete_preset_item, 0,
ID2P(LANG_FM_DELETE_PRESET), ID2P(LANG_FM_DELETE_PRESET),
radio_delete_preset, NULL, 0, NULL, Icon_NOICON); radio_delete_preset, NULL, NULL, Icon_NOICON);
int radio_preset_callback(int action, const struct menu_item_ex *this_item) int radio_preset_callback(int action, const struct menu_item_ex *this_item)
{ {
if (action == ACTION_STD_OK) if (action == ACTION_STD_OK)
@ -1348,7 +1348,7 @@ static int toggle_radio_mode(void)
return 0; return 0;
} }
MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0,
toggle_radio_mode, NULL, 0, toggle_radio_mode, NULL,
get_mode_text, NULL, NULL, Icon_NOICON); get_mode_text, NULL, NULL, Icon_NOICON);
#endif #endif
@ -1476,30 +1476,30 @@ static int fm_recording_settings(void)
#ifdef FM_RECORDING_SCREEN #ifdef FM_RECORDING_SCREEN
MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING_MENU), MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING_MENU),
fm_recording_screen, NULL, 0, NULL, Icon_NOICON); fm_recording_screen, NULL, NULL, Icon_NOICON);
#endif #endif
#ifdef FM_RECORDING_SETTINGS #ifdef FM_RECORDING_SETTINGS
MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS),
fm_recording_settings, NULL, 0, NULL, Icon_NOICON); fm_recording_settings, NULL, NULL, Icon_NOICON);
#endif #endif
#ifndef FM_PRESET #ifndef FM_PRESET
MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_FM_BUTTONBAR_PRESETS), MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_FM_BUTTONBAR_PRESETS),
handle_radio_presets, NULL, 0, NULL, Icon_NOICON); handle_radio_presets, NULL, NULL, Icon_NOICON);
#endif #endif
#ifndef FM_PRESET_ADD #ifndef FM_PRESET_ADD
MENUITEM_FUNCTION(radio_addpreset_item, 0, ID2P(LANG_FM_ADD_PRESET), MENUITEM_FUNCTION(radio_addpreset_item, 0, ID2P(LANG_FM_ADD_PRESET),
radio_add_preset, NULL, 0, NULL, Icon_NOICON); radio_add_preset, NULL, NULL, Icon_NOICON);
#endif #endif
MENUITEM_FUNCTION(presetload_item, 0, ID2P(LANG_FM_PRESET_LOAD), MENUITEM_FUNCTION(presetload_item, 0, ID2P(LANG_FM_PRESET_LOAD),
load_preset_list, NULL, 0, NULL, Icon_NOICON); load_preset_list, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(presetsave_item, 0, ID2P(LANG_FM_PRESET_SAVE), MENUITEM_FUNCTION(presetsave_item, 0, ID2P(LANG_FM_PRESET_SAVE),
save_preset_list, NULL, 0, NULL, Icon_NOICON); save_preset_list, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR), MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR),
clear_preset_list, NULL, 0, NULL, Icon_NOICON); clear_preset_list, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(scan_presets_item, 0, ID2P(LANG_FM_SCAN_PRESETS), MENUITEM_FUNCTION(scan_presets_item, 0, ID2P(LANG_FM_SCAN_PRESETS),
scan_presets, NULL, 0, NULL, Icon_NOICON); scan_presets, NULL, NULL, Icon_NOICON);
MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL, MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL,
Icon_Radio_screen, Icon_Radio_screen,