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/onplay.c | |
parent | e3e436e2b5519637981b2667f79c42b2e4ed110b (diff) | |
download | rockbox-eee5423fe10f247f74d69404924edf3a0d54e8cd.tar.gz rockbox-eee5423fe10f247f74d69404924edf3a0d54e8cd.zip |
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/onplay.c')
-rw-r--r-- | apps/onplay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index c7b0f7ac7d..8bb71e1555 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #include "tagtree.h" | 61 | #include "tagtree.h" |
62 | #endif | 62 | #endif |
63 | #include "cuesheet.h" | 63 | #include "cuesheet.h" |
64 | #include "backdrop.h" | 64 | #include "statusbar-skinned.h" |
65 | #include "pitchscreen.h" | 65 | #include "pitchscreen.h" |
66 | #include "viewport.h" | 66 | #include "viewport.h" |
67 | 67 | ||
@@ -589,16 +589,16 @@ static bool delete_dir(void) | |||
589 | static bool set_backdrop(void) | 589 | static bool set_backdrop(void) |
590 | { | 590 | { |
591 | /* load the image */ | 591 | /* load the image */ |
592 | if(backdrop_load(BACKDROP_MAIN, selected_file)) { | 592 | if(sb_set_backdrop(SCREEN_MAIN, selected_file)) { |
593 | splash(HZ, str(LANG_BACKDROP_LOADED)); | 593 | splash(HZ, str(LANG_BACKDROP_LOADED)); |
594 | set_file(selected_file, (char *)global_settings.backdrop_file, | 594 | set_file(selected_file, (char *)global_settings.backdrop_file, |
595 | MAX_FILENAME); | 595 | MAX_FILENAME); |
596 | backdrop_show(BACKDROP_MAIN); | ||
597 | return true; | 596 | return true; |
598 | } else { | 597 | } else { |
599 | splash(HZ, str(LANG_BACKDROP_FAILED)); | 598 | splash(HZ, str(LANG_BACKDROP_FAILED)); |
600 | return false; | 599 | return false; |
601 | } | 600 | } |
601 | return true; | ||
602 | } | 602 | } |
603 | #endif | 603 | #endif |
604 | 604 | ||