From c39f95465b9844f70f375f1690e0bf75c7ee7cc1 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sun, 19 Jul 2020 13:42:04 -0400 Subject: 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 --- apps/root_menu.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'apps/root_menu.c') 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[] = { }; static const int nb_items = sizeof(items)/sizeof(*items); -static int item_callback(int action, const struct menu_item_ex *this_item) ; +static int item_callback(int action, + const struct menu_item_ex *this_item, + struct gui_synclist *this_list); MENUITEM_RETURNVALUE(shortcut_menu, ID2P(LANG_SHORTCUTS), GO_TO_SHORTCUTMENU, NULL, Icon_Bookmark); @@ -621,8 +623,11 @@ bool root_menu_is_changed(void* setting, void* defaultval) return *(bool*)setting; } -static int item_callback(int action, const struct menu_item_ex *this_item) +static int item_callback(int action, + const struct menu_item_ex *this_item, + struct gui_synclist *this_list) { + (void)this_list; switch (action) { case ACTION_TREE_STOP: -- cgit v1.2.3