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/theme_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/theme_menu.c')
-rw-r--r-- | apps/menus/theme_menu.c | 20 |
1 files changed, 16 insertions, 4 deletions
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 | |||
182 | } | 182 | } |
183 | 183 | ||
184 | #ifdef HAVE_REMOTE_LCD | 184 | #ifdef HAVE_REMOTE_LCD |
185 | static int statusbar_callback_remote(int action,const struct menu_item_ex *this_item) | 185 | static int statusbar_callback_remote(int action, |
186 | const struct menu_item_ex *this_item, | ||
187 | struct gui_synclist *this_list) | ||
186 | { | 188 | { |
189 | (void)this_list; | ||
187 | return statusbar_callback_ex(action, this_item, SCREEN_REMOTE); | 190 | return statusbar_callback_ex(action, this_item, SCREEN_REMOTE); |
188 | } | 191 | } |
189 | #endif | 192 | #endif |
190 | static int statusbar_callback(int action,const struct menu_item_ex *this_item) | 193 | static int statusbar_callback(int action, |
194 | const struct menu_item_ex *this_item, | ||
195 | struct gui_synclist *this_list) | ||
191 | { | 196 | { |
197 | (void)this_list; | ||
192 | return statusbar_callback_ex(action, this_item, SCREEN_MAIN); | 198 | return statusbar_callback_ex(action, this_item, SCREEN_MAIN); |
193 | } | 199 | } |
194 | 200 | ||
195 | #ifdef HAVE_BUTTONBAR | 201 | #ifdef HAVE_BUTTONBAR |
196 | static int buttonbar_callback(int action, const struct menu_item_ex *this_item) | 202 | static int buttonbar_callback(int action, |
203 | const struct menu_item_ex *this_item, | ||
204 | struct gui_synclist *this_list) | ||
197 | { | 205 | { |
198 | (void)this_item; | 206 | (void)this_item; |
207 | (void)this_list; | ||
199 | switch (action) | 208 | switch (action) |
200 | { | 209 | { |
201 | case ACTION_EXIT_MENUITEM: | 210 | case ACTION_EXIT_MENUITEM: |
@@ -369,9 +378,12 @@ MENUITEM_FUNCTION(browse_rfms, MENU_FUNC_USEPARAM, | |||
369 | #endif | 378 | #endif |
370 | 379 | ||
371 | 380 | ||
372 | static int showicons_callback(int action, const struct menu_item_ex *this_item) | 381 | static int showicons_callback(int action, |
382 | const struct menu_item_ex *this_item, | ||
383 | struct gui_synclist *this_list) | ||
373 | { | 384 | { |
374 | (void)this_item; | 385 | (void)this_item; |
386 | (void)this_list; | ||
375 | static bool old_icons; | 387 | static bool old_icons; |
376 | switch (action) | 388 | switch (action) |
377 | { | 389 | { |