diff options
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 3618c16aa2..c855c70e10 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -671,15 +671,14 @@ const struct settings_list settings[] = { | |||
671 | OFFON_SETTING(0, remote_caption_backlight, LANG_CAPTION_BACKLIGHT, | 671 | OFFON_SETTING(0, remote_caption_backlight, LANG_CAPTION_BACKLIGHT, |
672 | false, "remote caption backlight", NULL), | 672 | false, "remote caption backlight", NULL), |
673 | #endif | 673 | #endif |
674 | #endif /* HAVE_BACKLIGHT */ | ||
675 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 674 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
676 | INT_SETTING(F_NO_WRAP, brightness, LANG_BRIGHTNESS, | 675 | INT_SETTING(F_NO_WRAP, brightness, LANG_BRIGHTNESS, |
677 | DEFAULT_BRIGHTNESS_SETTING, "brightness",UNIT_INT, | 676 | DEFAULT_BRIGHTNESS_SETTING, "brightness",UNIT_INT, |
678 | MIN_BRIGHTNESS_SETTING, MAX_BRIGHTNESS_SETTING, 1, | 677 | MIN_BRIGHTNESS_SETTING, MAX_BRIGHTNESS_SETTING, 1, |
679 | NULL, NULL, backlight_set_brightness), | 678 | NULL, NULL, backlight_set_brightness), |
680 | #endif | 679 | #endif |
681 | #if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR) | ||
682 | /* backlight fading */ | 680 | /* backlight fading */ |
681 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) | ||
683 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, backlight_fade_in, | 682 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, backlight_fade_in, |
684 | LANG_BACKLIGHT_FADE_IN, 300, "backlight fade in", "off", | 683 | LANG_BACKLIGHT_FADE_IN, 300, "backlight fade in", "off", |
685 | UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off, | 684 | UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off, |
@@ -689,13 +688,13 @@ const struct settings_list settings[] = { | |||
689 | UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off, | 688 | UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off, |
690 | backlight_set_fade_out, 10, | 689 | backlight_set_fade_out, 10, |
691 | 0,100,200,300,500,1000,2000,3000,5000,10000), | 690 | 0,100,200,300,500,1000,2000,3000,5000,10000), |
692 | #elif defined(USE_BACKLIGHT_SW_FADING) \ | 691 | #elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) |
693 | || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
694 | OFFON_SETTING(0, backlight_fade_in, LANG_BACKLIGHT_FADE_IN, | 692 | OFFON_SETTING(0, backlight_fade_in, LANG_BACKLIGHT_FADE_IN, |
695 | true, "backlight fade in", backlight_set_fade_in), | 693 | true, "backlight fade in", backlight_set_fade_in), |
696 | OFFON_SETTING(0, backlight_fade_out, LANG_BACKLIGHT_FADE_OUT, | 694 | OFFON_SETTING(0, backlight_fade_out, LANG_BACKLIGHT_FADE_OUT, |
697 | true, "backlight fade out", backlight_set_fade_out), | 695 | true, "backlight fade out", backlight_set_fade_out), |
698 | #endif | 696 | #endif |
697 | #endif /* HAVE_BACKLIGHT */ | ||
699 | INT_SETTING(F_PADTITLE, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed", | 698 | INT_SETTING(F_PADTITLE, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed", |
700 | UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed), | 699 | UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed), |
701 | INT_SETTING(F_PADTITLE, scroll_delay, LANG_SCROLL_DELAY, 1000, | 700 | INT_SETTING(F_PADTITLE, scroll_delay, LANG_SCROLL_DELAY, 1000, |