oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag/TagId3: eliminate dummy function when libid3tag is disabled

Browse Source
This commit is contained in:
Max Kellermann 2016-02-23 11:16:19 +01:00
parent cccbcf510a
commit 8e5a67ed9f
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tag/Generic.cxx
View File

@ -40,10 +40,14 @@ ScanGenericTags(InputStream &is, const TagHandler &handler, void *ctx)
if (tag_ape_scan2(is, handler, ctx)) if (tag_ape_scan2(is, handler, ctx))
return true; return true;
#ifdef ENABLE_ID3TAG
if (!is.Rewind(IgnoreError())) if (!is.Rewind(IgnoreError()))
return false; return false;
return tag_id3_scan(is, handler, ctx); return tag_id3_scan(is, handler, ctx);
#else
return false;
#endif
} }
/** /**

15
src/tag/TagId3.hxx
View File

@ -21,15 +21,12 @@
#define MPD_TAG_ID3_HXX #define MPD_TAG_ID3_HXX
#include "check.h" #include "check.h"
#include "Compiler.h"
class InputStream; class InputStream;
struct TagHandler; struct TagHandler;
struct Tag; struct Tag;
struct id3_tag; struct id3_tag;
#ifdef ENABLE_ID3TAG
bool bool
tag_id3_scan(InputStream &is, tag_id3_scan(InputStream &is,
const TagHandler &handler, void *handler_ctx); const TagHandler &handler, void *handler_ctx);
@ -45,16 +42,4 @@ void
scan_id3_tag(id3_tag *tag, scan_id3_tag(id3_tag *tag,
const TagHandler &handler, void *handler_ctx); 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 #endif