From c85a4f1fa4062e69f8ad8d9f4a8d70fe8c32bb82 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sat, 17 Dec 2022 03:27:21 -0500 Subject: menus remove reserved 'param' parameter -- missed the plugin menu -- Change-Id: Iac2c9b0b8212ab5f3ac2ef90e1ac2723d212f86c --- apps/menus/display_menu.c | 24 +++++++++---------- apps/menus/eq_menu.c | 15 ++++++------ apps/menus/main_menu.c | 23 +++++++++++-------- apps/menus/playlist_menu.c | 8 +++---- apps/menus/plugin_menu.c | 15 ++++++------ apps/menus/radio_menu.c | 25 ++++++++++---------- apps/menus/recording_menu.c | 40 ++++++++++++++++---------------- apps/menus/settings_menu.c | 28 +++++++++++------------ apps/menus/theme_menu.c | 56 +++++++++++++++++++-------------------------- apps/menus/time_menu.c | 8 +++---- 10 files changed, 117 insertions(+), 125 deletions(-) (limited to 'apps/menus') diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index d7993fdbda..e70c4ee98a 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c @@ -168,8 +168,8 @@ MENUITEM_SETTING(bl_selective_actions, selectivebacklight_callback); MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS), - selectivebacklight_set_mask, NULL, - selectivebacklight_callback, Icon_Menu_setting); + selectivebacklight_set_mask, selectivebacklight_callback, + Icon_Menu_setting); MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE), NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask); @@ -520,18 +520,17 @@ static bool history_interval(void) INT, names, 4, NULL ); } -MENUITEM_FUNCTION(histogram, 0, - ID2P(LANG_HISTOGRAM_INTERVAL), - history_interval, NULL, NULL, Icon_Menu_setting); +MENUITEM_FUNCTION(histogram, 0, ID2P(LANG_HISTOGRAM_INTERVAL), + history_interval, NULL, Icon_Menu_setting); #endif MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), - peak_meter_scale, NULL, NULL, Icon_NOICON); + peak_meter_scale, NULL, Icon_NOICON); MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), - peak_meter_min, NULL, NULL, Icon_NOICON); + peak_meter_min, NULL, Icon_NOICON); MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), - peak_meter_max, NULL, NULL, Icon_NOICON); + peak_meter_max, 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, @@ -575,10 +574,11 @@ static int line_padding_callback(int action, MENUITEM_SETTING(touch_mode, &global_settings.touch_mode, touch_mode_callback); -MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), reset_mapping, - NULL, NULL, Icon_NOICON); +MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, + ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, NULL, Icon_NOICON); +MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, + ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), + reset_mapping, NULL, Icon_NOICON); MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback); MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON, &list_line_padding, &touch_mode, diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index b2baf8871d..59dcc59ff0 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c @@ -222,8 +222,8 @@ static int eq_do_simple_menu(void * param) } return 0; } -MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN), eq_do_simple_menu, - NULL, NULL, Icon_Submenu); +MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN), + eq_do_simple_menu, NULL, Icon_Submenu); static void selection_to_banditem(int selection, int expanded_band, int *band, int *item) { @@ -426,7 +426,7 @@ static int eq_do_advanced_menu(void * param) return 0; } MENUITEM_FUNCTION(advanced_menu, 0, ID2P(LANG_EQUALIZER_ADVANCED), - eq_do_advanced_menu, NULL, NULL, Icon_EQ); + eq_do_advanced_menu, NULL, Icon_EQ); enum eq_slider_mode { GAIN, @@ -783,13 +783,12 @@ static int eq_save_preset(void) static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG }; MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), - eq_menu_graphical, NULL, lowlatency_callback, - Icon_EQ); + eq_menu_graphical, lowlatency_callback, Icon_EQ); MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), - eq_save_preset, NULL, NULL, Icon_NOICON); + eq_save_preset, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), - browse_folder, (void*)&eqs, lowlatency_callback, - Icon_NOICON); + browse_folder, (void*)&eqs, + lowlatency_callback, Icon_NOICON); MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, &eq_enable, &eq_graphical, &eq_precut, &gain_menu, diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index ce174e1d90..a5a4ebc75a 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -91,15 +91,18 @@ static int write_settings_file(void* param) } MENUITEM_FUNCTION_W_PARAM(browse_configs, 0, ID2P(LANG_CUSTOM_CFG), - browse_folder, (void*)&config, NULL, Icon_NOICON); + browse_folder, (void*)&config, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(save_settings_item, 0, ID2P(LANG_SAVE_SETTINGS), - write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, Icon_NOICON); + write_settings_file, (void*)SETTINGS_SAVE_ALL, + NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(save_theme_item, 0, ID2P(LANG_SAVE_THEME), - write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, Icon_NOICON); + write_settings_file, (void*)SETTINGS_SAVE_THEME, + NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(save_sound_item, 0, ID2P(LANG_SAVE_SOUND), - write_settings_file, (void*)SETTINGS_SAVE_SOUND, NULL, Icon_NOICON); + write_settings_file, (void*)SETTINGS_SAVE_SOUND, + NULL, Icon_NOICON); MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET), - reset_settings, NULL, NULL, Icon_NOICON); + reset_settings, NULL, Icon_NOICON); MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, &browse_configs, &reset_settings_item, @@ -466,22 +469,22 @@ static int show_info(void) MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO), - show_info, NULL, NULL, Icon_NOICON); + show_info, NULL, Icon_NOICON); #if CONFIG_RTC int time_screen(void* ignored); MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), - time_screen, NULL, NULL, Icon_Menu_setting ); + time_screen, NULL, Icon_Menu_setting ); #endif MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), - show_credits, NULL, NULL, Icon_NOICON); + show_credits, NULL, Icon_NOICON); MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), - view_runtime, NULL, NULL, Icon_NOICON); + view_runtime, NULL, Icon_NOICON); MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), - debug_menu, NULL, NULL, Icon_NOICON); + debug_menu, NULL, Icon_NOICON); MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, &show_info_item, &show_credits_item, diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index fe19aa8d59..9db87aa7a5 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c @@ -143,12 +143,12 @@ static int playlist_view_(void) return 0; } MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), - create_playlist, NULL, NULL, Icon_NOICON); + create_playlist, NULL, Icon_NOICON); MENUITEM_FUNCTION(view_cur_playlist, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), - playlist_view_, NULL, NULL, Icon_NOICON); + playlist_view_, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(save_playlist, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), - save_playlist_screen, NULL, NULL, Icon_NOICON); + save_playlist_screen, NULL, NULL, Icon_NOICON); MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); static int clear_catalog_directory(void) { @@ -158,7 +158,7 @@ static int clear_catalog_directory(void) return false; } MENUITEM_FUNCTION(clear_catalog_directory_item, 0, ID2P(LANG_RESET_PLAYLISTCAT_DIR), - clear_catalog_directory, NULL, NULL, Icon_file_view_menu); + clear_catalog_directory, NULL, Icon_file_view_menu); /* Playlist viewer settings submenu */ MENUITEM_SETTING(show_icons, &global_settings.playlist_viewer_icons, NULL); diff --git a/apps/menus/plugin_menu.c b/apps/menus/plugin_menu.c index 7edfc7acc6..cbc1ce03f2 100644 --- a/apps/menus/plugin_menu.c +++ b/apps/menus/plugin_menu.c @@ -93,14 +93,15 @@ static int menu_callback(int action, return action; } -#define ITEM_FLAG (MENU_FUNC_USEPARAM|MENU_FUNC_CHECK_RETVAL) +#define ITEM_FLAG (MENU_FUNC_CHECK_RETVAL) + +MENUITEM_FUNCTION_W_PARAM(games_item, ITEM_FLAG, ID2P(LANG_PLUGIN_GAMES), + plugins_menu, (void*)GAMES, NULL, Icon_Folder); +MENUITEM_FUNCTION_W_PARAM(apps_item, ITEM_FLAG, ID2P(LANG_PLUGIN_APPS), + plugins_menu, (void*)APPS, NULL, Icon_Folder); +MENUITEM_FUNCTION_W_PARAM(demos_item, ITEM_FLAG, ID2P(LANG_PLUGIN_DEMOS), + plugins_menu, (void*)DEMOS, NULL, Icon_Folder); -MENUITEM_FUNCTION(games_item, ITEM_FLAG, ID2P(LANG_PLUGIN_GAMES), - plugins_menu, (void*)GAMES, NULL, Icon_Folder); -MENUITEM_FUNCTION(apps_item, ITEM_FLAG, ID2P(LANG_PLUGIN_APPS), - plugins_menu, (void*)APPS, NULL, Icon_Folder); -MENUITEM_FUNCTION(demos_item, ITEM_FLAG, ID2P(LANG_PLUGIN_DEMOS), - plugins_menu, (void*)DEMOS, NULL, Icon_Folder); MAKE_MENU(plugin_menu, ID2P(LANG_PLUGINS), &menu_callback, Icon_Plugin, diff --git a/apps/menus/radio_menu.c b/apps/menus/radio_menu.c index b0bdb98569..9fd25aa503 100644 --- a/apps/menus/radio_menu.c +++ b/apps/menus/radio_menu.c @@ -52,7 +52,7 @@ static int fm_recording_screen(void) } MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), - fm_recording_screen, NULL, NULL, Icon_Recording); + fm_recording_screen, NULL, Icon_Recording); #endif /* defined(HAVE_FMRADIO_REC) */ #if defined(HAVE_FMRADIO_REC) @@ -65,25 +65,25 @@ static int fm_recording_settings(void) } MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), - fm_recording_settings, NULL, NULL, Icon_Recording); + fm_recording_settings, NULL, Icon_Recording); #endif /* defined(HAVE_FMRADIO_REC) */ #endif /* HAVE_RECORDING */ #ifndef FM_PRESET MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_PRESET), - handle_radio_presets, NULL, NULL, Icon_NOICON); + handle_radio_presets, NULL, Icon_NOICON); #endif #ifndef FM_PRESET_ADD MENUITEM_FUNCTION(radio_addpreset_item, 0, ID2P(LANG_FM_ADD_PRESET), - handle_radio_add_preset, NULL, NULL, Icon_NOICON); + handle_radio_add_preset, NULL, Icon_NOICON); #endif MENUITEM_FUNCTION(presetload_item, 0, ID2P(LANG_FM_PRESET_LOAD), - preset_list_load, NULL, NULL, Icon_NOICON); + preset_list_load, NULL, Icon_NOICON); MENUITEM_FUNCTION(presetsave_item, 0, ID2P(LANG_FM_PRESET_SAVE), - preset_list_save, NULL, NULL, Icon_NOICON); + preset_list_save, NULL, Icon_NOICON); MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR), - preset_list_clear, NULL, NULL, Icon_NOICON); + preset_list_clear, NULL, Icon_NOICON); MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL); MENUITEM_SETTING(force_mono, &global_settings.fm_force_mono, NULL); @@ -120,15 +120,14 @@ static int toggle_radio_mode(void) RADIO_PRESET_MODE : RADIO_SCAN_MODE; return 0; } -MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, - toggle_radio_mode, NULL, - get_mode_text, mode_speak_item, - NULL, NULL, Icon_NOICON); +MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, toggle_radio_mode, + get_mode_text, mode_speak_item, + NULL, NULL, Icon_NOICON); #endif MENUITEM_FUNCTION_W_PARAM(scan_presets_item, 0, - ID2P(LANG_FM_SCAN_PRESETS), - presets_scan, NULL, NULL, Icon_NOICON); + ID2P(LANG_FM_SCAN_PRESETS), + presets_scan, NULL, NULL, Icon_NOICON); MAKE_MENU(radio_settings_menu, ID2P(LANG_FM_MENU), NULL, Icon_Radio_screen, diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index fc450c7921..5439c861f4 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c @@ -94,8 +94,8 @@ static int recsource_func(void) &global_settings.rec_source, INT, names, n_opts, NULL ); } -MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), - recsource_func, NULL, recmenu_callback, Icon_Menu_setting); +MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), + recsource_func, recmenu_callback, Icon_Menu_setting); /* Makes an options list from a source list of options and indexes */ static void make_options_from_indexes(const struct opt_items *src_names, @@ -188,7 +188,7 @@ static int recfrequency_func(void) return ret; } /* recfrequency */ MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_FREQUENCY), - recfrequency_func, NULL, NULL, Icon_Menu_setting); + recfrequency_func, NULL, Icon_Menu_setting); static int recchannels_func(void) @@ -229,7 +229,7 @@ static int recchannels_func(void) return ret; } MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS), - recchannels_func, NULL, NULL, Icon_Menu_setting); + recchannels_func, NULL, Icon_Menu_setting); static int recmonomode_func(void) { @@ -249,7 +249,7 @@ static int recmonomode_func(void) return ret; } MENUITEM_FUNCTION(recmonomode, 0, ID2P(LANG_RECORDING_MONO_MODE), - recmonomode_func, NULL, NULL, Icon_Menu_setting); + recmonomode_func, NULL, Icon_Menu_setting); static int recformat_func(void) { @@ -273,11 +273,10 @@ static int recformat_func(void) return res; } /* recformat */ MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_FORMAT), - recformat_func, NULL, NULL, Icon_Menu_setting); + recformat_func, NULL, Icon_Menu_setting); MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), - enc_global_config_menu, - NULL, NULL, Icon_Submenu); + enc_global_config_menu, NULL, Icon_Submenu); static int recmenu_callback(int action, const struct menu_item_ex *this_item, @@ -311,8 +310,8 @@ static int clear_rec_directory(void) splash(HZ, ID2P(LANG_RESET_DONE_CLEAR)); return false; } -MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR), - clear_rec_directory, NULL, NULL, Icon_Folder); +MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR), + clear_rec_directory, NULL, Icon_Folder); MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); @@ -350,10 +349,10 @@ static int agc_cliptime_func(void) &global_settings.rec_agc_cliptime, INT, names, 5, NULL ); } -MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), - agc_preset_func, NULL, NULL, Icon_Menu_setting); -MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME), - agc_cliptime_func, NULL, NULL, Icon_Menu_setting); +MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), + agc_preset_func, NULL, Icon_Menu_setting); +MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME), + agc_cliptime_func, NULL, Icon_Menu_setting); #endif /* HAVE_AGC */ /** Rec trigger **/ @@ -571,18 +570,19 @@ int rectrigger(void) settings_save(); return 0; } -MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), - rectrigger, NULL, NULL, Icon_Menu_setting); +MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), + rectrigger, NULL, Icon_Menu_setting); static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG}; -MENUITEM_FUNCTION_W_PARAM(browse_recconfigs, 0, ID2P(LANG_CUSTOM_CFG), - browse_folder, (void*)&rec_config_browse, NULL, Icon_Config); +MENUITEM_FUNCTION_W_PARAM(browse_recconfigs, 0, ID2P(LANG_CUSTOM_CFG), + browse_folder, (void*)&rec_config_browse, + NULL, Icon_Config); static int write_settings_file(void) { return settings_save_config(SETTINGS_SAVE_RECPRESETS); } -MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), - write_settings_file, NULL, NULL, Icon_Config); +MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), + write_settings_file, NULL, Icon_Config); MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), NULL, Icon_Recording, diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 0b7e55d95b..9d1314c269 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -151,22 +151,20 @@ MENUITEM_SETTING(tagcache_ram, &global_settings.tagcache_ram, NULL); #endif MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), - (int(*)(void))tagcache_rebuild_with_splash, - NULL, NULL, Icon_NOICON); + (int(*)(void))tagcache_rebuild_with_splash, NULL, Icon_NOICON); MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), - (int(*)(void))tagcache_update_with_splash, - NULL, NULL, Icon_NOICON); + (int(*)(void))tagcache_update_with_splash, NULL, Icon_NOICON); MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), - tagtree_export, NULL, - NULL, Icon_NOICON); + tagtree_export, + NULL, Icon_NOICON); MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), - tagtree_import, NULL, - NULL, Icon_NOICON); + tagtree_import, + NULL, Icon_NOICON); MENUITEM_FUNCTION(tc_paths, 0, ID2P(LANG_SELECT_DATABASE_DIRS), - dirs_to_scan, NULL, NULL, Icon_NOICON); + dirs_to_scan, NULL, Icon_NOICON); MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, #ifdef HAVE_TC_RAMCACHE @@ -201,7 +199,7 @@ static int clear_start_directory(void) return false; } MENUITEM_FUNCTION(clear_start_directory_item, 0, ID2P(LANG_RESET_START_DIR), - clear_start_directory, NULL, NULL, Icon_file_view_menu); + clear_start_directory, NULL, Icon_file_view_menu); static int fileview_callback(int action, const struct menu_item_ex *this_item, struct gui_synclist *this_list) @@ -406,8 +404,8 @@ MENUITEM_SETTING(bt_selective_actions, &global_settings.bt_selective_softlock_actions, selectivesoftlock_callback); MENUITEM_FUNCTION(sel_softlock_mask, 0, ID2P(LANG_SETTINGS), - selectivesoftlock_set_mask, NULL, - selectivesoftlock_callback, Icon_Menu_setting); + selectivesoftlock_set_mask, selectivesoftlock_callback, + Icon_Menu_setting); MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE), NULL, Icon_Menu_setting, &bt_selective_actions, &sel_softlock_mask); @@ -572,7 +570,7 @@ static int sleeptimer_duration_cb(int action, MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); -MENUITEM_FUNCTION_DYNTEXT(sleeptimer_toggle, 0, toggle_sleeptimer, NULL, +MENUITEM_FUNCTION_DYNTEXT(sleeptimer_toggle, 0, toggle_sleeptimer, sleep_timer_getname, sleep_timer_voice, NULL, NULL, Icon_NOICON); MENUITEM_SETTING(sleeptimer_duration, @@ -762,7 +760,7 @@ static void wps_plugin_cb(void) } MENUITEM_FUNCTION(wps_set_context_plugin, 0, ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN), - wps_plugin_cb, NULL, NULL, Icon_Plugin); + wps_plugin_cb, NULL, Icon_Plugin); /* WPS_CONTEXT_PLUGIN */ /***********************************/ @@ -785,7 +783,7 @@ MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, static struct browse_folder_info langs = { LANG_DIR, SHOW_LNG }; MENUITEM_FUNCTION_W_PARAM(browse_langs, 0, ID2P(LANG_LANGUAGE), - browse_folder, (void*)&langs, NULL, Icon_Language); + browse_folder, (void*)&langs, NULL, Icon_Language); MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, Icon_General_settings_menu, diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index de81169c66..60a2a27ef4 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c @@ -62,7 +62,7 @@ static int clear_main_backdrop(void) return 0; } MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), - clear_main_backdrop, NULL, NULL, Icon_NOICON); + clear_main_backdrop, NULL, Icon_NOICON); #endif #ifdef HAVE_LCD_COLOR @@ -130,19 +130,19 @@ static int reset_color(void) return 0; } MENUITEM_FUNCTION_W_PARAM(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), - set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), - set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR), - set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR), - set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR), - set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_sep_col, 0, ID2P(LANG_LIST_SEPARATOR_COLOR), - set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), - reset_color, NULL, NULL, Icon_NOICON); + reset_color, NULL, Icon_NOICON); MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU), NULL, Icon_NOICON, @@ -323,32 +323,25 @@ int browse_folder(void *param) return rockbox_browse(&browse); } -MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, - ID2P(LANG_CUSTOM_FONT), - browse_folder, (void*)&fonts, NULL, Icon_Font); +MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, ID2P(LANG_CUSTOM_FONT), + browse_folder, (void*)&fonts, NULL, Icon_Font); -MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, - ID2P(LANG_BASE_SKIN), - browse_folder, (void*)&sbs, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, ID2P(LANG_BASE_SKIN), + browse_folder, (void*)&sbs, NULL, Icon_Wps); #if CONFIG_TUNER -MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, - ID2P(LANG_RADIOSCREEN), - browse_folder, (void*)&fms, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, ID2P(LANG_RADIOSCREEN), + browse_folder, (void*)&fms, NULL, Icon_Wps); #endif -MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, - ID2P(LANG_WHILE_PLAYING), - browse_folder, (void*)&wps, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, ID2P(LANG_WHILE_PLAYING), + browse_folder, (void*)&wps, NULL, Icon_Wps); #ifdef HAVE_REMOTE_LCD -MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, - ID2P(LANG_REMOTE_WHILE_PLAYING), - browse_folder, (void*)&rwps, NULL, Icon_Wps); -MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, - ID2P(LANG_REMOTE_BASE_SKIN), - browse_folder, (void*)&rsbs, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, ID2P(LANG_REMOTE_WHILE_PLAYING), + browse_folder, (void*)&rwps, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, ID2P(LANG_REMOTE_BASE_SKIN), + browse_folder, (void*)&rsbs, NULL, Icon_Wps); #if CONFIG_TUNER -MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, - ID2P(LANG_REMOTE_RADIOSCREEN), - browse_folder, (void*)&rfms, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, ID2P(LANG_REMOTE_RADIOSCREEN), + browse_folder, (void*)&rfms, NULL, Icon_Wps); #endif #endif @@ -373,9 +366,8 @@ static int showicons_callback(int action, } MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); -MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, - ID2P(LANG_CUSTOM_THEME), - browse_folder, (void*)&themes, NULL, Icon_Config); +MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, ID2P(LANG_CUSTOM_THEME), + browse_folder, (void*)&themes, NULL, Icon_Config); MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); #if LCD_DEPTH > 1 MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index e37e2b5637..abf9c23cd0 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c @@ -81,12 +81,12 @@ static int timedate_set(void) return result; } -MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), - timedate_set, NULL, NULL, Icon_NOICON); +MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), + timedate_set, NULL, Icon_NOICON); MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); #ifdef HAVE_RTC_ALARM MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), - alarm_screen, NULL, NULL, Icon_NOICON); + alarm_screen, NULL, Icon_NOICON); #if CONFIG_TUNER || defined(HAVE_RECORDING) #if CONFIG_TUNER && !defined(HAVE_RECORDING) @@ -139,7 +139,7 @@ static int alarm_setting(void) } MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), - alarm_setting, NULL, alarm_callback, Icon_Menu_setting); + alarm_setting, alarm_callback, Icon_Menu_setting); #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ #endif /* HAVE_RTC_ALARM */ -- cgit v1.2.3