diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-18 07:03:43 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-18 07:03:43 +0000 |
commit | e54d8e1388fff7825fdd3ae40a04b1338b03ca81 (patch) | |
tree | e18b92ba8c2ab3489578aa12c4fa02ee21f372e1 /apps/menus | |
parent | b5e587c0811e670efaf19cd81c32e0035a276fdb (diff) | |
download | rockbox-e54d8e1388fff7825fdd3ae40a04b1338b03ca81.tar.gz rockbox-e54d8e1388fff7825fdd3ae40a04b1338b03ca81.zip |
Remove the exit_value variable.. set the MENU_FUNC_CHECK_RETVAL fla and
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
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/display_menu.c | 21 | ||||
-rw-r--r-- | apps/menus/eq_menu.c | 22 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 26 | ||||
-rw-r--r-- | apps/menus/playlist_menu.c | 8 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 20 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 16 |
6 files changed, 57 insertions, 56 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 3714950223..4cdb5b7fce 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -124,6 +124,7 @@ static int clear_main_backdrop(void) | |||
124 | global_settings.backdrop_file[0]=0; | 124 | global_settings.backdrop_file[0]=0; |
125 | unload_main_backdrop(); | 125 | unload_main_backdrop(); |
126 | show_main_backdrop(); | 126 | show_main_backdrop(); |
127 | settings_save(); | ||
127 | return 0; | 128 | return 0; |
128 | } | 129 | } |
129 | 130 | ||
@@ -159,13 +160,13 @@ static int reset_color(void) | |||
159 | return 0; | 160 | return 0; |
160 | } | 161 | } |
161 | MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), | 162 | MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), |
162 | clear_main_backdrop, NULL, 0, NULL, Icon_NOICON); | 163 | clear_main_backdrop, NULL, NULL, Icon_NOICON); |
163 | MENUITEM_FUNCTION(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), | 164 | MENUITEM_FUNCTION(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), |
164 | set_bg_color, NULL, 0, NULL, Icon_NOICON); | 165 | set_bg_color, NULL, NULL, Icon_NOICON); |
165 | MENUITEM_FUNCTION(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), | 166 | MENUITEM_FUNCTION(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), |
166 | set_fg_color, NULL, 0, NULL, Icon_NOICON); | 167 | set_fg_color, NULL, NULL, Icon_NOICON); |
167 | MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), | 168 | MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), |
168 | reset_color, NULL, 0, NULL, Icon_NOICON); | 169 | reset_color, NULL, NULL, Icon_NOICON); |
169 | #endif | 170 | #endif |
170 | 171 | ||
171 | /* now the actual menu */ | 172 | /* now the actual menu */ |
@@ -498,11 +499,11 @@ static int peak_meter_max(void) { | |||
498 | return retval; | 499 | return retval; |
499 | } | 500 | } |
500 | MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), | 501 | MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), |
501 | peak_meter_scale, NULL, 0, NULL, Icon_NOICON); | 502 | peak_meter_scale, NULL, NULL, Icon_NOICON); |
502 | MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), | 503 | MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), |
503 | peak_meter_min, NULL, 0, NULL, Icon_NOICON); | 504 | peak_meter_min, NULL, NULL, Icon_NOICON); |
504 | MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), | 505 | MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), |
505 | peak_meter_max, NULL, 0, NULL, Icon_NOICON); | 506 | peak_meter_max, NULL, NULL, Icon_NOICON); |
506 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, | 507 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, |
507 | &peak_meter_release, &peak_meter_hold, | 508 | &peak_meter_release, &peak_meter_hold, |
508 | &peak_meter_clip_hold, | 509 | &peak_meter_clip_hold, |
@@ -535,15 +536,15 @@ static int browse_folder(void *param) | |||
535 | #ifdef HAVE_LCD_BITMAP | 536 | #ifdef HAVE_LCD_BITMAP |
536 | MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, | 537 | MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, |
537 | ID2P(LANG_CUSTOM_FONT), | 538 | ID2P(LANG_CUSTOM_FONT), |
538 | browse_folder, (void*)&fonts, 0, NULL, Icon_NOICON); | 539 | browse_folder, (void*)&fonts, NULL, Icon_NOICON); |
539 | #endif | 540 | #endif |
540 | MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, | 541 | MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, |
541 | ID2P(LANG_WHILE_PLAYING), | 542 | ID2P(LANG_WHILE_PLAYING), |
542 | browse_folder, (void*)&wps, 0, NULL, Icon_NOICON); | 543 | browse_folder, (void*)&wps, NULL, Icon_NOICON); |
543 | #ifdef HAVE_REMOTE_LCD | 544 | #ifdef HAVE_REMOTE_LCD |
544 | MENUITEM_FUNCTION(browse_rwps, MENU_FUNC_USEPARAM, | 545 | MENUITEM_FUNCTION(browse_rwps, MENU_FUNC_USEPARAM, |
545 | ID2P(LANG_REMOTE_WHILE_PLAYING), | 546 | ID2P(LANG_REMOTE_WHILE_PLAYING), |
546 | browse_folder, (void*)&rwps, 0, NULL, Icon_NOICON); | 547 | browse_folder, (void*)&rwps, NULL, Icon_NOICON); |
547 | #endif | 548 | #endif |
548 | 549 | ||
549 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); | 550 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); |
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index f2c1f9b22d..58d86782b0 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c | |||
@@ -143,19 +143,19 @@ MENUITEM_SETTING(gain_3, &global_settings.eq_band3_gain, dsp_set_coefs_callback) | |||
143 | MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback); | 143 | MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback); |
144 | 144 | ||
145 | MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM, do_option, (void*)&gain_0, | 145 | MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM, do_option, (void*)&gain_0, |
146 | 0, gainitem_get_name, &global_settings.eq_band0_cutoff, | 146 | gainitem_get_name, &global_settings.eq_band0_cutoff, |
147 | NULL, Icon_NOICON); | 147 | NULL, Icon_NOICON); |
148 | MENUITEM_FUNCTION_DYNTEXT(gain_item_1, MENU_FUNC_USEPARAM, do_option, (void*)&gain_1, | 148 | MENUITEM_FUNCTION_DYNTEXT(gain_item_1, MENU_FUNC_USEPARAM, do_option, (void*)&gain_1, |
149 | 0, gainitem_get_name, &global_settings.eq_band1_cutoff, | 149 | gainitem_get_name, &global_settings.eq_band1_cutoff, |
150 | NULL, Icon_NOICON); | 150 | NULL, Icon_NOICON); |
151 | MENUITEM_FUNCTION_DYNTEXT(gain_item_2, MENU_FUNC_USEPARAM, do_option, (void*)&gain_2, | 151 | MENUITEM_FUNCTION_DYNTEXT(gain_item_2, MENU_FUNC_USEPARAM, do_option, (void*)&gain_2, |
152 | 0, gainitem_get_name, &global_settings.eq_band2_cutoff, | 152 | gainitem_get_name, &global_settings.eq_band2_cutoff, |
153 | NULL, Icon_NOICON); | 153 | NULL, Icon_NOICON); |
154 | MENUITEM_FUNCTION_DYNTEXT(gain_item_3, MENU_FUNC_USEPARAM, do_option, (void*)&gain_3, | 154 | MENUITEM_FUNCTION_DYNTEXT(gain_item_3, MENU_FUNC_USEPARAM, do_option, (void*)&gain_3, |
155 | 0, gainitem_get_name, &global_settings.eq_band3_cutoff, | 155 | gainitem_get_name, &global_settings.eq_band3_cutoff, |
156 | NULL, Icon_NOICON); | 156 | NULL, Icon_NOICON); |
157 | MENUITEM_FUNCTION_DYNTEXT(gain_item_4, MENU_FUNC_USEPARAM, do_option, (void*)&gain_4, | 157 | MENUITEM_FUNCTION_DYNTEXT(gain_item_4, MENU_FUNC_USEPARAM, do_option, (void*)&gain_4, |
158 | 0, gainitem_get_name, &global_settings.eq_band4_cutoff, | 158 | gainitem_get_name, &global_settings.eq_band4_cutoff, |
159 | NULL, Icon_NOICON); | 159 | NULL, Icon_NOICON); |
160 | 160 | ||
161 | MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0, | 161 | 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) | |||
193 | MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, | 193 | MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, |
194 | Icon_EQ, &cutoff_0, &q_0, &gain_0); | 194 | Icon_EQ, &cutoff_0, &q_0, &gain_0); |
195 | MENUITEM_FUNCTION_DYNTEXT(band_1_menu, MENU_FUNC_USEPARAM, | 195 | MENUITEM_FUNCTION_DYNTEXT(band_1_menu, MENU_FUNC_USEPARAM, |
196 | do_center_band_menu, (void*)1, 0, | 196 | do_center_band_menu, (void*)1, |
197 | centerband_get_name, (void*)1, NULL, Icon_EQ); | 197 | centerband_get_name, (void*)1, NULL, Icon_EQ); |
198 | MENUITEM_FUNCTION_DYNTEXT(band_2_menu, MENU_FUNC_USEPARAM, | 198 | MENUITEM_FUNCTION_DYNTEXT(band_2_menu, MENU_FUNC_USEPARAM, |
199 | do_center_band_menu, (void*)2, 0, | 199 | do_center_band_menu, (void*)2, |
200 | centerband_get_name, (void*)2, NULL, Icon_EQ); | 200 | centerband_get_name, (void*)2, NULL, Icon_EQ); |
201 | MENUITEM_FUNCTION_DYNTEXT(band_3_menu, MENU_FUNC_USEPARAM, | 201 | MENUITEM_FUNCTION_DYNTEXT(band_3_menu, MENU_FUNC_USEPARAM, |
202 | do_center_band_menu, (void*)3, 0, | 202 | do_center_band_menu, (void*)3, |
203 | centerband_get_name, (void*)3, NULL, Icon_EQ); | 203 | centerband_get_name, (void*)3, NULL, Icon_EQ); |
204 | MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, | 204 | MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, |
205 | Icon_EQ, &cutoff_4, &q_4, &gain_4); | 205 | Icon_EQ, &cutoff_4, &q_4, &gain_4); |
@@ -629,12 +629,12 @@ bool eq_browse_presets(void) | |||
629 | 629 | ||
630 | 630 | ||
631 | MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), | 631 | MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), |
632 | (int(*)(void))eq_menu_graphical, NULL, 0, NULL, | 632 | (int(*)(void))eq_menu_graphical, NULL, NULL, |
633 | Icon_EQ); | 633 | Icon_EQ); |
634 | MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), | 634 | MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), |
635 | (int(*)(void))eq_save_preset, NULL, 0, NULL, Icon_NOICON); | 635 | (int(*)(void))eq_save_preset, NULL, NULL, Icon_NOICON); |
636 | MENUITEM_FUNCTION(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), | 636 | MENUITEM_FUNCTION(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), |
637 | (int(*)(void))eq_browse_presets, NULL, 0, NULL, Icon_NOICON); | 637 | (int(*)(void))eq_browse_presets, NULL, NULL, Icon_NOICON); |
638 | 638 | ||
639 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, | 639 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, |
640 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, | 640 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, |
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index b91b2f5553..fe6787ae25 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -96,13 +96,13 @@ static int write_settings_file(void* param) | |||
96 | } | 96 | } |
97 | 97 | ||
98 | MENUITEM_FUNCTION(browse_configs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG), | 98 | MENUITEM_FUNCTION(browse_configs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG), |
99 | browse_folder, (void*)&config, 0, NULL, Icon_NOICON); | 99 | browse_folder, (void*)&config, NULL, Icon_NOICON); |
100 | MENUITEM_FUNCTION(save_settings_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_SETTINGS), | 100 | MENUITEM_FUNCTION(save_settings_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_SETTINGS), |
101 | write_settings_file, (void*)SETTINGS_SAVE_ALL, 0, NULL, Icon_NOICON); | 101 | write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, Icon_NOICON); |
102 | MENUITEM_FUNCTION(save_theme_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_THEME), | 102 | MENUITEM_FUNCTION(save_theme_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_THEME), |
103 | write_settings_file, (void*)SETTINGS_SAVE_THEME, 0, NULL, Icon_NOICON); | 103 | write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, Icon_NOICON); |
104 | MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET), | 104 | MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET), |
105 | reset_settings, NULL, 0, NULL, Icon_NOICON); | 105 | reset_settings, NULL, NULL, Icon_NOICON); |
106 | 106 | ||
107 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, | 107 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, |
108 | &browse_configs, &reset_settings_item, | 108 | &browse_configs, &reset_settings_item, |
@@ -341,7 +341,7 @@ static bool show_info(void) | |||
341 | return false; | 341 | return false; |
342 | } | 342 | } |
343 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU), | 343 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU), |
344 | (menu_function)show_info, NULL, 0, NULL, Icon_NOICON); | 344 | (menu_function)show_info, NULL, NULL, Icon_NOICON); |
345 | 345 | ||
346 | 346 | ||
347 | /* sleep Menu */ | 347 | /* sleep Menu */ |
@@ -374,22 +374,22 @@ static int sleep_timer(void) | |||
374 | } | 374 | } |
375 | 375 | ||
376 | MENUITEM_FUNCTION(sleep_timer_call, 0, ID2P(LANG_SLEEP_TIMER), sleep_timer, | 376 | MENUITEM_FUNCTION(sleep_timer_call, 0, ID2P(LANG_SLEEP_TIMER), sleep_timer, |
377 | NULL, 0, NULL, Icon_Menu_setting); /* make it look like a | 377 | NULL, NULL, Icon_Menu_setting); /* make it look like a |
378 | setting to the user */ | 378 | setting to the user */ |
379 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_VERSION), | 379 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_VERSION), |
380 | (menu_function)show_credits, NULL, 0, NULL, Icon_NOICON); | 380 | (menu_function)show_credits, NULL, NULL, Icon_NOICON); |
381 | MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), | 381 | MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), |
382 | (menu_function)view_runtime, NULL, 0, NULL, Icon_NOICON); | 382 | (menu_function)view_runtime, NULL, NULL, Icon_NOICON); |
383 | MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), | 383 | MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), |
384 | (menu_function)debug_menu, NULL, 0, NULL, Icon_NOICON); | 384 | (menu_function)debug_menu, NULL, NULL, Icon_NOICON); |
385 | #ifdef SIMULATOR | 385 | #ifdef SIMULATOR |
386 | MENUITEM_FUNCTION(simulate_usb_item, 0, ID2P(LANG_USB), | 386 | MENUITEM_FUNCTION(simulate_usb_item, 0, ID2P(LANG_USB), |
387 | (menu_function)simulate_usb, NULL, 0, NULL, Icon_NOICON); | 387 | (menu_function)simulate_usb, NULL, NULL, Icon_NOICON); |
388 | #ifdef ROCKBOX_HAS_LOGF | 388 | #ifdef ROCKBOX_HAS_LOGF |
389 | MENUITEM_FUNCTION(logfdisplay_item, 0, "logf", | 389 | MENUITEM_FUNCTION(logfdisplay_item, 0, "logf", |
390 | (int (*)(void)) logfdisplay, NULL, 0, NULL, Icon_NOICON); | 390 | (int (*)(void)) logfdisplay, NULL, NULL, Icon_NOICON); |
391 | MENUITEM_FUNCTION(logfdump_item, 0, "logfdump", | 391 | MENUITEM_FUNCTION(logfdump_item, 0, "logfdump", |
392 | (int (*)(void)) logfdump, NULL, 0, NULL, Icon_NOICON); | 392 | (int (*)(void)) logfdump, NULL, NULL, Icon_NOICON); |
393 | #endif | 393 | #endif |
394 | #endif | 394 | #endif |
395 | 395 | ||
@@ -410,7 +410,7 @@ MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, Icon_Questionmark, | |||
410 | /* MAIN MENU */ | 410 | /* MAIN MENU */ |
411 | 411 | ||
412 | MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_THEME), | 412 | MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_THEME), |
413 | browse_folder, (void*)&theme, 0, NULL, Icon_Folder); | 413 | browse_folder, (void*)&theme, NULL, Icon_Folder); |
414 | 414 | ||
415 | #ifdef HAVE_LCD_CHARCELLS | 415 | #ifdef HAVE_LCD_CHARCELLS |
416 | int mainmenu_callback(int action,const struct menu_item_ex *this_item) | 416 | int mainmenu_callback(int action,const struct menu_item_ex *this_item) |
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index b73341c1d9..4f4b7c9839 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c | |||
@@ -63,15 +63,15 @@ int save_playlist_screen(struct playlist_info* playlist) | |||
63 | return 0; | 63 | return 0; |
64 | } | 64 | } |
65 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), | 65 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), |
66 | (int(*)(void))create_playlist, NULL, 0, NULL, Icon_NOICON); | 66 | (int(*)(void))create_playlist, NULL, NULL, Icon_NOICON); |
67 | MENUITEM_FUNCTION(view_playlist, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | 67 | MENUITEM_FUNCTION(view_playlist, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), |
68 | (int(*)(void))playlist_viewer, NULL, 0, NULL, Icon_NOICON); | 68 | (int(*)(void))playlist_viewer, NULL, NULL, Icon_NOICON); |
69 | MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), | 69 | MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), |
70 | (int(*)(void*))save_playlist_screen, | 70 | (int(*)(void*))save_playlist_screen, |
71 | NULL, 0, NULL, Icon_NOICON); | 71 | NULL, NULL, Icon_NOICON); |
72 | MENUITEM_FUNCTION(catalog, 0, ID2P(LANG_CATALOG), | 72 | MENUITEM_FUNCTION(catalog, 0, ID2P(LANG_CATALOG), |
73 | (int(*)(void))catalog_view_playlists, | 73 | (int(*)(void))catalog_view_playlists, |
74 | NULL, 0, NULL, Icon_NOICON); | 74 | NULL, NULL, Icon_NOICON); |
75 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); | 75 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); |
76 | MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL); | 76 | MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL); |
77 | 77 | ||
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 43bd8a781f..084ade0d33 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -91,7 +91,7 @@ static int recsource_func(void) | |||
91 | n_opts, NULL ); | 91 | n_opts, NULL ); |
92 | } | 92 | } |
93 | MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), | 93 | MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), |
94 | recsource_func, NULL, 0, recmenu_callback, Icon_Menu_setting); | 94 | recsource_func, NULL, recmenu_callback, Icon_Menu_setting); |
95 | 95 | ||
96 | #if CONFIG_CODEC == SWCODEC | 96 | #if CONFIG_CODEC == SWCODEC |
97 | /* Makes an options list from a source list of options and indexes */ | 97 | /* Makes an options list from a source list of options and indexes */ |
@@ -206,7 +206,7 @@ static int recfrequency_func(void) | |||
206 | #endif /* CONFIG_CODEC == SWCODEC */ | 206 | #endif /* CONFIG_CODEC == SWCODEC */ |
207 | } /* recfrequency */ | 207 | } /* recfrequency */ |
208 | MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_RECORDING_FREQUENCY), | 208 | MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_RECORDING_FREQUENCY), |
209 | recfrequency_func, NULL, 0, NULL, Icon_Menu_setting); | 209 | recfrequency_func, NULL, NULL, Icon_Menu_setting); |
210 | 210 | ||
211 | 211 | ||
212 | static int recchannels_func(void) | 212 | static int recchannels_func(void) |
@@ -254,7 +254,7 @@ static int recchannels_func(void) | |||
254 | #endif /* CONFIG_CODEC == SWCODEC */ | 254 | #endif /* CONFIG_CODEC == SWCODEC */ |
255 | } | 255 | } |
256 | MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_RECORDING_CHANNELS), | 256 | MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_RECORDING_CHANNELS), |
257 | recchannels_func, NULL, 0, NULL, Icon_Menu_setting); | 257 | recchannels_func, NULL, NULL, Icon_Menu_setting); |
258 | 258 | ||
259 | #if CONFIG_CODEC == SWCODEC | 259 | #if CONFIG_CODEC == SWCODEC |
260 | 260 | ||
@@ -280,11 +280,11 @@ static int recformat_func(void) | |||
280 | return res; | 280 | return res; |
281 | } /* recformat */ | 281 | } /* recformat */ |
282 | MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_RECORDING_FORMAT), | 282 | MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_RECORDING_FORMAT), |
283 | recformat_func, NULL, 0, NULL, Icon_Menu_setting); | 283 | recformat_func, NULL, NULL, Icon_Menu_setting); |
284 | 284 | ||
285 | MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), | 285 | MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), |
286 | (int(*)(void))enc_global_config_menu, | 286 | (int(*)(void))enc_global_config_menu, |
287 | NULL, 0, NULL, Icon_Submenu); | 287 | NULL, NULL, Icon_Submenu); |
288 | 288 | ||
289 | #endif /* CONFIG_CODEC == SWCODEC */ | 289 | #endif /* CONFIG_CODEC == SWCODEC */ |
290 | 290 | ||
@@ -325,7 +325,7 @@ static int recdirectory_func(void) | |||
325 | names, 2, NULL ); | 325 | names, 2, NULL ); |
326 | } | 326 | } |
327 | MENUITEM_FUNCTION(recdirectory, 0, ID2P(LANG_RECORD_DIRECTORY), | 327 | MENUITEM_FUNCTION(recdirectory, 0, ID2P(LANG_RECORD_DIRECTORY), |
328 | recdirectory_func, NULL, 0, NULL, Icon_Menu_setting); | 328 | recdirectory_func, NULL, NULL, Icon_Menu_setting); |
329 | 329 | ||
330 | MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); | 330 | MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); |
331 | 331 | ||
@@ -364,9 +364,9 @@ static int agc_cliptime_func(void) | |||
364 | INT, names, 5, NULL ); | 364 | INT, names, 5, NULL ); |
365 | } | 365 | } |
366 | MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORD_AGC_PRESET), | 366 | MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORD_AGC_PRESET), |
367 | agc_preset_func, NULL, 0, NULL, Icon_Menu_setting); | 367 | agc_preset_func, NULL, NULL, Icon_Menu_setting); |
368 | MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORD_AGC_CLIPTIME), | 368 | MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORD_AGC_CLIPTIME), |
369 | agc_cliptime_func, NULL, 0, NULL, Icon_Menu_setting); | 369 | agc_cliptime_func, NULL, NULL, Icon_Menu_setting); |
370 | #endif /* HAVE_AGC */ | 370 | #endif /* HAVE_AGC */ |
371 | 371 | ||
372 | /** Rec trigger **/ | 372 | /** Rec trigger **/ |
@@ -798,7 +798,7 @@ bool rectrigger(void) | |||
798 | } | 798 | } |
799 | 799 | ||
800 | MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), | 800 | MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), |
801 | (int(*)(void))rectrigger, NULL, 0, NULL, Icon_Menu_setting); | 801 | (int(*)(void))rectrigger, NULL, NULL, Icon_Menu_setting); |
802 | 802 | ||
803 | 803 | ||
804 | 804 | ||
@@ -838,4 +838,4 @@ bool recording_menu(bool no_source) | |||
838 | }; | 838 | }; |
839 | 839 | ||
840 | MENUITEM_FUNCTION(recording_settings, MENU_FUNC_USEPARAM, ID2P(LANG_RECORDING_SETTINGS), | 840 | MENUITEM_FUNCTION(recording_settings, MENU_FUNC_USEPARAM, ID2P(LANG_RECORDING_SETTINGS), |
841 | (int (*)(void*))recording_menu, 0, 0, NULL, Icon_NOICON); | 841 | (int (*)(void*))recording_menu, 0, NULL, Icon_NOICON); |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index ace17a2055..939a2f3c8c 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -64,16 +64,16 @@ MENUITEM_SETTING(tagcache_ram, &global_settings.tagcache_ram, NULL); | |||
64 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); | 64 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); |
65 | MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), | 65 | MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), |
66 | (int(*)(void))tagcache_rebuild_with_splash, | 66 | (int(*)(void))tagcache_rebuild_with_splash, |
67 | NULL, 0, NULL, Icon_NOICON); | 67 | NULL, NULL, Icon_NOICON); |
68 | MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), | 68 | MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), |
69 | (int(*)(void))tagcache_update_with_splash, | 69 | (int(*)(void))tagcache_update_with_splash, |
70 | NULL, 0, NULL, Icon_NOICON); | 70 | NULL, NULL, Icon_NOICON); |
71 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); | 71 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); |
72 | MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), | 72 | MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), |
73 | (int(*)(void))tagtree_export, NULL, 0, | 73 | (int(*)(void))tagtree_export, NULL, |
74 | NULL, Icon_NOICON); | 74 | NULL, Icon_NOICON); |
75 | MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), | 75 | MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), |
76 | (int(*)(void))tagtree_import, NULL, 0, | 76 | (int(*)(void))tagtree_import, NULL, |
77 | NULL, Icon_NOICON); | 77 | NULL, Icon_NOICON); |
78 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, | 78 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, |
79 | #ifdef HAVE_TC_RAMCACHE | 79 | #ifdef HAVE_TC_RAMCACHE |
@@ -221,7 +221,7 @@ static int timedate_set(void) | |||
221 | } | 221 | } |
222 | 222 | ||
223 | MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_TIME), | 223 | MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_TIME), |
224 | timedate_set, NULL, 0, NULL, Icon_NOICON); | 224 | timedate_set, NULL, NULL, Icon_NOICON); |
225 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); | 225 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); |
226 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat); | 226 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat); |
227 | #endif | 227 | #endif |
@@ -231,7 +231,7 @@ MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | |||
231 | 231 | ||
232 | #ifdef HAVE_RTC_ALARM | 232 | #ifdef HAVE_RTC_ALARM |
233 | MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), | 233 | MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), |
234 | (menu_function)alarm_screen, NULL, 0, NULL, Icon_NOICON); | 234 | (menu_function)alarm_screen, NULL, NULL, Icon_NOICON); |
235 | #if CONFIG_TUNER || defined(HAVE_RECORDING) | 235 | #if CONFIG_TUNER || defined(HAVE_RECORDING) |
236 | 236 | ||
237 | #if CONFIG_TUNER && !defined(HAVE_RECORDING) | 237 | #if CONFIG_TUNER && !defined(HAVE_RECORDING) |
@@ -281,7 +281,7 @@ static int alarm_setting(void) | |||
281 | } | 281 | } |
282 | 282 | ||
283 | MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), | 283 | MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), |
284 | alarm_setting, NULL, 0, alarm_callback, Icon_Menu_setting); | 284 | alarm_setting, NULL, alarm_callback, Icon_Menu_setting); |
285 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ | 285 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ |
286 | #endif /* HAVE_RTC_ALARM */ | 286 | #endif /* HAVE_RTC_ALARM */ |
287 | 287 | ||
@@ -415,7 +415,7 @@ static int language_browse(void) | |||
415 | return (int)rockbox_browse(LANG_DIR, SHOW_LNG); | 415 | return (int)rockbox_browse(LANG_DIR, SHOW_LNG); |
416 | } | 416 | } |
417 | MENUITEM_FUNCTION(browse_langs, 0, ID2P(LANG_LANGUAGE), language_browse, | 417 | MENUITEM_FUNCTION(browse_langs, 0, ID2P(LANG_LANGUAGE), language_browse, |
418 | NULL, 0, NULL, Icon_Language); | 418 | NULL, NULL, Icon_Language); |
419 | 419 | ||
420 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | 420 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, |
421 | Icon_General_settings_menu, | 421 | Icon_General_settings_menu, |