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/plugins/mpegplayer/mpeg_misc.c | 7 +++++-- apps/plugins/mpegplayer/mpeg_misc.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'apps/plugins/mpegplayer') diff --git a/apps/plugins/mpegplayer/mpeg_misc.c b/apps/plugins/mpegplayer/mpeg_misc.c index 7b73c7c376..c85285f4f8 100644 --- a/apps/plugins/mpegplayer/mpeg_misc.c +++ b/apps/plugins/mpegplayer/mpeg_misc.c @@ -183,8 +183,11 @@ long mpeg_sysevent(void) return mpeg_sysevent_id; } -int mpeg_sysevent_callback(int btn, const struct menu_item_ex *menu) +int mpeg_sysevent_callback(int btn, + const struct menu_item_ex *menu, + struct gui_synclist *this_list) { + (void) this_list; switch (btn) { case SYS_USB_CONNECTED: @@ -218,6 +221,6 @@ int mpeg_button_get(int timeout) /* Produce keyclick */ rb->keyclick_click(true, button); - return mpeg_sysevent_callback(button, NULL); + return mpeg_sysevent_callback(button, NULL, NULL); } diff --git a/apps/plugins/mpegplayer/mpeg_misc.h b/apps/plugins/mpegplayer/mpeg_misc.h index 6626bba594..e04db0e19d 100644 --- a/apps/plugins/mpegplayer/mpeg_misc.h +++ b/apps/plugins/mpegplayer/mpeg_misc.h @@ -241,7 +241,8 @@ void mpeg_sysevent_set(void); long mpeg_sysevent(void); /* Call with a system event code and used as menu callback */ -int mpeg_sysevent_callback(int btn, const struct menu_item_ex *menu); +int mpeg_sysevent_callback(int btn, const struct menu_item_ex *menu, + struct gui_synclist *this_list); /* Handle recorded event */ void mpeg_sysevent_handle(void); -- cgit v1.2.3