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 /apps | |
| parent | a8956265167c341cb4d5607b8181b58f1e88a92b (diff) | |
credits and version merged
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@844 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -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[] = { #define DISPLAY_TIME HZ #endif -void show_credits(void) +void roll_credits(void) { unsigned int i; int j; int line = 0; lcd_clear_display(); + #ifdef HAVE_LCD_BITMAP lcd_setmargins(0,9); #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 @@ #define __ROCKBOX_CREDITS_H__ /* Show who worked on the project */ -void show_credits(void); +void roll_credits(void); #endif 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 ) return 0; } -void show_splash(void) +void show_credits(void) { - if (show_logo() != 0) - return; + int j = 0; - button_get(true); + show_logo(); + + for (j = 0; j < 10; j++) { + sleep((HZ*2)/10); + + if (button_get(false)) + return; + } + + roll_credits(); } void main_menu(void) { int m; enum { - Tetris, Screen_Saver, Splash, Credits, Sound + Tetris, Screen_Saver, Version, Sound }; /* main menu */ @@ -104,14 +112,10 @@ void main_menu(void) { Tetris, "Tetris", tetris }, { Screen_Saver, "Screen Saver", screensaver }, #endif - { Splash, "Splash", show_splash }, - { Credits, "Credits", show_credits }, + { Version, "Version", show_credits }, }; m=menu_init( items, sizeof items / sizeof(struct menu_items) ); menu_run(m); menu_exit(m); } - - - |