aboutsummaryrefslogtreecommitdiffstats
path: root/src/directory.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-03-21 21:32:23 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-03-21 21:32:23 +0000
commit4c1eb9225d5a741e1234d48eb38a8df3da908259 (patch)
tree28d8821623d6f9cce26f316e18342f2c08250785 /src/directory.c
parentb72f591641e9d311e813fb8e2ece643cc6562e56 (diff)
downloadmpd-4c1eb9225d5a741e1234d48eb38a8df3da908259.tar.gz
mpd-4c1eb9225d5a741e1234d48eb38a8df3da908259.tar.xz
mpd-4c1eb9225d5a741e1234d48eb38a8df3da908259.zip
add aac_decode.[ch] and start working on it
also, if locale is C or POSIX, set fs charset to iso-8859-1 git-svn-id: https://svn.musicpd.org/mpd/trunk@347 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/directory.c')
-rw-r--r--src/directory.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/directory.c b/src/directory.c
index 673754044..2d672afce 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -548,7 +548,8 @@ int readDirectoryDB() {
else if(0==strncmp(DIRECTORY_FS_CHARSET,buffer,
strlen(DIRECTORY_FS_CHARSET)))
{
- char * fsCharset;
+ char * fsCharset;
+ char * tempCharset;
if(foundFsCharset) {
ERROR("already found "
@@ -560,15 +561,14 @@ int readDirectoryDB() {
fsCharset = &(buffer[strlen(
DIRECTORY_FS_CHARSET)]);
- if(getConf()[CONF_FS_CHARSET] &&
- strcmp(fsCharset,
- getFsCharset()))
+ if((tempCharset =
+ getConf()[CONF_FS_CHARSET]) &&
+ strcmp(fsCharset,tempCharset))
{
ERROR("Using \"%s\" for the "
"filesystem charset "
"instead of \"%s\"\n",
- fsCharset,
- getFsCharset());
+ fsCharset,tempCharset);
ERROR("maybe you need to "
"recreate the db?\n");
setFsCharset(fsCharset);