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/sound_menu.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'apps/menus/sound_menu.c') diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c index fb9a7fa26e..f39d980a35 100644 --- a/apps/menus/sound_menu.c +++ b/apps/menus/sound_menu.c @@ -38,9 +38,12 @@ #include "option_select.h" #include "misc.h" -static int volume_limit_callback(int action,const struct menu_item_ex *this_item) +static int volume_limit_callback(int action, + const struct menu_item_ex *this_item, + struct gui_synclist *this_list) { (void)this_item; + (void)this_list; static struct int_setting volume_limit_int_setting; volume_limit_int_setting.option_callback = NULL; @@ -147,8 +150,11 @@ MENUITEM_SETTING(func_mode, &global_settings.func_mode, NULL); &crossfeed_hf_attenuation, &crossfeed_hf_cutoff); #ifdef HAVE_PITCHCONTROL -static int timestretch_callback(int action,const struct menu_item_ex *this_item) +static int timestretch_callback(int action, + const struct menu_item_ex *this_item, + struct gui_synclist *this_list) { + (void)this_list; switch (action) { case ACTION_EXIT_MENUITEM: /* on exit */ @@ -156,7 +162,7 @@ static int timestretch_callback(int action,const struct menu_item_ex *this_item) splash(HZ*2, ID2P(LANG_PLEASE_REBOOT)); break; } - lowlatency_callback(action, this_item); + lowlatency_callback(action, this_item, NULL); return action; } MENUITEM_SETTING(timestretch_enabled, -- cgit v1.2.3