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/menu.h | |
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/menu.h')
-rw-r--r-- | apps/menu.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/menu.h b/apps/menu.h index acdc8e987f..1f017b0c49 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -195,8 +195,7 @@ int do_menu(const struct menu_item_ex *menu, int *start_selected, | |||
195 | When the user selects this item the function will be run, | 195 | When the user selects this item the function will be run, |
196 | if MENU_FUNC_CHECK_RETVAL is set, the return value | 196 | if MENU_FUNC_CHECK_RETVAL is set, the return value |
197 | will be checked, returning 1 will exit do_menu(); */ | 197 | will be checked, returning 1 will exit do_menu(); */ |
198 | #define MENUITEM_FUNCTION(name, flags, str, func, reserved, \ | 198 | #define MENUITEM_FUNCTION(name, flags, str, func, callback, icon) \ |
199 | callback, icon) \ | ||
200 | static const struct menu_callback_with_desc name##_ = {callback,str,icon}; \ | 199 | static const struct menu_callback_with_desc name##_ = {callback,str,icon}; \ |
201 | static const struct menu_func name##__ = {(void*)func}; \ | 200 | static const struct menu_func name##__ = {(void*)func}; \ |
202 | /* should be const, but recording_settings wont let us do that */ \ | 201 | /* should be const, but recording_settings wont let us do that */ \ |
@@ -205,14 +204,14 @@ int do_menu(const struct menu_item_ex *menu, int *start_selected, | |||
205 | { .function = & name##__}, {.callback_and_desc = & name##_}}; | 204 | { .function = & name##__}, {.callback_and_desc = & name##_}}; |
206 | 205 | ||
207 | /* As above, except the text is dynamic */ | 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 | text_callback, voice_callback, \ | 208 | text_callback, voice_callback, \ |
210 | text_cb_data, callback, icon) \ | 209 | text_cb_data, callback, icon) \ |
211 | static const struct menu_get_name_and_icon name##_ \ | 210 | static const struct menu_get_name_and_icon name##_ \ |
212 | = {callback,text_callback,voice_callback,text_cb_data,icon}; \ | 211 | = {callback,text_callback,voice_callback,text_cb_data,icon}; \ |
213 | static const struct menu_func name##__ = {(void*)func}; \ | 212 | static const struct menu_func name##__ = {(void*)func}; \ |
214 | const struct menu_item_ex name = \ | 213 | const struct menu_item_ex name = \ |
215 | { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ | 214 | { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ |
216 | { .function = & name##__}, {.menu_get_name_and_icon = & name##_}}; | 215 | { .function = & name##__}, {.menu_get_name_and_icon = & name##_}}; |
217 | 216 | ||
218 | /* Use this to put a function call into the menu. | 217 | /* Use this to put a function call into the menu. |