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/menus/theme_menu.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'apps/menus/theme_menu.c') diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index f64ded1615..10d1291daa 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c @@ -182,20 +182,29 @@ static int statusbar_callback_ex(int action,const struct menu_item_ex *this_item } #ifdef HAVE_REMOTE_LCD -static int statusbar_callback_remote(int action,const struct menu_item_ex *this_item) +static int statusbar_callback_remote(int action, + const struct menu_item_ex *this_item, + struct gui_synclist *this_list) { + (void)this_list; return statusbar_callback_ex(action, this_item, SCREEN_REMOTE); } #endif -static int statusbar_callback(int action,const struct menu_item_ex *this_item) +static int statusbar_callback(int action, + const struct menu_item_ex *this_item, + struct gui_synclist *this_list) { + (void)this_list; return statusbar_callback_ex(action, this_item, SCREEN_MAIN); } #ifdef HAVE_BUTTONBAR -static int buttonbar_callback(int action, const struct menu_item_ex *this_item) +static int buttonbar_callback(int action, + const struct menu_item_ex *this_item, + struct gui_synclist *this_list) { (void)this_item; + (void)this_list; switch (action) { case ACTION_EXIT_MENUITEM: @@ -369,9 +378,12 @@ MENUITEM_FUNCTION(browse_rfms, MENU_FUNC_USEPARAM, #endif -static int showicons_callback(int action, const struct menu_item_ex *this_item) +static int showicons_callback(int action, + const struct menu_item_ex *this_item, + struct gui_synclist *this_list) { (void)this_item; + (void)this_list; static bool old_icons; switch (action) { -- cgit v1.2.3