Merge branch 'v0.21.x'

This commit is contained in:
Max Kellermann
2019-11-04 15:07:46 +01:00
8 changed files with 26 additions and 12 deletions

View File

@@ -87,8 +87,6 @@ Song::UpdateFile(Storage &storage)
return true;
}
#endif
#ifdef ENABLE_ARCHIVE
SongPtr
@@ -130,6 +128,8 @@ Song::UpdateFileInArchive(ArchiveFile &archive) noexcept
#endif
#endif /* ENABLE_DATABASE */
bool
DetachedSong::LoadFile(Path path)
{