diff options
Diffstat (limited to 'apps/app.c')
-rw-r--r-- | apps/app.c | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/apps/app.c b/apps/app.c index c5149d8171..7493f6bcd4 100644 --- a/apps/app.c +++ b/apps/app.c | |||
@@ -25,27 +25,36 @@ | |||
25 | /* Apps to include */ | 25 | /* Apps to include */ |
26 | #include "tree.h" | 26 | #include "tree.h" |
27 | 27 | ||
28 | #ifdef HAVE_LCD_BITMAP | 28 | /* Wait on a key press. Return the key pressed */ |
29 | int busy_wait(void) | ||
30 | { | ||
31 | int key; | ||
29 | 32 | ||
30 | /*#include "screensaver.h"*/ | 33 | while(1) { |
34 | key = button_get(); | ||
35 | |||
36 | if(!key) | ||
37 | sleep(1); | ||
38 | else | ||
39 | break; | ||
40 | } | ||
31 | 41 | ||
32 | /*extern void tetris(void);*/ | 42 | return key; |
43 | } | ||
33 | 44 | ||
45 | #ifdef HAVE_LCD_BITMAP | ||
34 | void app_main(void) | 46 | void app_main(void) |
35 | { | 47 | { |
36 | int key; | 48 | int key; |
37 | 49 | ||
50 | show_splash(); | ||
51 | |||
38 | menu_init(); | 52 | menu_init(); |
39 | menu_draw(); | 53 | menu_draw(); |
40 | put_cursor_menu_top(); | 54 | put_cursor_menu_top(); |
41 | 55 | ||
42 | while(1) { | 56 | while(1) { |
43 | key = button_get(); | 57 | key = busy_wait(); |
44 | |||
45 | if(!key) { | ||
46 | sleep(1); | ||
47 | continue; | ||
48 | } | ||
49 | 58 | ||
50 | switch(key) { | 59 | switch(key) { |
51 | case BUTTON_UP: | 60 | case BUTTON_UP: |
@@ -94,11 +103,14 @@ void app_main(void) | |||
94 | int key; | 103 | int key; |
95 | int cursor = 0; | 104 | int cursor = 0; |
96 | 105 | ||
97 | lcd_puts(0,0, "Mooo!"); | 106 | show_splash(); |
98 | lcd_puts(1,1, " Rockbox!"); | ||
99 | 107 | ||
100 | browse_root(); | 108 | browse_root(); |
101 | 109 | ||
102 | } | 110 | } |
103 | 111 | ||
104 | #endif | 112 | #endif |
113 | |||
114 | |||
115 | |||
116 | |||