diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-01-26 23:21:49 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-01-26 23:21:49 +0000 |
commit | 12a0ed3b8dd5d8996abf827115f526e21e838872 (patch) | |
tree | 00ec62e04cf0e4bc4ea9c7bc0f5b8893e198c7cd /apps/settings.h | |
parent | 4e1b7bf7286c3994e34ca11f740a2165d9b5a001 (diff) | |
download | rockbox-12a0ed3b8dd5d8996abf827115f526e21e838872.tar.gz rockbox-12a0ed3b8dd5d8996abf827115f526e21e838872.zip |
Commit FS#9724, which reworks the preprocessor defines related to backlight fading to a CONFIG_BACKLIGHT_FADING style. The apps/ code will only see which setting is supposed to be used, specific backlight fading handling is kept in firmware, slightly reword the manual text about software fading too with regards to the Gigabeat S
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19860 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.h')
-rw-r--r-- | apps/settings.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/settings.h b/apps/settings.h index efa50f78dd..50c53718f7 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -681,11 +681,10 @@ struct user_settings | |||
681 | int lcd_sleep_after_backlight_off; /* when to put lcd to sleep after backlight | 681 | int lcd_sleep_after_backlight_off; /* when to put lcd to sleep after backlight |
682 | has turned off */ | 682 | has turned off */ |
683 | #endif | 683 | #endif |
684 | #if defined(HAVE_BACKLIGHT_PWM_FADING) | 684 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) |
685 | int backlight_fade_in; /* backlight fade in timing: 0..3 */ | 685 | int backlight_fade_in; /* backlight fade in timing: 0..3 */ |
686 | int backlight_fade_out; /* backlight fade in timing: 0..7 */ | 686 | int backlight_fade_out; /* backlight fade in timing: 0..7 */ |
687 | #elif defined(USE_BACKLIGHT_SW_FADING) \ | 687 | #elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) |
688 | || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
689 | bool backlight_fade_in; | 688 | bool backlight_fade_in; |
690 | bool backlight_fade_out; | 689 | bool backlight_fade_out; |
691 | #endif | 690 | #endif |