1
0
Fork 0
forked from len0rd/rockbox

Move the old api out of the core and into the plugin lib.

ew plugins shuold use the new api and not this one.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13358 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-05-08 11:55:43 +00:00
parent b15ef987ca
commit 77a458a464
22 changed files with 438 additions and 349 deletions

View file

@ -7,6 +7,7 @@
#include "button.h"
#include "rockmacros.h"
#include "mem.h"
#include "lib/oldmenuapi.h"
#if (CONFIG_KEYPAD == IPOD_4G_PAD)
#define MENU_BUTTON_UP BUTTON_SCROLL_BACK
@ -101,11 +102,11 @@ int do_user_menu(void) {
pcm_init();
m = rb->menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL);
m = menu_init(rb,items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL);
while(!done)
{
result=rb->menu_show(m);
result=menu_show(m);
switch (result)
{
@ -128,7 +129,7 @@ int do_user_menu(void) {
}
}
rb->menu_exit(m);
menu_exit(m);
rb->lcd_setfont(0); /* Reset the font */
rb->lcd_clear_display(); /* Clear display for screen size changes */
@ -303,18 +304,18 @@ static void do_slot_menu(bool is_load) {
for (i = 0; i < num_items; i++)
slot_info(buf[i], 20, i);
m = rb->menu_init(items, num_items, NULL, NULL, NULL, NULL);
m = menu_init(rb,items, num_items, NULL, NULL, NULL, NULL);
while(!done)
{
result=rb->menu_show(m);
result=menu_show(m);
if (result<num_items && result >= 0 )
done = do_slot(result, is_load);
else
done = true;
}
rb->menu_exit(m);
menu_exit(m);
}
static void do_opt_menu(void)
@ -374,12 +375,12 @@ static void do_opt_menu(void)
#endif
};
m = rb->menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL);
m = menu_init(rb,items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL);
while(!done)
{
result=rb->menu_show(m);
result=menu_show(m);
switch (result)
{
@ -414,5 +415,5 @@ static void do_opt_menu(void)
break;
}
}
rb->menu_exit(m);
menu_exit(m);
}