summaryrefslogtreecommitdiff
path: root/apps/main.c
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-09-20 08:07:51 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-09-20 08:07:51 +0000
commitbed3d3f7e06c6582f9677ab6222cd89c84a9c8c7 (patch)
tree59ef1faa129f0813071d5e81b2e55b5d04886202 /apps/main.c
parenteb5cc653dba373f2d2ce48f8efbc0b19a424971e (diff)
downloadrockbox-bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7.tar.gz
rockbox-bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7.zip
New full ISO-8859-1 system font.
Added font loading from dir browser. Changed default font location to /.rockbox/default.fnt. Code-policed font code. Removed old font tools. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2347 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main.c')
-rw-r--r--apps/main.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/main.c b/apps/main.c
index 4b8c9e1e7e..b13e5448b9 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -68,6 +68,7 @@ void init(void)
68 show_logo(); 68 show_logo();
69 settings_reset(); 69 settings_reset();
70 settings_load(); 70 settings_load();
71 font_load(ROCKBOX_DIR "/default.fon");
71 sleep(HZ/2); 72 sleep(HZ/2);
72} 73}
73 74
@@ -89,10 +90,7 @@ void init(void)
89 90
90 lcd_init(); 91 lcd_init();
91 92
92 // FIXME should call font_init before this, 93 font_init();
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(); 94 show_logo();
97 95
98#ifdef DEBUG 96#ifdef DEBUG
@@ -148,6 +146,7 @@ void init(void)
148 } 146 }
149 147
150 settings_load(); 148 settings_load();
149 font_load(ROCKBOX_DIR "/default.fon");
151 150
152 mpeg_init( global_settings.volume, 151 mpeg_init( global_settings.volume,
153 global_settings.bass, 152 global_settings.bass,
@@ -160,7 +159,6 @@ void init(void)
160 status_init(); 159 status_init();
161 usb_start_monitoring(); 160 usb_start_monitoring();
162 power_init(); 161 power_init();
163 font_init();
164} 162}
165 163
166int main(void) 164int main(void)