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.zip
rockbox-bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7.tar.gz
rockbox-bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7.tar.bz2
rockbox-bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7.tar.xz
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 4b8c9e1..b13e544 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -68,6 +68,7 @@ void init(void)
show_logo();
settings_reset();
settings_load();
+ font_load(ROCKBOX_DIR "/default.fon");
sleep(HZ/2);
}
@@ -89,10 +90,7 @@ void init(void)
lcd_init();
- // FIXME should call font_init before this,
- // because may use loadable font in show_logo().
- // I didn't call font_init here, since
- // disk system isn't up yet.
+ font_init();
show_logo();
#ifdef DEBUG
@@ -148,6 +146,7 @@ void init(void)
}
settings_load();
+ font_load(ROCKBOX_DIR "/default.fon");
mpeg_init( global_settings.volume,
global_settings.bass,
@@ -160,7 +159,6 @@ void init(void)
status_init();
usb_start_monitoring();
power_init();
- font_init();
}
int main(void)