diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-01-29 07:52:13 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-01-29 07:52:13 +0000 |
| commit | eee5423fe10f247f74d69404924edf3a0d54e8cd (patch) | |
| tree | df46391368a2ad7930a926c59f53796229a933ab /apps/settings.c | |
| parent | e3e436e2b5519637981b2667f79c42b2e4ed110b (diff) | |
| download | rockbox-eee5423fe10f247f74d69404924edf3a0d54e8cd.zip rockbox-eee5423fe10f247f74d69404924edf3a0d54e8cd.tar.gz rockbox-eee5423fe10f247f74d69404924edf3a0d54e8cd.tar.bz2 rockbox-eee5423fe10f247f74d69404924edf3a0d54e8cd.tar.xz | |
skin rework (FS#10922) notable changes:
- simplify the setting/skin relationship. settings are used as the fallback if it's not specified in the skin
- backdrop buffers are now in the skin buffer (which has also increased slightly to accomodate 1 backdrop for each skin and 2 full colour screens for bmps (up for 1.5))
- if no %X is specified in a skin then the backdrop setting will be used. use %Xd to explicitly disable a skin from displaying a backdrop
- the base skin can now specify a backdrop.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24366 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
| -rw-r--r-- | apps/settings.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/apps/settings.c b/apps/settings.c index 8d1bcf7..1b16e9f 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -63,7 +63,6 @@ #include "settings_list.h" #include "filetypes.h" #include "option_select.h" -#include "backdrop.h" #if CONFIG_TUNER #include "radio.h" #endif @@ -796,9 +795,6 @@ void settings_apply(bool read_disk) #if CONFIG_CODEC == SWCODEC int i; #endif -#if LCD_DEPTH > 1 - int screen; -#endif sound_settings_apply(); #ifdef HAVE_DISK_STORAGE @@ -907,23 +903,6 @@ void settings_apply(bool read_disk) load_kbd(NULL); #endif - -#if LCD_DEPTH > 1 - if ( global_settings.backdrop_file[0] && - global_settings.backdrop_file[0] != 0xff ) { - snprintf(buf, sizeof buf, BACKDROP_DIR "/%s.bmp", - global_settings.backdrop_file); - backdrop_load(BACKDROP_MAIN, buf); - } else { - backdrop_unload(BACKDROP_MAIN); - } -#endif - -#if LCD_DEPTH > 1 - FOR_NB_SCREENS(screen) - screens[screen].backdrop_show(BACKDROP_MAIN); -#endif - if ( global_settings.lang_file[0]) { snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", global_settings.lang_file); |