diff options
| author | Rani Hod <raenye@gmail.com> | 2006-07-31 19:13:21 +0000 |
|---|---|---|
| committer | Rani Hod <raenye@gmail.com> | 2006-07-31 19:13:21 +0000 |
| commit | cc839a26711069399ec86cdb63b2d246fa3395d2 (patch) | |
| tree | ded3154dc6447cc92e44c974fe6f40c558ff4d12 /apps/settings.c | |
| parent | 14313485f76767f21fcd241d55f7cdb36167d6bf (diff) | |
| download | rockbox-cc839a26711069399ec86cdb63b2d246fa3395d2.zip rockbox-cc839a26711069399ec86cdb63b2d246fa3395d2.tar.gz rockbox-cc839a26711069399ec86cdb63b2d246fa3395d2.tar.bz2 rockbox-cc839a26711069399ec86cdb63b2d246fa3395d2.tar.xz | |
Applied FS#5734 by Michael Sevakis (X5 LCD contrast bugfix and
some #define fixup).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10388 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
| -rw-r--r-- | apps/settings.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/settings.c b/apps/settings.c index b6d84d5..673b8fe 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -240,8 +240,8 @@ static const struct bit_entry rtc_bits[] = {32 | SIGNED, S_O(resume_seed), -1, NULL, NULL }, {3, S_O(repeat_mode), REPEAT_ALL, "repeat", "off,all,one,shuffle,ab" }, /* LCD */ -#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) - {6, S_O(contrast), 40, "contrast", NULL }, +#ifdef HAVE_LCD_CONTRAST + {6, S_O(contrast), DEFAULT_CONTRAST_SETTING, "contrast", NULL }, #endif #ifdef CONFIG_BACKLIGHT {5, S_O(backlight_timeout), 5, "backlight timeout", backlight_times_conf }, @@ -1017,7 +1017,7 @@ void settings_apply(void) audio_set_buffer_margin(global_settings.buffer_margin); -#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) +#ifdef HAVE_LCD_CONTRAST lcd_set_contrast(global_settings.contrast); #endif lcd_scroll_speed(global_settings.scroll_speed); @@ -1263,7 +1263,7 @@ void settings_load(int which) RTC_BLOCK_SIZE*8); } -#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) +#ifdef HAVE_LCD_CONTRAST if ( global_settings.contrast < MIN_CONTRAST_SETTING ) global_settings.contrast = lcd_default_contrast(); #endif @@ -1728,7 +1728,7 @@ void settings_reset(void) { global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE); global_settings.superbass = sound_default(SOUND_SUPERBASS); #endif -#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) +#ifdef HAVE_LCD_CONTRAST global_settings.contrast = lcd_default_contrast(); #endif #ifdef HAVE_LCD_REMOTE |