merge shank-rewrite-config changes

git-svn-id: https://svn.musicpd.org/mpd/trunk@2375 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-10-28 05:14:55 +00:00
parent 8f40569aee
commit 58dbe4bb5d
24 changed files with 946 additions and 624 deletions
@@ -1053,7 +1053,8 @@ int readDirectoryDB() {
 					fsCharset = &(buffer[strlen(
 							DIRECTORY_FS_CHARSET)]);
 					if((tempCharset = 
-						getConf()[CONF_FS_CHARSET]) && 
+						getConfigParamValue(
+							CONF_FS_CHARSET)) && 
 						strcmp(fsCharset,tempCharset))
 					{
 						WARNING("Using \"%s\" for the "