Remade the menu system slightly. All functions invoked from menus now use

the Menu typedef as return type, and *ALL* menus that intercept USB connect
can then return MENU_REFRESH_DIR so that the parent (any parent really) that
do file or dir-accesses knows that and can do the refresh. If no refresh
is needed by the parent, MENU_OK is returned.

Somewhat biggish commit this close to 1.3, but we need to sort out this
refresh-after-usb-connected business.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1948 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 7 insertions, 4 deletions

diff --git a/apps/screensavers_menu.c b/apps/screensavers_menu.c
index a7bd4d422c..b184b916cc 100644
--- a/apps/screensavers_menu.c
+++ b/apps/screensavers_menu.c
@@ -30,12 +30,13 @@
 #include "sprintf.h"
 
 #include "boxes.h"
-extern void bounce(void);
-extern void blank(void);
+extern Menu bounce(void);
+extern Menu blank(void);
 
-void screensavers_menu(void)
+Menu screensavers_menu(void)
 {
     int m;
+    Menu result;
 
     struct menu_items items[] = {
         { "Boxes", boxes },
@@ -44,8 +45,10 @@ void screensavers_menu(void)
     };
 
     m=menu_init( items, sizeof items / sizeof(struct menu_items) );
-    menu_run(m);
+    result = menu_run(m);
     menu_exit(m);
+
+    return result;
 }
 
 #endif