summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-04-12 22:12:13 +0000
committerJens Arnold <amiconn@rockbox.org>2007-04-12 22:12:13 +0000
commit47bf6c5a5ad1fd9143ab87328793b285230f74a3 (patch)
tree5199f2225a3dfc438bb1c4c5e9906f14664dfa43 /apps/settings.c
parent734278b7d1fde5e177c6842f49c16b9df8c353fa (diff)
downloadrockbox-47bf6c5a5ad1fd9143ab87328793b285230f74a3.tar.gz
rockbox-47bf6c5a5ad1fd9143ab87328793b285230f74a3.zip
Moved archos backlight code to target tree. Changed old mutlivalue CONFIG_BACKLIGHT to a simple HAVE_BACKLIGHT.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13136 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c
index b6eb9a4f64..23b81173bd 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -699,7 +699,7 @@ void settings_apply(void)
699 remote_backlight_set_on_button_hold(global_settings.remote_backlight_on_button_hold); 699 remote_backlight_set_on_button_hold(global_settings.remote_backlight_on_button_hold);
700#endif 700#endif
701#endif /* HAVE_REMOTE_LCD */ 701#endif /* HAVE_REMOTE_LCD */
702#if CONFIG_BACKLIGHT 702#ifdef HAVE_BACKLIGHT
703 backlight_set_timeout(global_settings.backlight_timeout); 703 backlight_set_timeout(global_settings.backlight_timeout);
704#if CONFIG_CHARGING 704#if CONFIG_CHARGING
705 backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged); 705 backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged);
@@ -836,7 +836,7 @@ void settings_apply(void)
836 spdif_power_enable(global_settings.spdif_enable); 836 spdif_power_enable(global_settings.spdif_enable);
837#endif 837#endif
838 838
839#if CONFIG_BACKLIGHT 839#ifdef HAVE_BACKLIGHT
840 set_backlight_filter_keypress(global_settings.bl_filter_first_keypress); 840 set_backlight_filter_keypress(global_settings.bl_filter_first_keypress);
841#ifdef HAVE_REMOTE_LCD 841#ifdef HAVE_REMOTE_LCD
842 set_remote_backlight_filter_keypress(global_settings.remote_bl_filter_first_keypress); 842 set_remote_backlight_filter_keypress(global_settings.remote_bl_filter_first_keypress);
@@ -847,7 +847,7 @@ void settings_apply(void)
847#ifdef HAVE_LCD_SLEEP 847#ifdef HAVE_LCD_SLEEP
848 lcd_set_sleep_after_backlight_off(global_settings.lcd_sleep_after_backlight_off); 848 lcd_set_sleep_after_backlight_off(global_settings.lcd_sleep_after_backlight_off);
849#endif 849#endif
850#endif /* CONFIG_BACKLIGHT */ 850#endif /* HAVE_BACKLIGHT */
851 851
852 /* This should stay last */ 852 /* This should stay last */
853#if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC 853#if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC