diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-12-09 07:25:46 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-12-09 07:25:46 +0000 |
commit | b2eb44ce0eb24632a46b0ea8c8c46a8f2ba35e24 (patch) | |
tree | ff3c0e14e9a53c08749ee1f233a5b1e887d3561a /apps/main.c | |
parent | 85aad9b3972208b0e34ba0241ebb5314118ae05e (diff) | |
download | rockbox-b2eb44ce0eb24632a46b0ea8c8c46a8f2ba35e24.tar.gz rockbox-b2eb44ce0eb24632a46b0ea8c8c46a8f2ba35e24.zip |
FS#10824 - viewport/statusbar API rework.
Hopefully the only user visible changes are:
- fm and recording screens go by the statusbar setting (sbs or inbuilt)
- plugins go back to using the theme as they should for menus and lists
- splash screens might get cut a bit... entirely theme and splash dependant.. if there is a problematic one we can look at it later.
- hopefully nothing more than very minor screen flickerings... let me know exactly where they are so they can be fixed
New GUI screen rules:
* Screens assume that the theme (sbs+ui viewport+ maybe background image) are always enabled. They may be disabled on a per display basis, but MUST be re-enabled on exit
* Screens must not be coded in a way that requires a statusbar of any type.. the inbuilt bar will be removed shortly.
ALWAYS RESPECT THE USERS SETTINGS unless the screen requires the full display to fit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23904 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/main.c b/apps/main.c index 3e98343708..6d2609b486 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -329,7 +329,7 @@ static void init(void) | |||
329 | storage_init(); | 329 | storage_init(); |
330 | settings_reset(); | 330 | settings_reset(); |
331 | settings_load(SETTINGS_ALL); | 331 | settings_load(SETTINGS_ALL); |
332 | settings_apply(true); | 332 | settings_apply(false); |
333 | init_dircache(true); | 333 | init_dircache(true); |
334 | init_dircache(false); | 334 | init_dircache(false); |
335 | #ifdef HAVE_TAGCACHE | 335 | #ifdef HAVE_TAGCACHE |
@@ -367,6 +367,8 @@ static void init(void) | |||
367 | 367 | ||
368 | audio_init(); | 368 | audio_init(); |
369 | button_clear_queue(); /* Empty the keyboard buffer */ | 369 | button_clear_queue(); /* Empty the keyboard buffer */ |
370 | |||
371 | settings_apply(true); | ||
370 | } | 372 | } |
371 | 373 | ||
372 | #else | 374 | #else |
@@ -560,7 +562,7 @@ static void init(void) | |||
560 | #endif | 562 | #endif |
561 | } | 563 | } |
562 | 564 | ||
563 | settings_apply(true); | 565 | settings_apply(false); |
564 | init_dircache(false); | 566 | init_dircache(false); |
565 | #ifdef HAVE_TAGCACHE | 567 | #ifdef HAVE_TAGCACHE |
566 | init_tagcache(); | 568 | init_tagcache(); |
@@ -625,6 +627,8 @@ static void init(void) | |||
625 | #ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN | 627 | #ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN |
626 | check_bootfile(false); /* remember write time and filesize */ | 628 | check_bootfile(false); /* remember write time and filesize */ |
627 | #endif | 629 | #endif |
630 | |||
631 | settings_apply(true); | ||
628 | } | 632 | } |
629 | 633 | ||
630 | #ifdef CPU_PP | 634 | #ifdef CPU_PP |