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/radio_menu.c | |
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/radio_menu.c')
-rw-r--r-- | apps/menus/radio_menu.c | 25 |
1 files changed, 12 insertions, 13 deletions
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, |