diff options
Diffstat (limited to 'apps/plugins/rockboy/menu.c')
-rw-r--r-- | apps/plugins/rockboy/menu.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index a3d64d60d0..ca15cba7b9 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include "button.h" | 7 | #include "button.h" |
8 | #include "rockmacros.h" | 8 | #include "rockmacros.h" |
9 | #include "mem.h" | 9 | #include "mem.h" |
10 | #include "lib/oldmenuapi.h" | ||
10 | 11 | ||
11 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) | 12 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) |
12 | #define MENU_BUTTON_UP BUTTON_SCROLL_BACK | 13 | #define MENU_BUTTON_UP BUTTON_SCROLL_BACK |
@@ -101,11 +102,11 @@ int do_user_menu(void) { | |||
101 | 102 | ||
102 | pcm_init(); | 103 | pcm_init(); |
103 | 104 | ||
104 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); | 105 | m = menu_init(rb,items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); |
105 | 106 | ||
106 | while(!done) | 107 | while(!done) |
107 | { | 108 | { |
108 | result=rb->menu_show(m); | 109 | result=menu_show(m); |
109 | 110 | ||
110 | switch (result) | 111 | switch (result) |
111 | { | 112 | { |
@@ -128,7 +129,7 @@ int do_user_menu(void) { | |||
128 | } | 129 | } |
129 | } | 130 | } |
130 | 131 | ||
131 | rb->menu_exit(m); | 132 | menu_exit(m); |
132 | 133 | ||
133 | rb->lcd_setfont(0); /* Reset the font */ | 134 | rb->lcd_setfont(0); /* Reset the font */ |
134 | rb->lcd_clear_display(); /* Clear display for screen size changes */ | 135 | rb->lcd_clear_display(); /* Clear display for screen size changes */ |
@@ -303,18 +304,18 @@ static void do_slot_menu(bool is_load) { | |||
303 | for (i = 0; i < num_items; i++) | 304 | for (i = 0; i < num_items; i++) |
304 | slot_info(buf[i], 20, i); | 305 | slot_info(buf[i], 20, i); |
305 | 306 | ||
306 | m = rb->menu_init(items, num_items, NULL, NULL, NULL, NULL); | 307 | m = menu_init(rb,items, num_items, NULL, NULL, NULL, NULL); |
307 | 308 | ||
308 | while(!done) | 309 | while(!done) |
309 | { | 310 | { |
310 | result=rb->menu_show(m); | 311 | result=menu_show(m); |
311 | 312 | ||
312 | if (result<num_items && result >= 0 ) | 313 | if (result<num_items && result >= 0 ) |
313 | done = do_slot(result, is_load); | 314 | done = do_slot(result, is_load); |
314 | else | 315 | else |
315 | done = true; | 316 | done = true; |
316 | } | 317 | } |
317 | rb->menu_exit(m); | 318 | menu_exit(m); |
318 | } | 319 | } |
319 | 320 | ||
320 | static void do_opt_menu(void) | 321 | static void do_opt_menu(void) |
@@ -374,12 +375,12 @@ static void do_opt_menu(void) | |||
374 | #endif | 375 | #endif |
375 | }; | 376 | }; |
376 | 377 | ||
377 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); | 378 | m = menu_init(rb,items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); |
378 | 379 | ||
379 | while(!done) | 380 | while(!done) |
380 | { | 381 | { |
381 | 382 | ||
382 | result=rb->menu_show(m); | 383 | result=menu_show(m); |
383 | 384 | ||
384 | switch (result) | 385 | switch (result) |
385 | { | 386 | { |
@@ -414,5 +415,5 @@ static void do_opt_menu(void) | |||
414 | break; | 415 | break; |
415 | } | 416 | } |
416 | } | 417 | } |
417 | rb->menu_exit(m); | 418 | menu_exit(m); |
418 | } | 419 | } |