From 605af61a0fe77e7155446dab82666d6517d9e4a3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 1 Mar 2015 00:25:30 +0100 Subject: db/simple: eliminate UpdateFileInArchive() if archive API is disabled Reduce some unnecessary overhead. --- src/SongUpdate.cxx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/SongUpdate.cxx') diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index 6d51055c2..2df429175 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -52,9 +52,13 @@ Song::LoadFile(Storage &storage, const char *path_utf8, Directory &parent) Song *song = NewFile(path_utf8, parent); //in archive ? - bool success = parent.device == DEVICE_INARCHIVE + bool success = +#ifdef ENABLE_ARCHIVE + parent.device == DEVICE_INARCHIVE ? song->UpdateFileInArchive(storage) - : song->UpdateFile(storage); + : +#endif + song->UpdateFile(storage); if (!success) { song->Free(); return nullptr; @@ -113,6 +117,10 @@ Song::UpdateFile(Storage &storage) return true; } +#endif + +#ifdef ENABLE_ARCHIVE + bool Song::UpdateFileInArchive(const Storage &storage) { -- cgit v1.2.3