diff options
author | William Wilgus <wilgus.william@gmail.com> | 2020-07-19 13:42:04 -0400 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2020-07-19 22:10:26 +0000 |
commit | c39f95465b9844f70f375f1690e0bf75c7ee7cc1 (patch) | |
tree | 2fda6bd805a74f41dd4303c7699eabb9e1aa4a1c /apps/menus/time_menu.c | |
parent | 4663d94b4e4edec609b6a24581ee345f2a1bedaa (diff) | |
download | rockbox-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/menus/time_menu.c')
-rw-r--r-- | apps/menus/time_menu.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index 94e19b06aa..811996ca40 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c | |||
@@ -93,9 +93,12 @@ MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), | |||
93 | /* This need only be shown if we dont have recording, because if we do | 93 | /* This need only be shown if we dont have recording, because if we do |
94 | then always show the setting item, because there will always be at least | 94 | then always show the setting item, because there will always be at least |
95 | 2 items */ | 95 | 2 items */ |
96 | static int alarm_callback(int action,const struct menu_item_ex *this_item) | 96 | static int alarm_callback(int action, |
97 | const struct menu_item_ex *this_item, | ||
98 | struct gui_synclist *this_list) | ||
97 | { | 99 | { |
98 | (void)this_item; | 100 | (void)this_item; |
101 | (void)this_list; | ||
99 | switch (action) | 102 | switch (action) |
100 | { | 103 | { |
101 | case ACTION_REQUEST_MENUITEM: | 104 | case ACTION_REQUEST_MENUITEM: |
@@ -204,9 +207,11 @@ static void draw_timedate(struct viewport *vp, struct screen *display) | |||
204 | static struct viewport clock_vps[NB_SCREENS], menu[NB_SCREENS]; | 207 | static struct viewport clock_vps[NB_SCREENS], menu[NB_SCREENS]; |
205 | static bool menu_was_pressed; | 208 | static bool menu_was_pressed; |
206 | static int time_menu_callback(int action, | 209 | static int time_menu_callback(int action, |
207 | const struct menu_item_ex *this_item) | 210 | const struct menu_item_ex *this_item, |
211 | struct gui_synclist *this_list) | ||
208 | { | 212 | { |
209 | (void)this_item; | 213 | (void)this_item; |
214 | (void)this_list; | ||
210 | static int last_redraw = 0; | 215 | static int last_redraw = 0; |
211 | bool redraw = false; | 216 | bool redraw = false; |
212 | 217 | ||