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

SongUpdate: remove archive handling from LoadFile()

Browse Source 
This code has been moved to LoadFromArchive().
This commit is contained in:
Max Kellermann 2016-02-26 15:01:53 +01:00
parent 96f4394dce
commit d3ae05506d
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/SongUpdate.cxx
View File

@ -51,16 +51,7 @@ Song::LoadFile(Storage &storage, const char *path_utf8, Directory &parent)
assert(strchr(path_utf8, '\n') == nullptr); assert(strchr(path_utf8, '\n') == nullptr);
Song *song = NewFile(path_utf8, parent); Song *song = NewFile(path_utf8, parent);
if (!song->UpdateFile(storage)) {
//in archive ?
bool success =
#ifdef ENABLE_ARCHIVE
parent.device == DEVICE_INARCHIVE
? song->UpdateFileInArchive(storage)
:
#endif
song->UpdateFile(storage);
if (!success) {
song->Free(); song->Free();
return nullptr; return nullptr;
} }