diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-11-03 23:49:18 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-11-03 23:49:18 +0000 |
commit | de6cddaea246241abe118df548aa3a728a2f43f0 (patch) | |
tree | d56a6b901b4b7958ba7d234661de6517c5b2fd45 | |
parent | 23d6df43f85cbf1e0a8ba7f16bb6413568bd83ca (diff) | |
download | rockbox-de6cddaea246241abe118df548aa3a728a2f43f0.tar.gz rockbox-de6cddaea246241abe118df548aa3a728a2f43f0.zip |
- handle the custom option type in settings dumper (not very well though but there isnt really a better option)
- ban some settings from the quickscreen which need a reboot to change (dircache, database, max files/playlist size)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18997 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/settings_dumper.c | 3 | ||||
-rw-r--r-- | apps/settings_list.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/apps/plugins/settings_dumper.c b/apps/plugins/settings_dumper.c index 4b3d03c5e6..b9acdcf5fc 100644 --- a/apps/plugins/settings_dumper.c +++ b/apps/plugins/settings_dumper.c | |||
@@ -43,6 +43,9 @@ static void write_setting(const struct settings_list *setting, int fd, unsigned | |||
43 | rb->fdprintf(fd, "\r\n"); | 43 | rb->fdprintf(fd, "\r\n"); |
44 | switch (setting->flags&F_T_MASK) | 44 | switch (setting->flags&F_T_MASK) |
45 | { | 45 | { |
46 | case F_T_CUSTOM: | ||
47 | rb->strcpy(text, "No information available. Check the manual for valid values"); | ||
48 | break; | ||
46 | case F_T_INT: | 49 | case F_T_INT: |
47 | case F_T_UINT: | 50 | case F_T_UINT: |
48 | if (setting->flags&F_RGB) | 51 | if (setting->flags&F_RGB) |
diff --git a/apps/settings_list.c b/apps/settings_list.c index f88366d5a3..eafad01096 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -568,7 +568,7 @@ const struct settings_list settings[] = { | |||
568 | 0,1,2,3,4,5,6,7,8,9,10,15,30,45,60), | 568 | 0,1,2,3,4,5,6,7,8,9,10,15,30,45,60), |
569 | SYSTEM_SETTING(NVRAM(4), runtime, 0), | 569 | SYSTEM_SETTING(NVRAM(4), runtime, 0), |
570 | SYSTEM_SETTING(NVRAM(4), topruntime, 0), | 570 | SYSTEM_SETTING(NVRAM(4), topruntime, 0), |
571 | INT_SETTING(0, max_files_in_playlist, | 571 | INT_SETTING(F_BANFROMQS, max_files_in_playlist, |
572 | LANG_MAX_FILES_IN_PLAYLIST, | 572 | LANG_MAX_FILES_IN_PLAYLIST, |
573 | #if MEM > 1 | 573 | #if MEM > 1 |
574 | 10000, | 574 | 10000, |
@@ -577,7 +577,7 @@ const struct settings_list settings[] = { | |||
577 | #endif | 577 | #endif |
578 | "max files in playlist", UNIT_INT, 1000, 32000, 1000, | 578 | "max files in playlist", UNIT_INT, 1000, 32000, 1000, |
579 | NULL, NULL, NULL), | 579 | NULL, NULL, NULL), |
580 | INT_SETTING(0, max_files_in_dir, LANG_MAX_FILES_IN_DIR, | 580 | INT_SETTING(F_BANFROMQS, max_files_in_dir, LANG_MAX_FILES_IN_DIR, |
581 | #if MEM > 1 | 581 | #if MEM > 1 |
582 | 1000, | 582 | 1000, |
583 | #else | 583 | #else |
@@ -1168,15 +1168,15 @@ const struct settings_list settings[] = { | |||
1168 | "treble cutoff", SOUND_TREBLE_CUTOFF), | 1168 | "treble cutoff", SOUND_TREBLE_CUTOFF), |
1169 | #endif | 1169 | #endif |
1170 | #ifdef HAVE_DIRCACHE | 1170 | #ifdef HAVE_DIRCACHE |
1171 | OFFON_SETTING(0,dircache,LANG_DIRCACHE_ENABLE,false,"dircache",NULL), | 1171 | OFFON_SETTING(F_BANFROMQS,dircache,LANG_DIRCACHE_ENABLE,false,"dircache",NULL), |
1172 | SYSTEM_SETTING(NVRAM(4),dircache_size,0), | 1172 | SYSTEM_SETTING(NVRAM(4),dircache_size,0), |
1173 | #endif | 1173 | #endif |
1174 | 1174 | ||
1175 | #ifdef HAVE_TAGCACHE | 1175 | #ifdef HAVE_TAGCACHE |
1176 | #ifdef HAVE_TC_RAMCACHE | 1176 | #ifdef HAVE_TC_RAMCACHE |
1177 | OFFON_SETTING(0,tagcache_ram,LANG_TAGCACHE_RAM,false,"tagcache_ram",NULL), | 1177 | OFFON_SETTING(F_BANFROMQS,tagcache_ram,LANG_TAGCACHE_RAM,false,"tagcache_ram",NULL), |
1178 | #endif | 1178 | #endif |
1179 | OFFON_SETTING(0, tagcache_autoupdate, LANG_TAGCACHE_AUTOUPDATE, false, | 1179 | OFFON_SETTING(F_BANFROMQS, tagcache_autoupdate, LANG_TAGCACHE_AUTOUPDATE, false, |
1180 | "tagcache_autoupdate", NULL), | 1180 | "tagcache_autoupdate", NULL), |
1181 | #endif | 1181 | #endif |
1182 | CHOICE_SETTING(0, default_codepage, LANG_DEFAULT_CODEPAGE, 0, | 1182 | CHOICE_SETTING(0, default_codepage, LANG_DEFAULT_CODEPAGE, 0, |