diff options
| author | Max Kellermann <max@duempel.org> | 2015-03-01 00:25:30 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-03-01 00:25:30 +0100 |
| commit | 605af61a0fe77e7155446dab82666d6517d9e4a3 (patch) | |
| tree | 367662bc67c38f8770a390ddfdb1ea46a447224a | |
| parent | 77e163e5b859326c1be2a3649c38542881475d26 (diff) | |
| download | mpd-605af61a0fe77e7155446dab82666d6517d9e4a3.tar.gz mpd-605af61a0fe77e7155446dab82666d6517d9e4a3.tar.xz mpd-605af61a0fe77e7155446dab82666d6517d9e4a3.zip | |
db/simple: eliminate UpdateFileInArchive() if archive API is disabled
Reduce some unnecessary overhead.
| -rw-r--r-- | src/SongUpdate.cxx | 12 | ||||
| -rw-r--r-- | src/db/plugins/simple/Song.hxx | 4 |
2 files changed, 14 insertions, 2 deletions
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) { diff --git a/src/db/plugins/simple/Song.hxx b/src/db/plugins/simple/Song.hxx index 192583681..c83bbace0 100644 --- a/src/db/plugins/simple/Song.hxx +++ b/src/db/plugins/simple/Song.hxx @@ -20,6 +20,7 @@ #ifndef MPD_SONG_HXX #define MPD_SONG_HXX +#include "check.h" #include "Chrono.hxx" #include "tag/Tag.hxx" #include "Compiler.h" @@ -109,7 +110,10 @@ struct Song { void Free(); bool UpdateFile(Storage &storage); + +#ifdef ENABLE_ARCHIVE bool UpdateFileInArchive(const Storage &storage); +#endif /** * Returns the URI of the song in UTF-8 encoding, including its |