devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Accepted FS #5474 by yours truly.

Browse source 
Save your settings; CONFIG_BLOCK_VERSION is increased.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10303 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rani Hod 2006-07-23 22:18:32 +00:00
parent 3c810c4f6a
commit c657763a23
6 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/settings.c
View file

@ -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

7
apps/settings.h
View file

@ -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 */

10
apps/settings_menu.c
View file

@ -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,
@ -1775,13 +1775,13 @@ static bool lcd_settings_menu(void)
#if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)
{ ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in },
{ ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out },
#endif
#ifdef HAVE_BACKLIGHT_BRIGHTNESS
{ ID2P(LANG_BRIGHTNESS), brightness },
#endif
{ ID2P(LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS), set_bl_filter_first_keypress },
#ifdef HAVE_BACKLIGHT_BRIGHTNESS
{ ID2P(LANG_BRIGHTNESS), brightness },
#endif
#endif /* CONFIG_BACKLIGHT */
#ifndef HAVE_LCD_COLOR
#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
{ ID2P(LANG_CONTRAST), contrast },
#endif
#ifdef HAVE_LCD_BITMAP