diff options
author | William Wilgus <wilgus.william@gmail.com> | 2022-12-17 03:27:21 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2022-12-17 04:24:37 -0500 |
commit | c85a4f1fa4062e69f8ad8d9f4a8d70fe8c32bb82 (patch) | |
tree | 5b3fad1b7db0925c44247840a1459ac430f4b6d5 /apps/menus | |
parent | ccf1aaa5bede11c95d219adbf6267426b57613d2 (diff) | |
download | rockbox-c85a4f1fa4062e69f8ad8d9f4a8d70fe8c32bb82.tar.gz rockbox-c85a4f1fa4062e69f8ad8d9f4a8d70fe8c32bb82.zip |
menus remove reserved 'param' parameter
-- missed the plugin menu --
Change-Id: Iac2c9b0b8212ab5f3ac2ef90e1ac2723d212f86c
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/display_menu.c | 24 | ||||
-rw-r--r-- | apps/menus/eq_menu.c | 15 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 23 | ||||
-rw-r--r-- | apps/menus/playlist_menu.c | 8 | ||||
-rw-r--r-- | apps/menus/plugin_menu.c | 15 | ||||
-rw-r--r-- | apps/menus/radio_menu.c | 25 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 40 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 28 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 56 | ||||
-rw-r--r-- | apps/menus/time_menu.c | 8 |
10 files changed, 117 insertions, 125 deletions
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, | |||
168 | selectivebacklight_callback); | 168 | selectivebacklight_callback); |
169 | 169 | ||
170 | MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS), | 170 | MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS), |
171 | selectivebacklight_set_mask, NULL, | 171 | selectivebacklight_set_mask, selectivebacklight_callback, |
172 | selectivebacklight_callback, Icon_Menu_setting); | 172 | Icon_Menu_setting); |
173 | 173 | ||
174 | MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE), | 174 | MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE), |
175 | NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask); | 175 | NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask); |
@@ -520,18 +520,17 @@ static bool history_interval(void) | |||
520 | INT, names, 4, NULL ); | 520 | INT, names, 4, NULL ); |
521 | } | 521 | } |
522 | 522 | ||
523 | MENUITEM_FUNCTION(histogram, 0, | 523 | MENUITEM_FUNCTION(histogram, 0, ID2P(LANG_HISTOGRAM_INTERVAL), |
524 | ID2P(LANG_HISTOGRAM_INTERVAL), | 524 | history_interval, NULL, Icon_Menu_setting); |
525 | history_interval, NULL, NULL, Icon_Menu_setting); | ||
526 | 525 | ||
527 | #endif | 526 | #endif |
528 | 527 | ||
529 | MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), | 528 | MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), |
530 | peak_meter_scale, NULL, NULL, Icon_NOICON); | 529 | peak_meter_scale, NULL, Icon_NOICON); |
531 | MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), | 530 | MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), |
532 | peak_meter_min, NULL, NULL, Icon_NOICON); | 531 | peak_meter_min, NULL, Icon_NOICON); |
533 | MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), | 532 | MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), |
534 | peak_meter_max, NULL, NULL, Icon_NOICON); | 533 | peak_meter_max, NULL, Icon_NOICON); |
535 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, | 534 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, |
536 | &peak_meter_release, &peak_meter_hold, | 535 | &peak_meter_release, &peak_meter_hold, |
537 | &peak_meter_clip_hold, | 536 | &peak_meter_clip_hold, |
@@ -575,10 +574,11 @@ static int line_padding_callback(int action, | |||
575 | 574 | ||
576 | MENUITEM_SETTING(touch_mode, &global_settings.touch_mode, touch_mode_callback); | 575 | MENUITEM_SETTING(touch_mode, &global_settings.touch_mode, touch_mode_callback); |
577 | 576 | ||
578 | MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, | 577 | MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, |
579 | NULL, NULL, Icon_NOICON); | 578 | ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, NULL, Icon_NOICON); |
580 | MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), reset_mapping, | 579 | MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, |
581 | NULL, NULL, Icon_NOICON); | 580 | ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), |
581 | reset_mapping, NULL, Icon_NOICON); | ||
582 | MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback); | 582 | MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback); |
583 | 583 | ||
584 | MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON, &list_line_padding, &touch_mode, | 584 | 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) | |||
222 | } | 222 | } |
223 | return 0; | 223 | return 0; |
224 | } | 224 | } |
225 | MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN), eq_do_simple_menu, | 225 | MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN), |
226 | NULL, NULL, Icon_Submenu); | 226 | eq_do_simple_menu, NULL, Icon_Submenu); |
227 | 227 | ||
228 | static void selection_to_banditem(int selection, int expanded_band, int *band, int *item) | 228 | static void selection_to_banditem(int selection, int expanded_band, int *band, int *item) |
229 | { | 229 | { |
@@ -426,7 +426,7 @@ static int eq_do_advanced_menu(void * param) | |||
426 | return 0; | 426 | return 0; |
427 | } | 427 | } |
428 | MENUITEM_FUNCTION(advanced_menu, 0, ID2P(LANG_EQUALIZER_ADVANCED), | 428 | MENUITEM_FUNCTION(advanced_menu, 0, ID2P(LANG_EQUALIZER_ADVANCED), |
429 | eq_do_advanced_menu, NULL, NULL, Icon_EQ); | 429 | eq_do_advanced_menu, NULL, Icon_EQ); |
430 | 430 | ||
431 | enum eq_slider_mode { | 431 | enum eq_slider_mode { |
432 | GAIN, | 432 | GAIN, |
@@ -783,13 +783,12 @@ static int eq_save_preset(void) | |||
783 | static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG }; | 783 | static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG }; |
784 | 784 | ||
785 | MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), | 785 | MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), |
786 | eq_menu_graphical, NULL, lowlatency_callback, | 786 | eq_menu_graphical, lowlatency_callback, Icon_EQ); |
787 | Icon_EQ); | ||
788 | MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), | 787 | MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), |
789 | eq_save_preset, NULL, NULL, Icon_NOICON); | 788 | eq_save_preset, NULL, Icon_NOICON); |
790 | MENUITEM_FUNCTION_W_PARAM(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), | 789 | MENUITEM_FUNCTION_W_PARAM(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), |
791 | browse_folder, (void*)&eqs, lowlatency_callback, | 790 | browse_folder, (void*)&eqs, |
792 | Icon_NOICON); | 791 | lowlatency_callback, Icon_NOICON); |
793 | 792 | ||
794 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, | 793 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, |
795 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, | 794 | &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) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | MENUITEM_FUNCTION_W_PARAM(browse_configs, 0, ID2P(LANG_CUSTOM_CFG), | 93 | MENUITEM_FUNCTION_W_PARAM(browse_configs, 0, ID2P(LANG_CUSTOM_CFG), |
94 | browse_folder, (void*)&config, NULL, Icon_NOICON); | 94 | browse_folder, (void*)&config, NULL, Icon_NOICON); |
95 | MENUITEM_FUNCTION_W_PARAM(save_settings_item, 0, ID2P(LANG_SAVE_SETTINGS), | 95 | MENUITEM_FUNCTION_W_PARAM(save_settings_item, 0, ID2P(LANG_SAVE_SETTINGS), |
96 | write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, Icon_NOICON); | 96 | write_settings_file, (void*)SETTINGS_SAVE_ALL, |
97 | NULL, Icon_NOICON); | ||
97 | MENUITEM_FUNCTION_W_PARAM(save_theme_item, 0, ID2P(LANG_SAVE_THEME), | 98 | MENUITEM_FUNCTION_W_PARAM(save_theme_item, 0, ID2P(LANG_SAVE_THEME), |
98 | write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, Icon_NOICON); | 99 | write_settings_file, (void*)SETTINGS_SAVE_THEME, |
100 | NULL, Icon_NOICON); | ||
99 | MENUITEM_FUNCTION_W_PARAM(save_sound_item, 0, ID2P(LANG_SAVE_SOUND), | 101 | MENUITEM_FUNCTION_W_PARAM(save_sound_item, 0, ID2P(LANG_SAVE_SOUND), |
100 | write_settings_file, (void*)SETTINGS_SAVE_SOUND, NULL, Icon_NOICON); | 102 | write_settings_file, (void*)SETTINGS_SAVE_SOUND, |
103 | NULL, Icon_NOICON); | ||
101 | MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET), | 104 | MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET), |
102 | reset_settings, NULL, NULL, Icon_NOICON); | 105 | reset_settings, NULL, Icon_NOICON); |
103 | 106 | ||
104 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, | 107 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, |
105 | &browse_configs, &reset_settings_item, | 108 | &browse_configs, &reset_settings_item, |
@@ -466,22 +469,22 @@ static int show_info(void) | |||
466 | 469 | ||
467 | 470 | ||
468 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO), | 471 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO), |
469 | show_info, NULL, NULL, Icon_NOICON); | 472 | show_info, NULL, Icon_NOICON); |
470 | 473 | ||
471 | #if CONFIG_RTC | 474 | #if CONFIG_RTC |
472 | int time_screen(void* ignored); | 475 | int time_screen(void* ignored); |
473 | MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), | 476 | MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), |
474 | time_screen, NULL, NULL, Icon_Menu_setting ); | 477 | time_screen, NULL, Icon_Menu_setting ); |
475 | #endif | 478 | #endif |
476 | 479 | ||
477 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), | 480 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), |
478 | show_credits, NULL, NULL, Icon_NOICON); | 481 | show_credits, NULL, Icon_NOICON); |
479 | 482 | ||
480 | MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), | 483 | MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), |
481 | view_runtime, NULL, NULL, Icon_NOICON); | 484 | view_runtime, NULL, Icon_NOICON); |
482 | 485 | ||
483 | MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), | 486 | MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), |
484 | debug_menu, NULL, NULL, Icon_NOICON); | 487 | debug_menu, NULL, Icon_NOICON); |
485 | 488 | ||
486 | MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, | 489 | MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, |
487 | &show_info_item, &show_credits_item, | 490 | &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) | |||
143 | return 0; | 143 | return 0; |
144 | } | 144 | } |
145 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), | 145 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), |
146 | create_playlist, NULL, NULL, Icon_NOICON); | 146 | create_playlist, NULL, Icon_NOICON); |
147 | MENUITEM_FUNCTION(view_cur_playlist, 0, | 147 | MENUITEM_FUNCTION(view_cur_playlist, 0, |
148 | ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | 148 | ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), |
149 | playlist_view_, NULL, NULL, Icon_NOICON); | 149 | playlist_view_, NULL, Icon_NOICON); |
150 | MENUITEM_FUNCTION_W_PARAM(save_playlist, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), | 150 | MENUITEM_FUNCTION_W_PARAM(save_playlist, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), |
151 | save_playlist_screen, NULL, NULL, Icon_NOICON); | 151 | save_playlist_screen, NULL, NULL, Icon_NOICON); |
152 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); | 152 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); |
153 | static int clear_catalog_directory(void) | 153 | static int clear_catalog_directory(void) |
154 | { | 154 | { |
@@ -158,7 +158,7 @@ static int clear_catalog_directory(void) | |||
158 | return false; | 158 | return false; |
159 | } | 159 | } |
160 | MENUITEM_FUNCTION(clear_catalog_directory_item, 0, ID2P(LANG_RESET_PLAYLISTCAT_DIR), | 160 | MENUITEM_FUNCTION(clear_catalog_directory_item, 0, ID2P(LANG_RESET_PLAYLISTCAT_DIR), |
161 | clear_catalog_directory, NULL, NULL, Icon_file_view_menu); | 161 | clear_catalog_directory, NULL, Icon_file_view_menu); |
162 | 162 | ||
163 | /* Playlist viewer settings submenu */ | 163 | /* Playlist viewer settings submenu */ |
164 | MENUITEM_SETTING(show_icons, &global_settings.playlist_viewer_icons, NULL); | 164 | 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, | |||
93 | return action; | 93 | return action; |
94 | } | 94 | } |
95 | 95 | ||
96 | #define ITEM_FLAG (MENU_FUNC_USEPARAM|MENU_FUNC_CHECK_RETVAL) | 96 | #define ITEM_FLAG (MENU_FUNC_CHECK_RETVAL) |
97 | |||
98 | MENUITEM_FUNCTION_W_PARAM(games_item, ITEM_FLAG, ID2P(LANG_PLUGIN_GAMES), | ||
99 | plugins_menu, (void*)GAMES, NULL, Icon_Folder); | ||
100 | MENUITEM_FUNCTION_W_PARAM(apps_item, ITEM_FLAG, ID2P(LANG_PLUGIN_APPS), | ||
101 | plugins_menu, (void*)APPS, NULL, Icon_Folder); | ||
102 | MENUITEM_FUNCTION_W_PARAM(demos_item, ITEM_FLAG, ID2P(LANG_PLUGIN_DEMOS), | ||
103 | plugins_menu, (void*)DEMOS, NULL, Icon_Folder); | ||
97 | 104 | ||
98 | MENUITEM_FUNCTION(games_item, ITEM_FLAG, ID2P(LANG_PLUGIN_GAMES), | ||
99 | plugins_menu, (void*)GAMES, NULL, Icon_Folder); | ||
100 | MENUITEM_FUNCTION(apps_item, ITEM_FLAG, ID2P(LANG_PLUGIN_APPS), | ||
101 | plugins_menu, (void*)APPS, NULL, Icon_Folder); | ||
102 | MENUITEM_FUNCTION(demos_item, ITEM_FLAG, ID2P(LANG_PLUGIN_DEMOS), | ||
103 | plugins_menu, (void*)DEMOS, NULL, Icon_Folder); | ||
104 | 105 | ||
105 | MAKE_MENU(plugin_menu, ID2P(LANG_PLUGINS), &menu_callback, | 106 | MAKE_MENU(plugin_menu, ID2P(LANG_PLUGINS), &menu_callback, |
106 | Icon_Plugin, | 107 | 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) | |||
52 | } | 52 | } |
53 | 53 | ||
54 | MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), | 54 | MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), |
55 | fm_recording_screen, NULL, NULL, Icon_Recording); | 55 | fm_recording_screen, NULL, Icon_Recording); |
56 | #endif /* defined(HAVE_FMRADIO_REC) */ | 56 | #endif /* defined(HAVE_FMRADIO_REC) */ |
57 | 57 | ||
58 | #if defined(HAVE_FMRADIO_REC) | 58 | #if defined(HAVE_FMRADIO_REC) |
@@ -65,25 +65,25 @@ static int fm_recording_settings(void) | |||
65 | } | 65 | } |
66 | 66 | ||
67 | MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), | 67 | MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), |
68 | fm_recording_settings, NULL, NULL, Icon_Recording); | 68 | fm_recording_settings, NULL, Icon_Recording); |
69 | #endif /* defined(HAVE_FMRADIO_REC) */ | 69 | #endif /* defined(HAVE_FMRADIO_REC) */ |
70 | #endif /* HAVE_RECORDING */ | 70 | #endif /* HAVE_RECORDING */ |
71 | 71 | ||
72 | #ifndef FM_PRESET | 72 | #ifndef FM_PRESET |
73 | MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_PRESET), | 73 | MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_PRESET), |
74 | handle_radio_presets, NULL, NULL, Icon_NOICON); | 74 | handle_radio_presets, NULL, Icon_NOICON); |
75 | #endif | 75 | #endif |
76 | #ifndef FM_PRESET_ADD | 76 | #ifndef FM_PRESET_ADD |
77 | MENUITEM_FUNCTION(radio_addpreset_item, 0, ID2P(LANG_FM_ADD_PRESET), | 77 | MENUITEM_FUNCTION(radio_addpreset_item, 0, ID2P(LANG_FM_ADD_PRESET), |
78 | handle_radio_add_preset, NULL, NULL, Icon_NOICON); | 78 | handle_radio_add_preset, NULL, Icon_NOICON); |
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | MENUITEM_FUNCTION(presetload_item, 0, ID2P(LANG_FM_PRESET_LOAD), | 81 | MENUITEM_FUNCTION(presetload_item, 0, ID2P(LANG_FM_PRESET_LOAD), |
82 | preset_list_load, NULL, NULL, Icon_NOICON); | 82 | preset_list_load, NULL, Icon_NOICON); |
83 | MENUITEM_FUNCTION(presetsave_item, 0, ID2P(LANG_FM_PRESET_SAVE), | 83 | MENUITEM_FUNCTION(presetsave_item, 0, ID2P(LANG_FM_PRESET_SAVE), |
84 | preset_list_save, NULL, NULL, Icon_NOICON); | 84 | preset_list_save, NULL, Icon_NOICON); |
85 | MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR), | 85 | MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR), |
86 | preset_list_clear, NULL, NULL, Icon_NOICON); | 86 | preset_list_clear, NULL, Icon_NOICON); |
87 | 87 | ||
88 | MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL); | 88 | MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL); |
89 | MENUITEM_SETTING(force_mono, &global_settings.fm_force_mono, NULL); | 89 | MENUITEM_SETTING(force_mono, &global_settings.fm_force_mono, NULL); |
@@ -120,15 +120,14 @@ static int toggle_radio_mode(void) | |||
120 | RADIO_PRESET_MODE : RADIO_SCAN_MODE; | 120 | RADIO_PRESET_MODE : RADIO_SCAN_MODE; |
121 | return 0; | 121 | return 0; |
122 | } | 122 | } |
123 | MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, | 123 | MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, toggle_radio_mode, |
124 | toggle_radio_mode, NULL, | 124 | get_mode_text, mode_speak_item, |
125 | get_mode_text, mode_speak_item, | 125 | NULL, NULL, Icon_NOICON); |
126 | NULL, NULL, Icon_NOICON); | ||
127 | #endif | 126 | #endif |
128 | 127 | ||
129 | MENUITEM_FUNCTION_W_PARAM(scan_presets_item, 0, | 128 | MENUITEM_FUNCTION_W_PARAM(scan_presets_item, 0, |
130 | ID2P(LANG_FM_SCAN_PRESETS), | 129 | ID2P(LANG_FM_SCAN_PRESETS), |
131 | presets_scan, NULL, NULL, Icon_NOICON); | 130 | presets_scan, NULL, NULL, Icon_NOICON); |
132 | 131 | ||
133 | MAKE_MENU(radio_settings_menu, ID2P(LANG_FM_MENU), NULL, | 132 | MAKE_MENU(radio_settings_menu, ID2P(LANG_FM_MENU), NULL, |
134 | Icon_Radio_screen, | 133 | 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) | |||
94 | &global_settings.rec_source, INT, names, | 94 | &global_settings.rec_source, INT, names, |
95 | n_opts, NULL ); | 95 | n_opts, NULL ); |
96 | } | 96 | } |
97 | MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), | 97 | MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), |
98 | recsource_func, NULL, recmenu_callback, Icon_Menu_setting); | 98 | recsource_func, recmenu_callback, Icon_Menu_setting); |
99 | 99 | ||
100 | /* Makes an options list from a source list of options and indexes */ | 100 | /* Makes an options list from a source list of options and indexes */ |
101 | static void make_options_from_indexes(const struct opt_items *src_names, | 101 | static void make_options_from_indexes(const struct opt_items *src_names, |
@@ -188,7 +188,7 @@ static int recfrequency_func(void) | |||
188 | return ret; | 188 | return ret; |
189 | } /* recfrequency */ | 189 | } /* recfrequency */ |
190 | MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_FREQUENCY), | 190 | MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_FREQUENCY), |
191 | recfrequency_func, NULL, NULL, Icon_Menu_setting); | 191 | recfrequency_func, NULL, Icon_Menu_setting); |
192 | 192 | ||
193 | 193 | ||
194 | static int recchannels_func(void) | 194 | static int recchannels_func(void) |
@@ -229,7 +229,7 @@ static int recchannels_func(void) | |||
229 | return ret; | 229 | return ret; |
230 | } | 230 | } |
231 | MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS), | 231 | MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS), |
232 | recchannels_func, NULL, NULL, Icon_Menu_setting); | 232 | recchannels_func, NULL, Icon_Menu_setting); |
233 | 233 | ||
234 | static int recmonomode_func(void) | 234 | static int recmonomode_func(void) |
235 | { | 235 | { |
@@ -249,7 +249,7 @@ static int recmonomode_func(void) | |||
249 | return ret; | 249 | return ret; |
250 | } | 250 | } |
251 | MENUITEM_FUNCTION(recmonomode, 0, ID2P(LANG_RECORDING_MONO_MODE), | 251 | MENUITEM_FUNCTION(recmonomode, 0, ID2P(LANG_RECORDING_MONO_MODE), |
252 | recmonomode_func, NULL, NULL, Icon_Menu_setting); | 252 | recmonomode_func, NULL, Icon_Menu_setting); |
253 | 253 | ||
254 | static int recformat_func(void) | 254 | static int recformat_func(void) |
255 | { | 255 | { |
@@ -273,11 +273,10 @@ static int recformat_func(void) | |||
273 | return res; | 273 | return res; |
274 | } /* recformat */ | 274 | } /* recformat */ |
275 | MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_FORMAT), | 275 | MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_FORMAT), |
276 | recformat_func, NULL, NULL, Icon_Menu_setting); | 276 | recformat_func, NULL, Icon_Menu_setting); |
277 | 277 | ||
278 | MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), | 278 | MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), |
279 | enc_global_config_menu, | 279 | enc_global_config_menu, NULL, Icon_Submenu); |
280 | NULL, NULL, Icon_Submenu); | ||
281 | 280 | ||
282 | static int recmenu_callback(int action, | 281 | static int recmenu_callback(int action, |
283 | const struct menu_item_ex *this_item, | 282 | const struct menu_item_ex *this_item, |
@@ -311,8 +310,8 @@ static int clear_rec_directory(void) | |||
311 | splash(HZ, ID2P(LANG_RESET_DONE_CLEAR)); | 310 | splash(HZ, ID2P(LANG_RESET_DONE_CLEAR)); |
312 | return false; | 311 | return false; |
313 | } | 312 | } |
314 | MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR), | 313 | MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR), |
315 | clear_rec_directory, NULL, NULL, Icon_Folder); | 314 | clear_rec_directory, NULL, Icon_Folder); |
316 | 315 | ||
317 | MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); | 316 | MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); |
318 | 317 | ||
@@ -350,10 +349,10 @@ static int agc_cliptime_func(void) | |||
350 | &global_settings.rec_agc_cliptime, | 349 | &global_settings.rec_agc_cliptime, |
351 | INT, names, 5, NULL ); | 350 | INT, names, 5, NULL ); |
352 | } | 351 | } |
353 | MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), | 352 | MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), |
354 | agc_preset_func, NULL, NULL, Icon_Menu_setting); | 353 | agc_preset_func, NULL, Icon_Menu_setting); |
355 | MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME), | 354 | MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME), |
356 | agc_cliptime_func, NULL, NULL, Icon_Menu_setting); | 355 | agc_cliptime_func, NULL, Icon_Menu_setting); |
357 | #endif /* HAVE_AGC */ | 356 | #endif /* HAVE_AGC */ |
358 | 357 | ||
359 | /** Rec trigger **/ | 358 | /** Rec trigger **/ |
@@ -571,18 +570,19 @@ int rectrigger(void) | |||
571 | settings_save(); | 570 | settings_save(); |
572 | return 0; | 571 | return 0; |
573 | } | 572 | } |
574 | MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), | 573 | MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), |
575 | rectrigger, NULL, NULL, Icon_Menu_setting); | 574 | rectrigger, NULL, Icon_Menu_setting); |
576 | 575 | ||
577 | static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG}; | 576 | static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG}; |
578 | MENUITEM_FUNCTION_W_PARAM(browse_recconfigs, 0, ID2P(LANG_CUSTOM_CFG), | 577 | MENUITEM_FUNCTION_W_PARAM(browse_recconfigs, 0, ID2P(LANG_CUSTOM_CFG), |
579 | browse_folder, (void*)&rec_config_browse, NULL, Icon_Config); | 578 | browse_folder, (void*)&rec_config_browse, |
579 | NULL, Icon_Config); | ||
580 | static int write_settings_file(void) | 580 | static int write_settings_file(void) |
581 | { | 581 | { |
582 | return settings_save_config(SETTINGS_SAVE_RECPRESETS); | 582 | return settings_save_config(SETTINGS_SAVE_RECPRESETS); |
583 | } | 583 | } |
584 | MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), | 584 | MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), |
585 | write_settings_file, NULL, NULL, Icon_Config); | 585 | write_settings_file, NULL, Icon_Config); |
586 | 586 | ||
587 | MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), | 587 | MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), |
588 | NULL, Icon_Recording, | 588 | 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); | |||
151 | #endif | 151 | #endif |
152 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); | 152 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); |
153 | MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), | 153 | MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), |
154 | (int(*)(void))tagcache_rebuild_with_splash, | 154 | (int(*)(void))tagcache_rebuild_with_splash, NULL, Icon_NOICON); |
155 | NULL, NULL, Icon_NOICON); | ||
156 | MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), | 155 | MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), |
157 | (int(*)(void))tagcache_update_with_splash, | 156 | (int(*)(void))tagcache_update_with_splash, NULL, Icon_NOICON); |
158 | NULL, NULL, Icon_NOICON); | ||
159 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); | 157 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); |
160 | 158 | ||
161 | MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), | 159 | MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), |
162 | tagtree_export, NULL, | 160 | tagtree_export, |
163 | NULL, Icon_NOICON); | 161 | NULL, Icon_NOICON); |
164 | 162 | ||
165 | MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), | 163 | MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), |
166 | tagtree_import, NULL, | 164 | tagtree_import, |
167 | NULL, Icon_NOICON); | 165 | NULL, Icon_NOICON); |
168 | MENUITEM_FUNCTION(tc_paths, 0, ID2P(LANG_SELECT_DATABASE_DIRS), | 166 | MENUITEM_FUNCTION(tc_paths, 0, ID2P(LANG_SELECT_DATABASE_DIRS), |
169 | dirs_to_scan, NULL, NULL, Icon_NOICON); | 167 | dirs_to_scan, NULL, Icon_NOICON); |
170 | 168 | ||
171 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, | 169 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, |
172 | #ifdef HAVE_TC_RAMCACHE | 170 | #ifdef HAVE_TC_RAMCACHE |
@@ -201,7 +199,7 @@ static int clear_start_directory(void) | |||
201 | return false; | 199 | return false; |
202 | } | 200 | } |
203 | MENUITEM_FUNCTION(clear_start_directory_item, 0, ID2P(LANG_RESET_START_DIR), | 201 | MENUITEM_FUNCTION(clear_start_directory_item, 0, ID2P(LANG_RESET_START_DIR), |
204 | clear_start_directory, NULL, NULL, Icon_file_view_menu); | 202 | clear_start_directory, NULL, Icon_file_view_menu); |
205 | static int fileview_callback(int action, | 203 | static int fileview_callback(int action, |
206 | const struct menu_item_ex *this_item, | 204 | const struct menu_item_ex *this_item, |
207 | struct gui_synclist *this_list) | 205 | struct gui_synclist *this_list) |
@@ -406,8 +404,8 @@ MENUITEM_SETTING(bt_selective_actions, | |||
406 | &global_settings.bt_selective_softlock_actions, | 404 | &global_settings.bt_selective_softlock_actions, |
407 | selectivesoftlock_callback); | 405 | selectivesoftlock_callback); |
408 | MENUITEM_FUNCTION(sel_softlock_mask, 0, ID2P(LANG_SETTINGS), | 406 | MENUITEM_FUNCTION(sel_softlock_mask, 0, ID2P(LANG_SETTINGS), |
409 | selectivesoftlock_set_mask, NULL, | 407 | selectivesoftlock_set_mask, selectivesoftlock_callback, |
410 | selectivesoftlock_callback, Icon_Menu_setting); | 408 | Icon_Menu_setting); |
411 | 409 | ||
412 | MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE), | 410 | MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE), |
413 | NULL, Icon_Menu_setting, &bt_selective_actions, &sel_softlock_mask); | 411 | NULL, Icon_Menu_setting, &bt_selective_actions, &sel_softlock_mask); |
@@ -572,7 +570,7 @@ static int sleeptimer_duration_cb(int action, | |||
572 | 570 | ||
573 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | 571 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); |
574 | MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | 572 | MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); |
575 | MENUITEM_FUNCTION_DYNTEXT(sleeptimer_toggle, 0, toggle_sleeptimer, NULL, | 573 | MENUITEM_FUNCTION_DYNTEXT(sleeptimer_toggle, 0, toggle_sleeptimer, |
576 | sleep_timer_getname, sleep_timer_voice, NULL, | 574 | sleep_timer_getname, sleep_timer_voice, NULL, |
577 | NULL, Icon_NOICON); | 575 | NULL, Icon_NOICON); |
578 | MENUITEM_SETTING(sleeptimer_duration, | 576 | MENUITEM_SETTING(sleeptimer_duration, |
@@ -762,7 +760,7 @@ static void wps_plugin_cb(void) | |||
762 | } | 760 | } |
763 | MENUITEM_FUNCTION(wps_set_context_plugin, 0, | 761 | MENUITEM_FUNCTION(wps_set_context_plugin, 0, |
764 | ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN), | 762 | ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN), |
765 | wps_plugin_cb, NULL, NULL, Icon_Plugin); | 763 | wps_plugin_cb, NULL, Icon_Plugin); |
766 | 764 | ||
767 | /* WPS_CONTEXT_PLUGIN */ | 765 | /* WPS_CONTEXT_PLUGIN */ |
768 | /***********************************/ | 766 | /***********************************/ |
@@ -785,7 +783,7 @@ MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, | |||
785 | static struct browse_folder_info langs = { LANG_DIR, SHOW_LNG }; | 783 | static struct browse_folder_info langs = { LANG_DIR, SHOW_LNG }; |
786 | 784 | ||
787 | MENUITEM_FUNCTION_W_PARAM(browse_langs, 0, ID2P(LANG_LANGUAGE), | 785 | MENUITEM_FUNCTION_W_PARAM(browse_langs, 0, ID2P(LANG_LANGUAGE), |
788 | browse_folder, (void*)&langs, NULL, Icon_Language); | 786 | browse_folder, (void*)&langs, NULL, Icon_Language); |
789 | 787 | ||
790 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | 788 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, |
791 | Icon_General_settings_menu, | 789 | 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) | |||
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
64 | MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), | 64 | MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), |
65 | clear_main_backdrop, NULL, NULL, Icon_NOICON); | 65 | clear_main_backdrop, NULL, Icon_NOICON); |
66 | #endif | 66 | #endif |
67 | #ifdef HAVE_LCD_COLOR | 67 | #ifdef HAVE_LCD_COLOR |
68 | 68 | ||
@@ -130,19 +130,19 @@ static int reset_color(void) | |||
130 | return 0; | 130 | return 0; |
131 | } | 131 | } |
132 | MENUITEM_FUNCTION_W_PARAM(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), | 132 | MENUITEM_FUNCTION_W_PARAM(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), |
133 | set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); | 133 | set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); |
134 | MENUITEM_FUNCTION_W_PARAM(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), | 134 | MENUITEM_FUNCTION_W_PARAM(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), |
135 | set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); | 135 | set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); |
136 | MENUITEM_FUNCTION_W_PARAM(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR), | 136 | MENUITEM_FUNCTION_W_PARAM(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR), |
137 | set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); | 137 | set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); |
138 | MENUITEM_FUNCTION_W_PARAM(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR), | 138 | MENUITEM_FUNCTION_W_PARAM(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR), |
139 | set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); | 139 | set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); |
140 | MENUITEM_FUNCTION_W_PARAM(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR), | 140 | MENUITEM_FUNCTION_W_PARAM(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR), |
141 | set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); | 141 | set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); |
142 | MENUITEM_FUNCTION_W_PARAM(set_sep_col, 0, ID2P(LANG_LIST_SEPARATOR_COLOR), | 142 | MENUITEM_FUNCTION_W_PARAM(set_sep_col, 0, ID2P(LANG_LIST_SEPARATOR_COLOR), |
143 | set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); | 143 | set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); |
144 | MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), | 144 | MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), |
145 | reset_color, NULL, NULL, Icon_NOICON); | 145 | reset_color, NULL, Icon_NOICON); |
146 | 146 | ||
147 | MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU), | 147 | MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU), |
148 | NULL, Icon_NOICON, | 148 | NULL, Icon_NOICON, |
@@ -323,32 +323,25 @@ int browse_folder(void *param) | |||
323 | return rockbox_browse(&browse); | 323 | return rockbox_browse(&browse); |
324 | } | 324 | } |
325 | 325 | ||
326 | MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, | 326 | MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, ID2P(LANG_CUSTOM_FONT), |
327 | ID2P(LANG_CUSTOM_FONT), | 327 | browse_folder, (void*)&fonts, NULL, Icon_Font); |
328 | browse_folder, (void*)&fonts, NULL, Icon_Font); | ||
329 | 328 | ||
330 | MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, | 329 | MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, ID2P(LANG_BASE_SKIN), |
331 | ID2P(LANG_BASE_SKIN), | 330 | browse_folder, (void*)&sbs, NULL, Icon_Wps); |
332 | browse_folder, (void*)&sbs, NULL, Icon_Wps); | ||
333 | #if CONFIG_TUNER | 331 | #if CONFIG_TUNER |
334 | MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, | 332 | MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, ID2P(LANG_RADIOSCREEN), |
335 | ID2P(LANG_RADIOSCREEN), | 333 | browse_folder, (void*)&fms, NULL, Icon_Wps); |
336 | browse_folder, (void*)&fms, NULL, Icon_Wps); | ||
337 | #endif | 334 | #endif |
338 | MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, | 335 | MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, ID2P(LANG_WHILE_PLAYING), |
339 | ID2P(LANG_WHILE_PLAYING), | 336 | browse_folder, (void*)&wps, NULL, Icon_Wps); |
340 | browse_folder, (void*)&wps, NULL, Icon_Wps); | ||
341 | #ifdef HAVE_REMOTE_LCD | 337 | #ifdef HAVE_REMOTE_LCD |
342 | MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, | 338 | MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, ID2P(LANG_REMOTE_WHILE_PLAYING), |
343 | ID2P(LANG_REMOTE_WHILE_PLAYING), | 339 | browse_folder, (void*)&rwps, NULL, Icon_Wps); |
344 | browse_folder, (void*)&rwps, NULL, Icon_Wps); | 340 | MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, ID2P(LANG_REMOTE_BASE_SKIN), |
345 | MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, | 341 | browse_folder, (void*)&rsbs, NULL, Icon_Wps); |
346 | ID2P(LANG_REMOTE_BASE_SKIN), | ||
347 | browse_folder, (void*)&rsbs, NULL, Icon_Wps); | ||
348 | #if CONFIG_TUNER | 342 | #if CONFIG_TUNER |
349 | MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, | 343 | MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, ID2P(LANG_REMOTE_RADIOSCREEN), |
350 | ID2P(LANG_REMOTE_RADIOSCREEN), | 344 | browse_folder, (void*)&rfms, NULL, Icon_Wps); |
351 | browse_folder, (void*)&rfms, NULL, Icon_Wps); | ||
352 | #endif | 345 | #endif |
353 | #endif | 346 | #endif |
354 | 347 | ||
@@ -373,9 +366,8 @@ static int showicons_callback(int action, | |||
373 | } | 366 | } |
374 | 367 | ||
375 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); | 368 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); |
376 | MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, | 369 | MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, ID2P(LANG_CUSTOM_THEME), |
377 | ID2P(LANG_CUSTOM_THEME), | 370 | browse_folder, (void*)&themes, NULL, Icon_Config); |
378 | browse_folder, (void*)&themes, NULL, Icon_Config); | ||
379 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); | 371 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); |
380 | #if LCD_DEPTH > 1 | 372 | #if LCD_DEPTH > 1 |
381 | MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); | 373 | 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) | |||
81 | return result; | 81 | return result; |
82 | } | 82 | } |
83 | 83 | ||
84 | MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), | 84 | MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), |
85 | timedate_set, NULL, NULL, Icon_NOICON); | 85 | timedate_set, NULL, Icon_NOICON); |
86 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); | 86 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); |
87 | #ifdef HAVE_RTC_ALARM | 87 | #ifdef HAVE_RTC_ALARM |
88 | MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), | 88 | MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), |
89 | alarm_screen, NULL, NULL, Icon_NOICON); | 89 | alarm_screen, NULL, Icon_NOICON); |
90 | #if CONFIG_TUNER || defined(HAVE_RECORDING) | 90 | #if CONFIG_TUNER || defined(HAVE_RECORDING) |
91 | 91 | ||
92 | #if CONFIG_TUNER && !defined(HAVE_RECORDING) | 92 | #if CONFIG_TUNER && !defined(HAVE_RECORDING) |
@@ -139,7 +139,7 @@ static int alarm_setting(void) | |||
139 | } | 139 | } |
140 | 140 | ||
141 | MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), | 141 | MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), |
142 | alarm_setting, NULL, alarm_callback, Icon_Menu_setting); | 142 | alarm_setting, alarm_callback, Icon_Menu_setting); |
143 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ | 143 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ |
144 | 144 | ||
145 | #endif /* HAVE_RTC_ALARM */ | 145 | #endif /* HAVE_RTC_ALARM */ |