summaryrefslogtreecommitdiff
path: root/apps/root_menu.c
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2020-07-19 13:42:04 -0400
committerWilliam Wilgus <me.theuser@yahoo.com>2020-07-19 22:10:26 +0000
commitc39f95465b9844f70f375f1690e0bf75c7ee7cc1 (patch)
tree2fda6bd805a74f41dd4303c7699eabb9e1aa4a1c /apps/root_menu.c
parent4663d94b4e4edec609b6a24581ee345f2a1bedaa (diff)
downloadrockbox-c39f95465b9844f70f375f1690e0bf75c7ee7cc1.tar.gz
rockbox-c39f95465b9844f70f375f1690e0bf75c7ee7cc1.zip
do_menu pass internal synclist reference to callback
keep running into the rigid nature of do_menu it isn't too bad when you don't need voice but once you do the fun awaits do_menu likes to talk on menu enter which is in a loop when you use do_menu I would like to move the processing to the callback TOO BAD you only get an action and the menu_item_ex struct you sent it when calling the function Change-Id: Iaefd0cc133435d675b7dd27a558c504d6ccb327a
Diffstat (limited to 'apps/root_menu.c')
-rw-r--r--apps/root_menu.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 584328bd4b..49379bbbfc 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -437,7 +437,9 @@ static const struct root_items items[] = {
437}; 437};
438static const int nb_items = sizeof(items)/sizeof(*items); 438static const int nb_items = sizeof(items)/sizeof(*items);
439 439
440static int item_callback(int action, const struct menu_item_ex *this_item) ; 440static int item_callback(int action,
441 const struct menu_item_ex *this_item,
442 struct gui_synclist *this_list);
441 443
442MENUITEM_RETURNVALUE(shortcut_menu, ID2P(LANG_SHORTCUTS), GO_TO_SHORTCUTMENU, 444MENUITEM_RETURNVALUE(shortcut_menu, ID2P(LANG_SHORTCUTS), GO_TO_SHORTCUTMENU,
443 NULL, Icon_Bookmark); 445 NULL, Icon_Bookmark);
@@ -621,8 +623,11 @@ bool root_menu_is_changed(void* setting, void* defaultval)
621 return *(bool*)setting; 623 return *(bool*)setting;
622} 624}
623 625
624static int item_callback(int action, const struct menu_item_ex *this_item) 626static int item_callback(int action,
627 const struct menu_item_ex *this_item,
628 struct gui_synclist *this_list)
625{ 629{
630 (void)this_list;
626 switch (action) 631 switch (action)
627 { 632 {
628 case ACTION_TREE_STOP: 633 case ACTION_TREE_STOP: