diff options
author | Robert Hak <adiamas@rockbox.org> | 2002-05-31 08:12:29 +0000 |
---|---|---|
committer | Robert Hak <adiamas@rockbox.org> | 2002-05-31 08:12:29 +0000 |
commit | 65379df4451fa906e1dfee6bf7100c4555be831a (patch) | |
tree | 5a9afe226f3d97045368b76012a6f0c2a36ef16d | |
parent | a8956265167c341cb4d5607b8181b58f1e88a92b (diff) | |
download | rockbox-65379df4451fa906e1dfee6bf7100c4555be831a.tar.gz rockbox-65379df4451fa906e1dfee6bf7100c4555be831a.zip |
credits and version merged
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@844 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/credits.c | 3 | ||||
-rw-r--r-- | apps/credits.h | 2 | ||||
-rw-r--r-- | apps/main_menu.c | 24 |
3 files changed, 17 insertions, 12 deletions
diff --git a/apps/credits.c b/apps/credits.c index aff5ae3bc8..005ad742bc 100644 --- a/apps/credits.c +++ b/apps/credits.c | |||
@@ -58,13 +58,14 @@ struct credit credits[] = { | |||
58 | #define DISPLAY_TIME HZ | 58 | #define DISPLAY_TIME HZ |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | void show_credits(void) | 61 | void roll_credits(void) |
62 | { | 62 | { |
63 | unsigned int i; | 63 | unsigned int i; |
64 | int j; | 64 | int j; |
65 | int line = 0; | 65 | int line = 0; |
66 | 66 | ||
67 | lcd_clear_display(); | 67 | lcd_clear_display(); |
68 | |||
68 | #ifdef HAVE_LCD_BITMAP | 69 | #ifdef HAVE_LCD_BITMAP |
69 | lcd_setmargins(0,9); | 70 | lcd_setmargins(0,9); |
70 | #endif | 71 | #endif |
diff --git a/apps/credits.h b/apps/credits.h index 36f16170cb..dd4b459326 100644 --- a/apps/credits.h +++ b/apps/credits.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #define __ROCKBOX_CREDITS_H__ | 21 | #define __ROCKBOX_CREDITS_H__ |
22 | 22 | ||
23 | /* Show who worked on the project */ | 23 | /* Show who worked on the project */ |
24 | void show_credits(void); | 24 | void roll_credits(void); |
25 | 25 | ||
26 | #endif | 26 | #endif |
27 | 27 | ||
diff --git a/apps/main_menu.c b/apps/main_menu.c index 2d369aebee..5ac3df2743 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -82,19 +82,27 @@ int show_logo( void ) | |||
82 | return 0; | 82 | return 0; |
83 | } | 83 | } |
84 | 84 | ||
85 | void show_splash(void) | 85 | void show_credits(void) |
86 | { | 86 | { |
87 | if (show_logo() != 0) | 87 | int j = 0; |
88 | return; | ||
89 | 88 | ||
90 | button_get(true); | 89 | show_logo(); |
90 | |||
91 | for (j = 0; j < 10; j++) { | ||
92 | sleep((HZ*2)/10); | ||
93 | |||
94 | if (button_get(false)) | ||
95 | return; | ||
96 | } | ||
97 | |||
98 | roll_credits(); | ||
91 | } | 99 | } |
92 | 100 | ||
93 | void main_menu(void) | 101 | void main_menu(void) |
94 | { | 102 | { |
95 | int m; | 103 | int m; |
96 | enum { | 104 | enum { |
97 | Tetris, Screen_Saver, Splash, Credits, Sound | 105 | Tetris, Screen_Saver, Version, Sound |
98 | }; | 106 | }; |
99 | 107 | ||
100 | /* main menu */ | 108 | /* main menu */ |
@@ -104,14 +112,10 @@ void main_menu(void) | |||
104 | { Tetris, "Tetris", tetris }, | 112 | { Tetris, "Tetris", tetris }, |
105 | { Screen_Saver, "Screen Saver", screensaver }, | 113 | { Screen_Saver, "Screen Saver", screensaver }, |
106 | #endif | 114 | #endif |
107 | { Splash, "Splash", show_splash }, | 115 | { Version, "Version", show_credits }, |
108 | { Credits, "Credits", show_credits }, | ||
109 | }; | 116 | }; |
110 | 117 | ||
111 | m=menu_init( items, sizeof items / sizeof(struct menu_items) ); | 118 | m=menu_init( items, sizeof items / sizeof(struct menu_items) ); |
112 | menu_run(m); | 119 | menu_run(m); |
113 | menu_exit(m); | 120 | menu_exit(m); |
114 | } | 121 | } |
115 | |||
116 | |||
117 | |||