summaryrefslogtreecommitdiffstats
path: root/apps/menus/display_menu.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-01-26 23:21:49 +0000
committerThomas Martitz <kugel@rockbox.org>2009-01-26 23:21:49 +0000
commit12a0ed3b8dd5d8996abf827115f526e21e838872 (patch)
tree00ec62e04cf0e4bc4ea9c7bc0f5b8893e198c7cd /apps/menus/display_menu.c
parent4e1b7bf7286c3994e34ca11f740a2165d9b5a001 (diff)
downloadrockbox-12a0ed3b8dd5d8996abf827115f526e21e838872.tar.gz
rockbox-12a0ed3b8dd5d8996abf827115f526e21e838872.tar.bz2
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/menus/display_menu.c')
-rw-r--r--apps/menus/display_menu.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 488b0ff570..dbc7206b91 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -91,9 +91,8 @@ MENUITEM_SETTING(backlight_on_button_hold,
&global_settings.backlight_on_button_hold, NULL);
#endif
MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL);
-#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
- defined(USE_BACKLIGHT_SW_FADING) || \
- defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
+#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \
+ || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL);
MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL);
#endif
@@ -132,9 +131,8 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
,&backlight_on_button_hold
# endif
,&caption_backlight
-#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
- defined(USE_BACKLIGHT_SW_FADING) || \
- defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
+#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \
+ || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
,&backlight_fade_in, &backlight_fade_out
#endif
,&bl_filter_first_keypress