diff options
author | Steve Bavin <pondlife@pondlife.me> | 2008-11-26 08:26:13 +0000 |
---|---|---|
committer | Steve Bavin <pondlife@pondlife.me> | 2008-11-26 08:26:13 +0000 |
commit | f6847265804b650b007eb8ecdc86876214ee7302 (patch) | |
tree | 5f92d0097167f2e5c257b42427fd182e704ae4c1 /apps/menus/display_menu.c | |
parent | 756bcc4bd53b34371c073c8468cbd8c01ffe094a (diff) | |
download | rockbox-f6847265804b650b007eb8ecdc86876214ee7302.tar.gz rockbox-f6847265804b650b007eb8ecdc86876214ee7302.zip |
Add software backlight fading for E100/H300/X5/D2, by Thomas Martitz and others - see FS#6800 for credits.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19221 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/display_menu.c')
-rw-r--r-- | apps/menus/display_menu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 016255bad1..744a9e9354 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -91,7 +91,8 @@ MENUITEM_SETTING(backlight_on_button_hold, | |||
91 | &global_settings.backlight_on_button_hold, NULL); | 91 | &global_settings.backlight_on_button_hold, NULL); |
92 | #endif | 92 | #endif |
93 | MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL); | 93 | MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL); |
94 | #if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR) | 94 | #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \ |
95 | defined(USE_BACKLIGHT_SW_FADING) | ||
95 | MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL); | 96 | MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL); |
96 | MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL); | 97 | MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL); |
97 | #endif | 98 | #endif |
@@ -130,9 +131,10 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | |||
130 | ,&backlight_on_button_hold | 131 | ,&backlight_on_button_hold |
131 | # endif | 132 | # endif |
132 | ,&caption_backlight | 133 | ,&caption_backlight |
133 | # if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR) | 134 | #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \ |
135 | defined(USE_BACKLIGHT_SW_FADING) | ||
134 | ,&backlight_fade_in, &backlight_fade_out | 136 | ,&backlight_fade_in, &backlight_fade_out |
135 | # endif | 137 | #endif |
136 | ,&bl_filter_first_keypress | 138 | ,&bl_filter_first_keypress |
137 | # ifdef HAVE_LCD_SLEEP_SETTING | 139 | # ifdef HAVE_LCD_SLEEP_SETTING |
138 | ,&lcd_sleep_after_backlight_off | 140 | ,&lcd_sleep_after_backlight_off |