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

prepending ~ to a setting name in config.cfg will use its value from the load instead of the current value when saving back. (e.g

Browse source 
~volume: -25 will always boot with -25 volume, even if you shutdown with volume at 0)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12103 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-01-24 03:47:25 +00:00
parent 0c3375648c
commit 46f7f7de4d
1 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

39
apps/settings.c
View file

@ -259,11 +259,20 @@ static int hex_to_rgb(const char* hex)
return 0; return 0;
} }
#endif #endif
#define MAX_PERSISTANT_VARS 8
struct persistant_vars {
char setting[MAX_FILENAME];
char value[MAX_FILENAME];
};
static struct persistant_vars persistant_vars[MAX_PERSISTANT_VARS];
static int persistant_vars_count = 0;
bool settings_write_config(char* filename) bool settings_write_config(char* filename)
{ {
int i; int i;
int fd; int fd;
char value[MAX_FILENAME * 3]; /* More than enough for all current values */ bool check_persistant = !strcmp(filename, CONFIGFILE) &&
persistant_vars_count;
char value[MAX_PATH];
fd = open(filename,O_CREAT|O_TRUNC|O_WRONLY); fd = open(filename,O_CREAT|O_TRUNC|O_WRONLY);
if (fd < 0) if (fd < 0)
return false; return false;
@ -273,6 +282,23 @@ bool settings_write_config(char* filename)
{ {
if (settings[i].cfg_name == NULL) if (settings[i].cfg_name == NULL)
continue; continue;
if (check_persistant)
{
int j;
bool found = false;
for(j=0; j<persistant_vars_count; j++)
{
if (!strcmp(persistant_vars[j].setting, settings[i].cfg_name))
{
fdprintf(fd,"~%s: %s\r\n", settings[i].cfg_name,
persistant_vars[j].value);
found = true;
break;
}
}
if (found)
continue;
}
switch (settings[i].flags&F_T_MASK) switch (settings[i].flags&F_T_MASK)
{ {
case F_T_INT: case F_T_INT:
@ -721,7 +747,7 @@ bool settings_load_config(const char* file, bool apply)
char* name; char* name;
char* value; char* value;
int i; int i;
bool check_persistant = !strcmp(file, CONFIGFILE);
fd = open(file, O_RDONLY); fd = open(file, O_RDONLY);
if (fd < 0) if (fd < 0)
return false; return false;
@ -730,7 +756,14 @@ bool settings_load_config(const char* file, bool apply)
{ {
if (!settings_parseline(line, &name, &value)) if (!settings_parseline(line, &name, &value))
continue; continue;
if (check_persistant && (name[0] == '~')
&& (persistant_vars_count<MAX_PERSISTANT_VARS))
{
name++;
strcpy(persistant_vars[persistant_vars_count].setting, name);
strcpy(persistant_vars[persistant_vars_count].value, value);
persistant_vars_count++;
}
for(i=0; i<nb_settings; i++) for(i=0; i<nb_settings; i++)
{ {
if (settings[i].cfg_name == NULL) if (settings[i].cfg_name == NULL)