len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FS#12273 - use buflib for font storage. thanks to the testers :)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30589 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2011-09-24 13:19:34 +00:00
parent f323300b82
commit aa0f4a4bbe
37 changed files with 410 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

46
apps/settings.c
View file

@ -876,30 +876,38 @@ void settings_apply(bool read_disk)
/* fonts need to be loaded before the WPS */
if (global_settings.font_file[0]
&& global_settings.font_file[0] != '-') {
const char* loaded_font = font_filename(global_status.font_id[SCREEN_MAIN]);
snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt",
global_settings.font_file);
CHART2(">font_load ", global_settings.font_file);
rc = font_load(NULL, buf);
CHART2("<font_load ", global_settings.font_file);
if (rc < 0)
font_reset(NULL);
if (!loaded_font || strcmp(loaded_font, buf))
{
CHART2(">font_load ", global_settings.font_file);
if (global_status.font_id[SCREEN_MAIN] >= 0)
font_unload(global_status.font_id[SCREEN_MAIN]);
rc = font_load(buf);
CHART2("<font_load ", global_settings.font_file);
global_status.font_id[SCREEN_MAIN] = rc;
lcd_setfont(rc);
}
}
else
font_reset(NULL);
#ifdef HAVE_REMOTE_LCD
if ( global_settings.remote_font_file[0]
&& global_settings.remote_font_file[0] != '-') {
const char* loaded_font = font_filename(global_status.font_id[SCREEN_REMOTE]);
snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt",
global_settings.remote_font_file);
CHART2(">font_load_remoteui ", global_settings.remote_font_file);
rc = font_load_remoteui(buf);
CHART2("<font_load_remoteui ", global_settings.remote_font_file);
if (rc < 0)
font_load_remoteui(NULL);
if (!loaded_font || strcmp(loaded_font, buf))
{
CHART2(">font_load_remoteui ", global_settings.remote_font_file);
if (global_status.font_id[SCREEN_REMOTE] >= 0)
font_unload(global_status.font_id[SCREEN_REMOTE]);
rc = font_load(buf);
CHART2("<font_load_remoteui ", global_settings.remote_font_file);
global_status.font_id[SCREEN_REMOTE] = rc;
lcd_remote_setfont(rc);
}
}
else
font_load_remoteui(NULL);
#endif
if ( global_settings.kbd_file[0]
&& global_settings.kbd_file[0] != '-') {
@ -1070,6 +1078,16 @@ void settings_reset(void)
#if defined (HAVE_RECORDING) && CONFIG_CODEC == SWCODEC
enc_global_settings_reset();
#endif
#ifdef HAVE_LCD_BITMAP
FOR_NB_SCREENS(i)
{
if (global_status.font_id[i] > FONT_SYSFIXED)
{
font_unload(global_status.font_id[i]);
global_status.font_id[i] = FONT_SYSFIXED;
}
}
#endif
}
/** Changing setting values **/