diff options
Diffstat (limited to 'apps/plugins/rockboy/menu.c')
-rw-r--r-- | apps/plugins/rockboy/menu.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index e896e26c20..eead812b61 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c | |||
@@ -7,16 +7,17 @@ | |||
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 "save.h" | ||
10 | #include "lib/oldmenuapi.h" | 11 | #include "lib/oldmenuapi.h" |
11 | #include "rtc-gb.h" | 12 | #include "rtc-gb.h" |
12 | 13 | ||
13 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) | 14 | #if CONFIG_KEYPAD == IPOD_4G_PAD |
14 | #define MENU_BUTTON_UP BUTTON_SCROLL_BACK | 15 | #define MENU_BUTTON_UP BUTTON_SCROLL_BACK |
15 | #define MENU_BUTTON_DOWN BUTTON_SCROLL_FWD | 16 | #define MENU_BUTTON_DOWN BUTTON_SCROLL_FWD |
16 | #define MENU_BUTTON_LEFT BUTTON_LEFT | 17 | #define MENU_BUTTON_LEFT BUTTON_LEFT |
17 | #define MENU_BUTTON_RIGHT BUTTON_RIGHT | 18 | #define MENU_BUTTON_RIGHT BUTTON_RIGHT |
18 | 19 | ||
19 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 20 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
20 | #define MENU_BUTTON_UP BUTTON_SCROLL_UP | 21 | #define MENU_BUTTON_UP BUTTON_SCROLL_UP |
21 | #define MENU_BUTTON_DOWN BUTTON_SCROLL_DOWN | 22 | #define MENU_BUTTON_DOWN BUTTON_SCROLL_DOWN |
22 | #define MENU_BUTTON_LEFT BUTTON_LEFT | 23 | #define MENU_BUTTON_LEFT BUTTON_LEFT |
@@ -37,7 +38,7 @@ static void munge_name(char *buf, size_t bufsiz); | |||
37 | /* directory ROM save slots belong in */ | 38 | /* directory ROM save slots belong in */ |
38 | #define STATE_DIR ROCKBOX_DIR "/rockboy" | 39 | #define STATE_DIR ROCKBOX_DIR "/rockboy" |
39 | 40 | ||
40 | int getbutton(char *text) | 41 | static int getbutton(char *text) |
41 | { | 42 | { |
42 | int fw, fh; | 43 | int fw, fh; |
43 | rb->lcd_clear_display(); | 44 | rb->lcd_clear_display(); |
@@ -59,7 +60,7 @@ int getbutton(char *text) | |||
59 | } | 60 | } |
60 | } | 61 | } |
61 | 62 | ||
62 | void setupkeys(void) | 63 | static void setupkeys(void) |
63 | { | 64 | { |
64 | options.UP=getbutton ("Press Up"); | 65 | options.UP=getbutton ("Press Up"); |
65 | options.DOWN=getbutton ("Press Down"); | 66 | options.DOWN=getbutton ("Press Down"); |
@@ -348,7 +349,7 @@ static void do_opt_menu(void) | |||
348 | }; | 349 | }; |
349 | 350 | ||
350 | #ifdef HAVE_LCD_COLOR | 351 | #ifdef HAVE_LCD_COLOR |
351 | static const struct opt_items fullscreen[]= { | 352 | static const struct opt_items scaling[]= { |
352 | { "Scaled", -1 }, | 353 | { "Scaled", -1 }, |
353 | { "Scaled - Maintain Ratio", -1 }, | 354 | { "Scaled - Maintain Ratio", -1 }, |
354 | #if (LCD_WIDTH>=160) && (LCD_HEIGHT>=144) | 355 | #if (LCD_WIDTH>=160) && (LCD_HEIGHT>=144) |
@@ -417,8 +418,8 @@ static void do_opt_menu(void) | |||
417 | break; | 418 | break; |
418 | #ifdef HAVE_LCD_COLOR | 419 | #ifdef HAVE_LCD_COLOR |
419 | case 4: /* Screen Size */ | 420 | case 4: /* Screen Size */ |
420 | rb->set_option(items[4].desc, &options.fullscreen, INT, fullscreen, | 421 | rb->set_option(items[4].desc, &options.scaling, INT, scaling, |
421 | sizeof(fullscreen)/sizeof(*fullscreen), NULL ); | 422 | sizeof(scaling)/sizeof(*scaling), NULL ); |
422 | setvidmode(); | 423 | setvidmode(); |
423 | break; | 424 | break; |
424 | case 5: /* Screen rotate */ | 425 | case 5: /* Screen rotate */ |