diff options
author | Daniel Stenberg <daniel@haxx.se> | 2002-09-12 13:33:59 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2002-09-12 13:33:59 +0000 |
commit | 93b231c69366563ba441dc4907bfb036fe3b4c55 (patch) | |
tree | 0783ad028211f59e63925a354e4260a7209ffa24 /apps/main.c | |
parent | 5ed78ea80cdaa0ede4df89568f0781fa477a5738 (diff) | |
download | rockbox-93b231c69366563ba441dc4907bfb036fe3b4c55.tar.gz rockbox-93b231c69366563ba441dc4907bfb036fe3b4c55.zip |
Greg Haerr's new loadable font. No more #ifdef font-style, removed old
propfont and loadable font code. New font file format.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2269 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/apps/main.c b/apps/main.c index 22fd8f6051..4b8c9e1e7e 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -45,9 +45,7 @@ | |||
45 | #include "debug_menu.h" | 45 | #include "debug_menu.h" |
46 | #include "version.h" | 46 | #include "version.h" |
47 | #include "sprintf.h" | 47 | #include "sprintf.h" |
48 | #ifdef LOADABLE_FONTS | 48 | #include "font.h" |
49 | #include "unicode.h" | ||
50 | #endif | ||
51 | 49 | ||
52 | 50 | ||
53 | char appsversion[]=APPSVERSION; | 51 | char appsversion[]=APPSVERSION; |
@@ -65,10 +63,8 @@ void app_main(void) | |||
65 | void init(void) | 63 | void init(void) |
66 | { | 64 | { |
67 | init_threads(); | 65 | init_threads(); |
68 | #ifdef LOADABLE_FONTS | ||
69 | unicode_init(); | ||
70 | #endif | ||
71 | lcd_init(); | 66 | lcd_init(); |
67 | font_init(); | ||
72 | show_logo(); | 68 | show_logo(); |
73 | settings_reset(); | 69 | settings_reset(); |
74 | settings_load(); | 70 | settings_load(); |
@@ -93,6 +89,10 @@ void init(void) | |||
93 | 89 | ||
94 | lcd_init(); | 90 | lcd_init(); |
95 | 91 | ||
92 | // FIXME should call font_init before this, | ||
93 | // because may use loadable font in show_logo(). | ||
94 | // I didn't call font_init here, since | ||
95 | // disk system isn't up yet. | ||
96 | show_logo(); | 96 | show_logo(); |
97 | 97 | ||
98 | #ifdef DEBUG | 98 | #ifdef DEBUG |
@@ -160,10 +160,7 @@ void init(void) | |||
160 | status_init(); | 160 | status_init(); |
161 | usb_start_monitoring(); | 161 | usb_start_monitoring(); |
162 | power_init(); | 162 | power_init(); |
163 | #ifdef LOADABLE_FONTS | 163 | font_init(); |
164 | unicode_init(); | ||
165 | lcd_init_fonts(); | ||
166 | #endif | ||
167 | } | 164 | } |
168 | 165 | ||
169 | int main(void) | 166 | int main(void) |