tsiry-sandratraina.com / rockbox-zig
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

menus remove reserved 'param' parameter

-- missed the plugin menu --

Change-Id: Iac2c9b0b8212ab5f3ac2ef90e1ac2723d212f86c

William Wilgus c85a4f1f ccf1aaa5

+191 -203
+2 -2
apps/enc_config.c
··· 194 194 195 195 /* mp3_enc configuration menu */ 196 196 MENUITEM_FUNCTION_W_PARAM(mp3_bitrate, 0, ID2P(LANG_BITRATE), 197 - mp3_enc_bitrate, 198 - &menu_callback_data, enc_menuitem_callback, Icon_NOICON); 197 + mp3_enc_bitrate, &menu_callback_data, 198 + enc_menuitem_callback, Icon_NOICON); 199 199 MAKE_MENU( mp3_enc_menu, ID2P(LANG_ENCODER_SETTINGS), 200 200 enc_menuitem_enteritem, Icon_NOICON, 201 201 &mp3_bitrate);
+3 -4
apps/menu.h
··· 195 195 When the user selects this item the function will be run, 196 196 if MENU_FUNC_CHECK_RETVAL is set, the return value 197 197 will be checked, returning 1 will exit do_menu(); */ 198 - #define MENUITEM_FUNCTION(name, flags, str, func, reserved, \ 199 - callback, icon) \ 198 + #define MENUITEM_FUNCTION(name, flags, str, func, callback, icon) \ 200 199 static const struct menu_callback_with_desc name##_ = {callback,str,icon}; \ 201 200 static const struct menu_func name##__ = {(void*)func}; \ 202 201 /* should be const, but recording_settings wont let us do that */ \ ··· 205 204 { .function = & name##__}, {.callback_and_desc = & name##_}}; 206 205 207 206 /* As above, except the text is dynamic */ 208 - #define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, reserved, \ 207 + #define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, \ 209 208 text_callback, voice_callback, \ 210 209 text_cb_data, callback, icon) \ 211 210 static const struct menu_get_name_and_icon name##_ \ 212 211 = {callback,text_callback,voice_callback,text_cb_data,icon}; \ 213 212 static const struct menu_func name##__ = {(void*)func}; \ 214 213 const struct menu_item_ex name = \ 215 - { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ 214 + { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ 216 215 { .function = & name##__}, {.menu_get_name_and_icon = & name##_}}; 217 216 218 217 /* Use this to put a function call into the menu.
+12 -12
apps/menus/display_menu.c
··· 168 168 selectivebacklight_callback); 169 169 170 170 MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS), 171 - selectivebacklight_set_mask, NULL, 172 - selectivebacklight_callback, Icon_Menu_setting); 171 + selectivebacklight_set_mask, selectivebacklight_callback, 172 + Icon_Menu_setting); 173 173 174 174 MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE), 175 175 NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask); ··· 520 520 INT, names, 4, NULL ); 521 521 } 522 522 523 - MENUITEM_FUNCTION(histogram, 0, 524 - ID2P(LANG_HISTOGRAM_INTERVAL), 525 - history_interval, NULL, NULL, Icon_Menu_setting); 523 + MENUITEM_FUNCTION(histogram, 0, ID2P(LANG_HISTOGRAM_INTERVAL), 524 + history_interval, NULL, Icon_Menu_setting); 526 525 527 526 #endif 528 527 529 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 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 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 534 MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, 536 535 &peak_meter_release, &peak_meter_hold, 537 536 &peak_meter_clip_hold, ··· 575 574 576 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, 579 - NULL, NULL, Icon_NOICON); 580 - MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), reset_mapping, 581 - NULL, NULL, Icon_NOICON); 577 + MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, 578 + ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, NULL, Icon_NOICON); 579 + MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, 580 + ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), 581 + reset_mapping, NULL, Icon_NOICON); 582 582 MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback); 583 583 584 584 MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON, &list_line_padding, &touch_mode,
+7 -8
apps/menus/eq_menu.c
··· 222 222 } 223 223 return 0; 224 224 } 225 - MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN), eq_do_simple_menu, 226 - NULL, NULL, Icon_Submenu); 225 + MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN), 226 + eq_do_simple_menu, NULL, Icon_Submenu); 227 227 228 228 static void selection_to_banditem(int selection, int expanded_band, int *band, int *item) 229 229 { ··· 426 426 return 0; 427 427 } 428 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 431 enum eq_slider_mode { 432 432 GAIN, ··· 783 783 static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG }; 784 784 785 785 MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), 786 - eq_menu_graphical, NULL, lowlatency_callback, 787 - Icon_EQ); 786 + eq_menu_graphical, lowlatency_callback, Icon_EQ); 788 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 789 MENUITEM_FUNCTION_W_PARAM(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), 791 - browse_folder, (void*)&eqs, lowlatency_callback, 792 - Icon_NOICON); 790 + browse_folder, (void*)&eqs, 791 + lowlatency_callback, Icon_NOICON); 793 792 794 793 MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, 795 794 &eq_enable, &eq_graphical, &eq_precut, &gain_menu,
+13 -10
apps/menus/main_menu.c
··· 91 91 } 92 92 93 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 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 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 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 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 107 MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, 105 108 &browse_configs, &reset_settings_item, ··· 466 469 467 470 468 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 474 #if CONFIG_RTC 472 475 int time_screen(void* ignored); 473 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 478 #endif 476 479 477 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 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 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 489 MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, 487 490 &show_info_item, &show_credits_item,
+4 -4
apps/menus/playlist_menu.c
··· 143 143 return 0; 144 144 } 145 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 147 MENUITEM_FUNCTION(view_cur_playlist, 0, 148 148 ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), 149 - playlist_view_, NULL, NULL, Icon_NOICON); 149 + playlist_view_, NULL, Icon_NOICON); 150 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 152 MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); 153 153 static int clear_catalog_directory(void) 154 154 { ··· 158 158 return false; 159 159 } 160 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 163 /* Playlist viewer settings submenu */ 164 164 MENUITEM_SETTING(show_icons, &global_settings.playlist_viewer_icons, NULL);
+8 -7
apps/menus/plugin_menu.c
··· 93 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 106 MAKE_MENU(plugin_menu, ID2P(LANG_PLUGINS), &menu_callback, 106 107 Icon_Plugin,
+12 -13
apps/menus/radio_menu.c
··· 52 52 } 53 53 54 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 56 #endif /* defined(HAVE_FMRADIO_REC) */ 57 57 58 58 #if defined(HAVE_FMRADIO_REC) ··· 65 65 } 66 66 67 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 69 #endif /* defined(HAVE_FMRADIO_REC) */ 70 70 #endif /* HAVE_RECORDING */ 71 71 72 72 #ifndef FM_PRESET 73 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 75 #endif 76 76 #ifndef FM_PRESET_ADD 77 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 79 #endif 80 80 81 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 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 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 88 MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL); 89 89 MENUITEM_SETTING(force_mono, &global_settings.fm_force_mono, NULL); ··· 120 120 RADIO_PRESET_MODE : RADIO_SCAN_MODE; 121 121 return 0; 122 122 } 123 - MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, 124 - toggle_radio_mode, NULL, 125 - get_mode_text, mode_speak_item, 126 - NULL, NULL, Icon_NOICON); 123 + MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, toggle_radio_mode, 124 + get_mode_text, mode_speak_item, 125 + NULL, NULL, Icon_NOICON); 127 126 #endif 128 127 129 128 MENUITEM_FUNCTION_W_PARAM(scan_presets_item, 0, 130 - ID2P(LANG_FM_SCAN_PRESETS), 131 - presets_scan, NULL, NULL, Icon_NOICON); 129 + ID2P(LANG_FM_SCAN_PRESETS), 130 + presets_scan, NULL, NULL, Icon_NOICON); 132 131 133 132 MAKE_MENU(radio_settings_menu, ID2P(LANG_FM_MENU), NULL, 134 133 Icon_Radio_screen,
+20 -20
apps/menus/recording_menu.c
··· 94 94 &global_settings.rec_source, INT, names, 95 95 n_opts, NULL ); 96 96 } 97 - MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), 98 - recsource_func, NULL, recmenu_callback, Icon_Menu_setting); 97 + MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), 98 + recsource_func, recmenu_callback, Icon_Menu_setting); 99 99 100 100 /* Makes an options list from a source list of options and indexes */ 101 101 static void make_options_from_indexes(const struct opt_items *src_names, ··· 188 188 return ret; 189 189 } /* recfrequency */ 190 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 194 static int recchannels_func(void) ··· 229 229 return ret; 230 230 } 231 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 234 static int recmonomode_func(void) 235 235 { ··· 249 249 return ret; 250 250 } 251 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 254 static int recformat_func(void) 255 255 { ··· 273 273 return res; 274 274 } /* recformat */ 275 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 278 MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), 279 - enc_global_config_menu, 280 - NULL, NULL, Icon_Submenu); 279 + enc_global_config_menu, NULL, Icon_Submenu); 281 280 282 281 static int recmenu_callback(int action, 283 282 const struct menu_item_ex *this_item, ··· 311 310 splash(HZ, ID2P(LANG_RESET_DONE_CLEAR)); 312 311 return false; 313 312 } 314 - MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR), 315 - clear_rec_directory, NULL, NULL, Icon_Folder); 313 + MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR), 314 + clear_rec_directory, NULL, Icon_Folder); 316 315 317 316 MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); 318 317 ··· 350 349 &global_settings.rec_agc_cliptime, 351 350 INT, names, 5, NULL ); 352 351 } 353 - MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), 354 - agc_preset_func, NULL, NULL, Icon_Menu_setting); 355 - MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME), 356 - agc_cliptime_func, NULL, NULL, Icon_Menu_setting); 352 + MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), 353 + agc_preset_func, NULL, Icon_Menu_setting); 354 + MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME), 355 + agc_cliptime_func, NULL, Icon_Menu_setting); 357 356 #endif /* HAVE_AGC */ 358 357 359 358 /** Rec trigger **/ ··· 571 570 settings_save(); 572 571 return 0; 573 572 } 574 - MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), 575 - rectrigger, NULL, NULL, Icon_Menu_setting); 573 + MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), 574 + rectrigger, NULL, Icon_Menu_setting); 576 575 577 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), 579 - browse_folder, (void*)&rec_config_browse, NULL, Icon_Config); 577 + MENUITEM_FUNCTION_W_PARAM(browse_recconfigs, 0, ID2P(LANG_CUSTOM_CFG), 578 + browse_folder, (void*)&rec_config_browse, 579 + NULL, Icon_Config); 580 580 static int write_settings_file(void) 581 581 { 582 582 return settings_save_config(SETTINGS_SAVE_RECPRESETS); 583 583 } 584 - MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), 585 - write_settings_file, NULL, NULL, Icon_Config); 584 + MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), 585 + write_settings_file, NULL, Icon_Config); 586 586 587 587 MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), 588 588 NULL, Icon_Recording,
+13 -15
apps/menus/settings_menu.c
··· 151 151 #endif 152 152 MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); 153 153 MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), 154 - (int(*)(void))tagcache_rebuild_with_splash, 155 - NULL, NULL, Icon_NOICON); 154 + (int(*)(void))tagcache_rebuild_with_splash, NULL, Icon_NOICON); 156 155 MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), 157 - (int(*)(void))tagcache_update_with_splash, 158 - NULL, NULL, Icon_NOICON); 156 + (int(*)(void))tagcache_update_with_splash, NULL, Icon_NOICON); 159 157 MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); 160 158 161 159 MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), 162 - tagtree_export, NULL, 163 - NULL, Icon_NOICON); 160 + tagtree_export, 161 + NULL, Icon_NOICON); 164 162 165 163 MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), 166 - tagtree_import, NULL, 167 - NULL, Icon_NOICON); 164 + tagtree_import, 165 + NULL, Icon_NOICON); 168 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 169 MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, 172 170 #ifdef HAVE_TC_RAMCACHE ··· 201 199 return false; 202 200 } 203 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 203 static int fileview_callback(int action, 206 204 const struct menu_item_ex *this_item, 207 205 struct gui_synclist *this_list) ··· 406 404 &global_settings.bt_selective_softlock_actions, 407 405 selectivesoftlock_callback); 408 406 MENUITEM_FUNCTION(sel_softlock_mask, 0, ID2P(LANG_SETTINGS), 409 - selectivesoftlock_set_mask, NULL, 410 - selectivesoftlock_callback, Icon_Menu_setting); 407 + selectivesoftlock_set_mask, selectivesoftlock_callback, 408 + Icon_Menu_setting); 411 409 412 410 MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE), 413 411 NULL, Icon_Menu_setting, &bt_selective_actions, &sel_softlock_mask); ··· 572 570 573 571 MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); 574 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 574 sleep_timer_getname, sleep_timer_voice, NULL, 577 575 NULL, Icon_NOICON); 578 576 MENUITEM_SETTING(sleeptimer_duration, ··· 762 760 } 763 761 MENUITEM_FUNCTION(wps_set_context_plugin, 0, 764 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 765 /* WPS_CONTEXT_PLUGIN */ 768 766 /***********************************/ ··· 785 783 static struct browse_folder_info langs = { LANG_DIR, SHOW_LNG }; 786 784 787 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 788 MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, 791 789 Icon_General_settings_menu,
+24 -32
apps/menus/theme_menu.c
··· 62 62 return 0; 63 63 } 64 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 66 #endif 67 67 #ifdef HAVE_LCD_COLOR 68 68 ··· 130 130 return 0; 131 131 } 132 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 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 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 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 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 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 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 147 MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU), 148 148 NULL, Icon_NOICON, ··· 323 323 return rockbox_browse(&browse); 324 324 } 325 325 326 - MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, 327 - ID2P(LANG_CUSTOM_FONT), 328 - browse_folder, (void*)&fonts, NULL, Icon_Font); 326 + MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, ID2P(LANG_CUSTOM_FONT), 327 + browse_folder, (void*)&fonts, NULL, Icon_Font); 329 328 330 - MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, 331 - ID2P(LANG_BASE_SKIN), 332 - browse_folder, (void*)&sbs, NULL, Icon_Wps); 329 + MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, ID2P(LANG_BASE_SKIN), 330 + browse_folder, (void*)&sbs, NULL, Icon_Wps); 333 331 #if CONFIG_TUNER 334 - MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, 335 - ID2P(LANG_RADIOSCREEN), 336 - browse_folder, (void*)&fms, NULL, Icon_Wps); 332 + MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, ID2P(LANG_RADIOSCREEN), 333 + browse_folder, (void*)&fms, NULL, Icon_Wps); 337 334 #endif 338 - MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, 339 - ID2P(LANG_WHILE_PLAYING), 340 - browse_folder, (void*)&wps, NULL, Icon_Wps); 335 + MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, ID2P(LANG_WHILE_PLAYING), 336 + browse_folder, (void*)&wps, NULL, Icon_Wps); 341 337 #ifdef HAVE_REMOTE_LCD 342 - MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, 343 - ID2P(LANG_REMOTE_WHILE_PLAYING), 344 - browse_folder, (void*)&rwps, NULL, Icon_Wps); 345 - MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, 346 - ID2P(LANG_REMOTE_BASE_SKIN), 347 - browse_folder, (void*)&rsbs, NULL, Icon_Wps); 338 + MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, ID2P(LANG_REMOTE_WHILE_PLAYING), 339 + browse_folder, (void*)&rwps, NULL, Icon_Wps); 340 + MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, ID2P(LANG_REMOTE_BASE_SKIN), 341 + browse_folder, (void*)&rsbs, NULL, Icon_Wps); 348 342 #if CONFIG_TUNER 349 - MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, 350 - ID2P(LANG_REMOTE_RADIOSCREEN), 351 - browse_folder, (void*)&rfms, NULL, Icon_Wps); 343 + MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, ID2P(LANG_REMOTE_RADIOSCREEN), 344 + browse_folder, (void*)&rfms, NULL, Icon_Wps); 352 345 #endif 353 346 #endif 354 347 ··· 373 366 } 374 367 375 368 MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); 376 - MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, 377 - ID2P(LANG_CUSTOM_THEME), 378 - browse_folder, (void*)&themes, NULL, Icon_Config); 369 + MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, ID2P(LANG_CUSTOM_THEME), 370 + browse_folder, (void*)&themes, NULL, Icon_Config); 379 371 MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); 380 372 #if LCD_DEPTH > 1 381 373 MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL);
+4 -4
apps/menus/time_menu.c
··· 81 81 return result; 82 82 } 83 83 84 - MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), 85 - timedate_set, NULL, NULL, Icon_NOICON); 84 + MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), 85 + timedate_set, NULL, Icon_NOICON); 86 86 MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); 87 87 #ifdef HAVE_RTC_ALARM 88 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 90 #if CONFIG_TUNER || defined(HAVE_RECORDING) 91 91 92 92 #if CONFIG_TUNER && !defined(HAVE_RECORDING) ··· 139 139 } 140 140 141 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 143 #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ 144 144 145 145 #endif /* HAVE_RTC_ALARM */
+27 -27
apps/onplay.c
··· 158 158 struct gui_synclist *this_list); 159 159 MENUITEM_FUNCTION(bookmark_create_menu_item, 0, 160 160 ID2P(LANG_BOOKMARK_MENU_CREATE), 161 - bookmark_create_menu, NULL, 161 + bookmark_create_menu, 162 162 bookmark_menu_callback, Icon_Bookmark); 163 163 MENUITEM_FUNCTION(bookmark_load_menu_item, 0, 164 164 ID2P(LANG_BOOKMARK_MENU_LIST), 165 - bookmark_load_menu_wrapper, NULL, 165 + bookmark_load_menu_wrapper, 166 166 bookmark_menu_callback, Icon_Bookmark); 167 167 MAKE_ONPLAYMENU(bookmark_menu, ID2P(LANG_BOOKMARK_MENU), 168 168 bookmark_menu_callback, Icon_Bookmark, ··· 482 482 } 483 483 484 484 MENUITEM_FUNCTION(wps_view_cur_playlist_item, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), 485 - wps_view_cur_playlist, NULL, NULL, Icon_NOICON); 485 + wps_view_cur_playlist, NULL, Icon_NOICON); 486 486 MENUITEM_FUNCTION(search_playlist_item, 0, ID2P(LANG_SEARCH_IN_PLAYLIST), 487 - search_playlist, NULL, NULL, Icon_Playlist); 487 + search_playlist, NULL, Icon_Playlist); 488 488 MENUITEM_FUNCTION(playlist_save_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), 489 - save_playlist, NULL, NULL, Icon_Playlist); 489 + save_playlist, NULL, Icon_Playlist); 490 490 MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST), 491 - shuffle_playlist, NULL, NULL, Icon_Playlist); 491 + shuffle_playlist, NULL, Icon_Playlist); 492 492 MENUITEM_FUNCTION(playing_time_item, 0, ID2P(LANG_PLAYING_TIME), 493 - playing_time, NULL, NULL, Icon_Playlist); 493 + playing_time, NULL, Icon_Playlist); 494 494 MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), 495 495 NULL, Icon_Playlist, 496 496 &wps_view_cur_playlist_item, &search_playlist_item, ··· 807 807 return false; 808 808 } 809 809 MENUITEM_FUNCTION(set_catalogdir_item, 0, ID2P(LANG_SET_AS_PLAYLISTCAT_DIR), 810 - set_catalogdir, NULL, clipboard_callback, Icon_Playlist); 810 + set_catalogdir, clipboard_callback, Icon_Playlist); 811 811 812 812 static int cat_playlist_callback(int action, 813 813 const struct menu_item_ex *this_item, 814 814 struct gui_synclist *this_list); 815 815 816 816 MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_CATALOG_ADD_TO), 817 - cat_add_to_a_playlist, 0, NULL, Icon_Playlist); 817 + cat_add_to_a_playlist, NULL, Icon_Playlist); 818 818 MENUITEM_FUNCTION(cat_add_to_new, 0, ID2P(LANG_CATALOG_ADD_TO_NEW), 819 - cat_add_to_a_new_playlist, 0, NULL, Icon_Playlist); 819 + cat_add_to_a_new_playlist, NULL, Icon_Playlist); 820 820 MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_CATALOG), 821 821 cat_playlist_callback, Icon_Playlist, 822 822 &cat_add_to_list, &cat_add_to_new, &set_catalogdir_item); ··· 1481 1481 return action; 1482 1482 } 1483 1483 MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING), 1484 - set_rating_inline, NULL, 1484 + set_rating_inline, 1485 1485 ratingitem_callback, Icon_Questionmark); 1486 1486 #endif 1487 1487 MENUITEM_RETURNVALUE(plugin_item, ID2P(LANG_OPEN_PLUGIN), ··· 1514 1514 return action; 1515 1515 } 1516 1516 MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET), 1517 - view_cue, NULL, view_cue_item_callback, Icon_NOICON); 1517 + view_cue, view_cue_item_callback, Icon_NOICON); 1518 1518 1519 1519 1520 1520 static int browse_id3_wrapper(void) ··· 1531 1531 1532 1532 /* CONTEXT_WPS items */ 1533 1533 MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO), 1534 - browse_id3_wrapper, NULL, NULL, Icon_NOICON); 1534 + browse_id3_wrapper, NULL, Icon_NOICON); 1535 1535 #ifdef HAVE_PITCHCONTROL 1536 1536 MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), 1537 - gui_syncpitchscreen_run, NULL, NULL, Icon_Audio); 1537 + gui_syncpitchscreen_run, NULL, Icon_Audio); 1538 1538 #endif 1539 1539 1540 1540 /* CONTEXT_[TREE|ID3DB] items */ ··· 1543 1543 struct gui_synclist *this_list); 1544 1544 1545 1545 MENUITEM_FUNCTION(rename_file_item, 0, ID2P(LANG_RENAME), 1546 - rename_file, NULL, clipboard_callback, Icon_NOICON); 1546 + rename_file, clipboard_callback, Icon_NOICON); 1547 1547 MENUITEM_FUNCTION(clipboard_cut_item, 0, ID2P(LANG_CUT), 1548 - clipboard_cut, NULL, clipboard_callback, Icon_NOICON); 1548 + clipboard_cut, clipboard_callback, Icon_NOICON); 1549 1549 MENUITEM_FUNCTION(clipboard_copy_item, 0, ID2P(LANG_COPY), 1550 - clipboard_copy, NULL, clipboard_callback, Icon_NOICON); 1550 + clipboard_copy, clipboard_callback, Icon_NOICON); 1551 1551 MENUITEM_FUNCTION(clipboard_paste_item, 0, ID2P(LANG_PASTE), 1552 - clipboard_paste, NULL, clipboard_callback, Icon_NOICON); 1552 + clipboard_paste, clipboard_callback, Icon_NOICON); 1553 1553 MENUITEM_FUNCTION(delete_file_item, 0, ID2P(LANG_DELETE), 1554 - delete_file_dir, NULL, clipboard_callback, Icon_NOICON); 1554 + delete_file_dir, clipboard_callback, Icon_NOICON); 1555 1555 MENUITEM_FUNCTION(delete_dir_item, 0, ID2P(LANG_DELETE_DIR), 1556 - delete_file_dir, NULL, clipboard_callback, Icon_NOICON); 1556 + delete_file_dir, clipboard_callback, Icon_NOICON); 1557 1557 MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR), 1558 - create_dir, NULL, clipboard_callback, Icon_NOICON); 1558 + create_dir, clipboard_callback, Icon_NOICON); 1559 1559 1560 1560 /* other items */ 1561 1561 static bool list_viewers(void) ··· 1579 1579 } 1580 1580 1581 1581 MENUITEM_FUNCTION(list_viewers_item, 0, ID2P(LANG_ONPLAY_OPEN_WITH), 1582 - list_viewers, NULL, clipboard_callback, Icon_NOICON); 1582 + list_viewers, clipboard_callback, Icon_NOICON); 1583 1583 MENUITEM_FUNCTION_W_PARAM(properties_item, 0, ID2P(LANG_PROPERTIES), 1584 1584 onplay_load_plugin, (void *)"properties", 1585 1585 clipboard_callback, Icon_NOICON); ··· 1597 1597 return false; 1598 1598 } 1599 1599 MENUITEM_FUNCTION(add_to_faves_item, 0, ID2P(LANG_ADD_TO_FAVES), 1600 - onplay_add_to_shortcuts, NULL, 1600 + onplay_add_to_shortcuts, 1601 1601 clipboard_callback, Icon_NOICON); 1602 1602 1603 1603 #if LCD_DEPTH > 1 ··· 1611 1611 return true; 1612 1612 } 1613 1613 MENUITEM_FUNCTION(set_backdrop_item, 0, ID2P(LANG_SET_AS_BACKDROP), 1614 - set_backdrop, NULL, clipboard_callback, Icon_NOICON); 1614 + set_backdrop, clipboard_callback, Icon_NOICON); 1615 1615 #endif 1616 1616 #ifdef HAVE_RECORDING 1617 1617 static bool set_recdir(void) ··· 1622 1622 return false; 1623 1623 } 1624 1624 MENUITEM_FUNCTION(set_recdir_item, 0, ID2P(LANG_SET_AS_REC_DIR), 1625 - set_recdir, NULL, clipboard_callback, Icon_Recording); 1625 + set_recdir, clipboard_callback, Icon_Recording); 1626 1626 #endif 1627 1627 static bool set_startdir(void) 1628 1628 { ··· 1633 1633 return false; 1634 1634 } 1635 1635 MENUITEM_FUNCTION(set_startdir_item, 0, ID2P(LANG_SET_AS_START_DIR), 1636 - set_startdir, NULL, clipboard_callback, Icon_file_view_menu); 1636 + set_startdir, clipboard_callback, Icon_file_view_menu); 1637 1637 1638 1638 static int clipboard_callback(int action, 1639 1639 const struct menu_item_ex *this_item, ··· 1747 1747 ); 1748 1748 1749 1749 MENUITEM_FUNCTION(view_playlist_item, 0, ID2P(LANG_VIEW), 1750 - view_playlist, NULL, 1750 + view_playlist, 1751 1751 onplaymenu_callback, Icon_Playlist); 1752 1752 1753 1753 /* used when onplay() is not called in the CONTEXT_WPS context */
+2 -2
apps/plugins/imageviewer/imageviewer.c
··· 236 236 } 237 237 238 238 MENUITEM_FUNCTION(grayscale_item, 0, ID2P(LANG_GRAYSCALE), 239 - set_option_grayscale, NULL, NULL, Icon_NOICON); 239 + set_option_grayscale, NULL, Icon_NOICON); 240 240 MENUITEM_FUNCTION(dithering_item, 0, ID2P(LANG_DITHERING), 241 - set_option_dithering, NULL, NULL, Icon_NOICON); 241 + set_option_dithering, NULL, Icon_NOICON); 242 242 MAKE_MENU(display_menu, "Display Options", NULL, Icon_NOICON, 243 243 &grayscale_item, &dithering_item); 244 244
+7 -7
apps/plugins/lib/playback_control.c
··· 91 91 return false; 92 92 } 93 93 MENUITEM_FUNCTION(prevtrack_item, 0, ID2P(LANG_PREVTRACK), 94 - prevtrack, NULL, NULL, Icon_NOICON); 94 + prevtrack, NULL, Icon_NOICON); 95 95 MENUITEM_FUNCTION(playpause_item, 0, ID2P(LANG_PLAYPAUSE), 96 - play, NULL, NULL, Icon_NOICON); 96 + play, NULL, Icon_NOICON); 97 97 MENUITEM_FUNCTION(stop_item, 0, ID2P(LANG_STOP_PLAYBACK), 98 - stop, NULL, NULL, Icon_NOICON); 98 + stop, NULL, Icon_NOICON); 99 99 MENUITEM_FUNCTION(nexttrack_item, 0, ID2P(LANG_NEXTTRACK), 100 - nexttrack, NULL, NULL, Icon_NOICON); 100 + nexttrack, NULL, Icon_NOICON); 101 101 MENUITEM_FUNCTION(volume_item, 0, ID2P(LANG_CHANGE_VOLUME), 102 - volume, NULL, NULL, Icon_NOICON); 102 + volume, NULL, Icon_NOICON); 103 103 MENUITEM_FUNCTION(shuffle_item, 0, ID2P(LANG_CHANGE_SHUFFLE_MODE), 104 - shuffle, NULL, NULL, Icon_NOICON); 104 + shuffle, NULL, Icon_NOICON); 105 105 MENUITEM_FUNCTION(repeat_mode_item, 0, ID2P(LANG_CHANGE_REPEAT_MODE), 106 - repeat_mode, NULL, NULL, Icon_NOICON); 106 + repeat_mode, NULL, Icon_NOICON); 107 107 MAKE_MENU(playback_control_menu, ID2P(LANG_PLAYBACK_CONTROL), NULL, Icon_NOICON, 108 108 &prevtrack_item, &playpause_item, &stop_item, &nexttrack_item, 109 109 &volume_item, &shuffle_item, &repeat_mode_item);
+29 -32
apps/plugins/text_viewer/tv_menu.c
··· 51 51 } 52 52 53 53 MENUITEM_FUNCTION(horizontal_scrollbar_item, 0, "Scrollbar", 54 - tv_horizontal_scrollbar_setting, 55 - NULL, NULL, Icon_NOICON); 54 + tv_horizontal_scrollbar_setting, NULL, Icon_NOICON); 56 55 MENUITEM_FUNCTION(horizontal_scroll_mode_item, 0, "Scroll Mode", 57 - tv_horizontal_scroll_mode_setting, NULL, NULL, Icon_NOICON); 56 + tv_horizontal_scroll_mode_setting, NULL, Icon_NOICON); 58 57 59 58 MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON, 60 59 &horizontal_scrollbar_item, ··· 103 102 } 104 103 105 104 MENUITEM_FUNCTION(vertical_scrollbar_item, 0, "Scrollbar", 106 - tv_vertical_scrollbar_setting, 107 - NULL, NULL, Icon_NOICON); 105 + tv_vertical_scrollbar_setting, NULL, Icon_NOICON); 108 106 MENUITEM_FUNCTION(vertical_scroll_mode_item, 0, "Scroll Mode", 109 - tv_vertical_scroll_mode_setting, NULL, NULL, Icon_NOICON); 110 - MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, 111 - NULL, NULL, Icon_NOICON); 107 + tv_vertical_scroll_mode_setting, NULL, Icon_NOICON); 108 + MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, NULL, Icon_NOICON); 112 109 MENUITEM_FUNCTION(autoscroll_speed_item, 0, "Auto-Scroll Speed", 113 - tv_autoscroll_speed_setting, NULL, NULL, Icon_NOICON); 110 + tv_autoscroll_speed_setting, NULL, Icon_NOICON); 114 111 MENUITEM_FUNCTION(narrow_mode_item, 0, "Left/Right Key (Narrow mode)", 115 - tv_narrow_mode_setting, NULL, NULL, Icon_NOICON); 112 + tv_narrow_mode_setting, NULL, Icon_NOICON); 116 113 117 114 MAKE_MENU(vertical_scroll_menu, "Vertical", NULL, Icon_NOICON, 118 115 &vertical_scrollbar_item, ··· 240 237 } 241 238 #endif 242 239 243 - MENUITEM_FUNCTION(encoding_item, 0, "Encoding", tv_encoding_setting, 244 - NULL, NULL, Icon_NOICON); 245 - MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap", tv_word_wrap_setting, 246 - NULL, NULL, Icon_NOICON); 247 - MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode", tv_line_mode_setting, 248 - NULL, NULL, Icon_NOICON); 249 - MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", tv_windows_setting, 250 - NULL, NULL, Icon_NOICON); 251 - MENUITEM_FUNCTION(alignment_item, 0, "Alignment", tv_alignment_setting, 252 - NULL, NULL, Icon_NOICON); 253 - MENUITEM_FUNCTION(header_item, 0, "Show Header", tv_header_setting, 254 - NULL, NULL, Icon_NOICON); 255 - MENUITEM_FUNCTION(footer_item, 0, "Show Footer", tv_footer_setting, 256 - NULL, NULL, Icon_NOICON); 257 - MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", tv_statusbar_setting, 258 - NULL, NULL, Icon_NOICON); 259 - MENUITEM_FUNCTION(font_item, 0, "Font", tv_font_setting, 260 - NULL, NULL, Icon_NOICON); 261 - MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", tv_indent_spaces_setting, 262 - NULL, NULL, Icon_NOICON); 240 + MENUITEM_FUNCTION(encoding_item, 0, "Encoding", 241 + tv_encoding_setting, NULL, Icon_NOICON); 242 + MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap", 243 + tv_word_wrap_setting, NULL, Icon_NOICON); 244 + MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode", 245 + tv_line_mode_setting, NULL, Icon_NOICON); 246 + MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", 247 + tv_windows_setting, NULL, Icon_NOICON); 248 + MENUITEM_FUNCTION(alignment_item, 0, "Alignment", 249 + tv_alignment_setting, NULL, Icon_NOICON); 250 + MENUITEM_FUNCTION(header_item, 0, "Show Header", 251 + tv_header_setting, NULL, Icon_NOICON); 252 + MENUITEM_FUNCTION(footer_item, 0, "Show Footer", 253 + tv_footer_setting, NULL, Icon_NOICON); 254 + MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", 255 + tv_statusbar_setting, NULL, Icon_NOICON); 256 + MENUITEM_FUNCTION(font_item, 0, "Font", 257 + tv_font_setting, NULL, Icon_NOICON); 258 + MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", 259 + tv_indent_spaces_setting, NULL, Icon_NOICON); 263 260 #ifdef HAVE_LCD_COLOR 264 - MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", tv_night_mode_setting, 265 - NULL, NULL, Icon_NOICON); 261 + MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", 262 + tv_night_mode_setting, NULL, Icon_NOICON); 266 263 #endif 267 264 268 265 MAKE_MENU(option_menu, "Viewer Options", NULL, Icon_NOICON,
+4 -4
apps/radio/presets.c
··· 428 428 } 429 429 430 430 MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL, 431 - ID2P(LANG_FM_EDIT_PRESET), 432 - radio_edit_preset, NULL, NULL, Icon_NOICON); 431 + ID2P(LANG_FM_EDIT_PRESET), 432 + radio_edit_preset, NULL, Icon_NOICON); 433 433 MENUITEM_FUNCTION(radio_delete_preset_item, MENU_FUNC_CHECK_RETVAL, 434 - ID2P(LANG_FM_DELETE_PRESET), 435 - radio_delete_preset, NULL, NULL, Icon_NOICON); 434 + ID2P(LANG_FM_DELETE_PRESET), 435 + radio_delete_preset, NULL, Icon_NOICON); 436 436 static int radio_preset_callback(int action, 437 437 const struct menu_item_ex *this_item, 438 438 struct gui_synclist *this_list)