diff options
| author | Max Kellermann <max@duempel.org> | 2016-02-26 15:01:53 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2016-02-26 15:05:44 +0100 |
| commit | d3ae05506d50e9e40562911c4d2c48fc4ec5a1bc (patch) | |
| tree | 0e368a8eb4e8e5dbf953f1cdc91b7399c09e7f77 | |
| parent | 96f4394dce60c58537035ca5d6f903fa88a637eb (diff) | |
SongUpdate: remove archive handling from LoadFile()
This code has been moved to LoadFromArchive().
| -rw-r--r-- | src/SongUpdate.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index 71e5ba3b1..6bcfe344b 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -51,16 +51,7 @@ Song::LoadFile(Storage &storage, const char *path_utf8, Directory &parent) assert(strchr(path_utf8, '\n') == nullptr); Song *song = NewFile(path_utf8, parent); - - //in archive ? - bool success = -#ifdef ENABLE_ARCHIVE - parent.device == DEVICE_INARCHIVE - ? song->UpdateFileInArchive(storage) - : -#endif - song->UpdateFile(storage); - if (!success) { + if (!song->UpdateFile(storage)) { song->Free(); return nullptr; } |