diff options
| author | Max Kellermann <max@duempel.org> | 2016-02-23 11:16:19 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2016-02-23 11:16:19 +0100 |
| commit | 8e5a67ed9fd6f556cfcc6f13349a2549d1b02249 (patch) | |
| tree | bca3e8005677cdaf5025ff009c3b9519486b8bd2 /src/tag | |
| parent | cccbcf510a44aec0ce6a956cc1c7c96e6cfa94f3 (diff) | |
tag/TagId3: eliminate dummy function when libid3tag is disabled
Diffstat (limited to 'src/tag')
| -rw-r--r-- | src/tag/Generic.cxx | 4 | ||||
| -rw-r--r-- | src/tag/TagId3.hxx | 15 |
2 files changed, 4 insertions, 15 deletions
diff --git a/src/tag/Generic.cxx b/src/tag/Generic.cxx index 39baef45c..2f485bb9d 100644 --- a/src/tag/Generic.cxx +++ b/src/tag/Generic.cxx @@ -40,10 +40,14 @@ ScanGenericTags(InputStream &is, const TagHandler &handler, void *ctx) if (tag_ape_scan2(is, handler, ctx)) return true; +#ifdef ENABLE_ID3TAG if (!is.Rewind(IgnoreError())) return false; return tag_id3_scan(is, handler, ctx); +#else + return false; +#endif } /** diff --git a/src/tag/TagId3.hxx b/src/tag/TagId3.hxx index f47f77c4a..adbe868bb 100644 --- a/src/tag/TagId3.hxx +++ b/src/tag/TagId3.hxx @@ -21,15 +21,12 @@ #define MPD_TAG_ID3_HXX #include "check.h" -#include "Compiler.h" class InputStream; struct TagHandler; struct Tag; struct id3_tag; -#ifdef ENABLE_ID3TAG - bool tag_id3_scan(InputStream &is, const TagHandler &handler, void *handler_ctx); @@ -45,16 +42,4 @@ void scan_id3_tag(id3_tag *tag, const TagHandler &handler, void *handler_ctx); -#else - -static inline bool -tag_id3_scan(gcc_unused InputStream &is, - gcc_unused const TagHandler &handler, - gcc_unused void *handler_ctx) -{ - return false; -} - -#endif - #endif |