oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Path: move configuration code to Config.cxx

Browse Source
This commit is contained in:
Max Kellermann
2013-10-17 22:13:54 +02:00
parent fa60b9ae94
commit 080ee87e07
11 changed files with 284 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/DatabaseSave.cxx
View File

@@ -27,7 +27,7 @@
#include "TextFile.hxx"
#include "tag/Tag.hxx"
#include "tag/TagSettings.h"
#include "fs/Path.hxx"
#include "fs/Charset.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
@@ -57,7 +57,7 @@ db_save_internal(FILE *fp, const Directory *music_root)
fprintf(fp, DB_FORMAT_PREFIX "%u\n", DB_FORMAT);
fprintf(fp, "%s%s\n", DIRECTORY_MPD_VERSION, VERSION);
fprintf(fp, "%s%s\n", DIRECTORY_FS_CHARSET,
Path::GetFSCharset().c_str());
GetFSCharset().c_str());
for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
if (!ignore_tag_items[i])
@@ -110,7 +110,7 @@ db_load_internal(TextFile &file, Directory *music_root, Error &error)
found_charset = true;
new_charset = line + sizeof(DIRECTORY_FS_CHARSET) - 1;
const std::string &old_charset = Path::GetFSCharset();
const std::string &old_charset = GetFSCharset();
if (!old_charset.empty()
&& strcmp(new_charset, old_charset.c_str())) {
error.Format(db_domain,