Accepted FS #5474 by yours truly.

Save your settings; CONFIG_BLOCK_VERSION is increased.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10303 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 13 insertions, 8 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 8846fa4bcf..4dbd2bf3ac 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -94,7 +94,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
 #include "dsp.h"
 #endif
 
-#define CONFIG_BLOCK_VERSION 47
+#define CONFIG_BLOCK_VERSION 48
 #define CONFIG_BLOCK_SIZE 512
 #define RTC_BLOCK_SIZE 44
 
@@ -1260,7 +1260,7 @@ void settings_load(int which)
         }
 
         if ( global_settings.contrast < MIN_CONTRAST_SETTING )
-            global_settings.contrast = lcd_default_contrast();
+            global_settings.contrast = DEFAULT_CONTRAST_SETTING;
 
         i = 0xb8;
         strncpy((char *)global_settings.wps_file, (char *)&config_block[i],
@@ -1722,7 +1722,7 @@ void settings_reset(void) {
     global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE);
     global_settings.superbass = sound_default(SOUND_SUPERBASS);
 #endif
-    global_settings.contrast    = lcd_default_contrast();
+    global_settings.contrast    = DEFAULT_CONTRAST_SETTING;
 #ifdef HAVE_LCD_REMOTE
     global_settings.remote_contrast = lcd_remote_default_contrast();
 #endif
diff --git a/apps/settings.h b/apps/settings.h
index 8c47c9253e..51eaca3a51 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -570,6 +570,11 @@ extern const char rec_base_directory[];
 
 /* system defines */
 
+#ifdef IAUDIO_X5
+#define MIN_CONTRAST_SETTING        0
+#define MAX_CONTRAST_SETTING        29
+#define DEFAULT_CONTRAST_SETTING    15
+#else
 #ifdef HAVE_LCD_CHARCELLS
 #define MAX_CONTRAST_SETTING        31
 #define DEFAULT_CONTRAST_SETTING    30
@@ -578,7 +583,7 @@ extern const char rec_base_directory[];
 #define DEFAULT_CONTRAST_SETTING    38
 #endif
 #define MIN_CONTRAST_SETTING        5
-
+#endif // X5
 
 /* argument bits for settings_load() */
 #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 3e02727f9e..f088c3be3d 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -266,7 +266,7 @@ static bool remote_caption_backlight(void)
 }
 #endif /* HAVE_REMOTE_LCD */
 
-#ifndef HAVE_LCD_COLOR
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
 static bool contrast(void)
 {
     return set_int( str(LANG_CONTRAST), "", UNIT_INT,
@@ -1776,12 +1776,12 @@ static bool lcd_settings_menu(void)
         { ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in },
         { ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out },
 #endif
+        { ID2P(LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS), set_bl_filter_first_keypress },
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
-        { ID2P(LANG_BRIGHTNESS), brightness },
+        { ID2P(LANG_BRIGHTNESS),      brightness },
 #endif
-        { ID2P(LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS), set_bl_filter_first_keypress },
 #endif /* CONFIG_BACKLIGHT */
-#ifndef HAVE_LCD_COLOR
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
         { ID2P(LANG_CONTRAST),        contrast },
 #endif
 #ifdef HAVE_LCD_BITMAP