From de6cddaea246241abe118df548aa3a728a2f43f0 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 3 Nov 2008 23:49:18 +0000 Subject: [PATCH] - 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 --- apps/plugins/settings_dumper.c | 3 +++ 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 rb->fdprintf(fd, "\r\n"); switch (setting->flags&F_T_MASK) { + case F_T_CUSTOM: + rb->strcpy(text, "No information available. Check the manual for valid values"); + break; case F_T_INT: case F_T_UINT: 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[] = { 0,1,2,3,4,5,6,7,8,9,10,15,30,45,60), SYSTEM_SETTING(NVRAM(4), runtime, 0), SYSTEM_SETTING(NVRAM(4), topruntime, 0), - INT_SETTING(0, max_files_in_playlist, + INT_SETTING(F_BANFROMQS, max_files_in_playlist, LANG_MAX_FILES_IN_PLAYLIST, #if MEM > 1 10000, @@ -577,7 +577,7 @@ const struct settings_list settings[] = { #endif "max files in playlist", UNIT_INT, 1000, 32000, 1000, NULL, NULL, NULL), - INT_SETTING(0, max_files_in_dir, LANG_MAX_FILES_IN_DIR, + INT_SETTING(F_BANFROMQS, max_files_in_dir, LANG_MAX_FILES_IN_DIR, #if MEM > 1 1000, #else @@ -1168,15 +1168,15 @@ const struct settings_list settings[] = { "treble cutoff", SOUND_TREBLE_CUTOFF), #endif #ifdef HAVE_DIRCACHE - OFFON_SETTING(0,dircache,LANG_DIRCACHE_ENABLE,false,"dircache",NULL), + OFFON_SETTING(F_BANFROMQS,dircache,LANG_DIRCACHE_ENABLE,false,"dircache",NULL), SYSTEM_SETTING(NVRAM(4),dircache_size,0), #endif #ifdef HAVE_TAGCACHE #ifdef HAVE_TC_RAMCACHE - OFFON_SETTING(0,tagcache_ram,LANG_TAGCACHE_RAM,false,"tagcache_ram",NULL), + OFFON_SETTING(F_BANFROMQS,tagcache_ram,LANG_TAGCACHE_RAM,false,"tagcache_ram",NULL), #endif - OFFON_SETTING(0, tagcache_autoupdate, LANG_TAGCACHE_AUTOUPDATE, false, + OFFON_SETTING(F_BANFROMQS, tagcache_autoupdate, LANG_TAGCACHE_AUTOUPDATE, false, "tagcache_autoupdate", NULL), #endif CHOICE_SETTING(0, default_codepage, LANG_DEFAULT_CODEPAGE, 0,