devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Shorten settings_skins_apply() and correct some checks.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24817 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-02-21 20:34:32 +00:00
parent ec0ca10ddf
commit 3ff2565e33
1 changed files with 36 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

59
apps/settings.c
View file

@ -748,57 +748,52 @@ void settings_apply_skins(void)
char buf[MAX_PATH]; char buf[MAX_PATH];
/* re-initialize the skin buffer before we start reloading skins */ /* re-initialize the skin buffer before we start reloading skins */
skin_buffer_init(); skin_buffer_init();
int i;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
skin_backdrop_init(); skin_backdrop_init();
skin_font_init(); skin_font_init();
if ( global_settings.sbs_file[0] && FOR_NB_SCREENS(i)
global_settings.sbs_file[0] != 0xff )
{ {
snprintf(buf, sizeof buf, SBS_DIR "/%s.sbs", const char* setting;
global_settings.sbs_file); #ifdef HAVE_REMOTE_LCD
sb_skin_data_load(SCREEN_MAIN, buf, true); if (i == SCREEN_REMOTE)
setting = global_settings.rsbs_file;
else
#endif
setting = global_settings.sbs_file;
if (setting[0] && setting[0] != '-')
{
snprintf(buf, sizeof buf, SBS_DIR "/%s.%ssbs", setting,
i == SCREEN_MAIN? "" : "r");
sb_skin_data_load(i, buf, true);
} }
else else
{ {
sb_skin_data_load(SCREEN_MAIN, NULL, true); sb_skin_data_load(i, NULL, true);
}
} }
#endif #endif
if ( global_settings.wps_file[0] && FOR_NB_SCREENS(i)
global_settings.wps_file[0] != 0xff )
{ {
snprintf(buf, sizeof buf, WPS_DIR "/%s.wps", const char* setting = global_settings.wps_file;
global_settings.wps_file); #ifdef HAVE_REMOTE_LCD
if (i == SCREEN_REMOTE)
setting = global_settings.rsbs_file;
#endif
if (setting[0] && setting[0] != '-')
{
snprintf(buf, sizeof buf, WPS_DIR "/%s.%swps", setting,
i == SCREEN_MAIN? "" : "r");
wps_data_load(SCREEN_MAIN, buf, true); wps_data_load(SCREEN_MAIN, buf, true);
} }
else else
{ {
wps_data_load(SCREEN_MAIN, NULL, true); wps_data_load(SCREEN_MAIN, NULL, true);
} }
#if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
if ( global_settings.rsbs_file[0] &&
global_settings.rsbs_file[0] != 0xff ) {
snprintf(buf, sizeof buf, SBS_DIR "/%s.rsbs",
global_settings.rsbs_file);
sb_skin_data_load(SCREEN_REMOTE, buf, true);
} }
else
{
sb_skin_data_load(SCREEN_REMOTE, NULL, true);
}
if ( global_settings.rwps_file[0])
{
snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
global_settings.rwps_file);
wps_data_load(SCREEN_REMOTE, buf, true);
}
else
{
wps_data_load(SCREEN_REMOTE, NULL, true);
}
#endif
viewportmanager_theme_changed(THEME_STATUSBAR); viewportmanager_theme_changed(THEME_STATUSBAR);
#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 #if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
int i;
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
screens[i].backdrop_show(sb_get_backdrop(i)); screens[i].backdrop_show(sb_get_backdrop(i));
#endif #endif