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

tag/Settings: convert to bit mask

Browse Source
This commit is contained in:
Max Kellermann 2015-08-24 11:10:15 +02:00
parent 60c077c790
commit 0c19418e84
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tag/TagConfig.cxx
View File

@ -39,7 +39,7 @@ TagLoadConfig()
if (value == nullptr) if (value == nullptr)
return; return;
std::fill_n(ignore_tag_items, size_t(TAG_NUM_OF_ITEM_TYPES), true); global_tag_mask = 0;
if (StringEqualsCaseASCII(value, "none")) if (StringEqualsCaseASCII(value, "none"))
return; return;
@ -62,7 +62,7 @@ TagLoadConfig()
FormatFatalError("error parsing metadata item \"%s\"", FormatFatalError("error parsing metadata item \"%s\"",
c); c);
ignore_tag_items[type] = false; global_tag_mask |= tag_mask_t(1) << unsigned(type);
s++; s++;
c = s; c = s;

5
src/tag/TagSettings.c
View File

@ -19,7 +19,4 @@
#include "TagSettings.h" #include "TagSettings.h"
bool ignore_tag_items[TAG_NUM_OF_ITEM_TYPES] = { tag_mask_t global_tag_mask = (tag_mask_t)-1 & ~(1 << TAG_COMMENT);
/* ignore comments by default */
[TAG_COMMENT] = true,
};

8
src/tag/TagSettings.h
View File

@ -23,9 +23,11 @@
#include "TagType.h" #include "TagType.h"
#include "Compiler.h" #include "Compiler.h"
#include <stdbool.h> #include <stdint.h>
extern bool ignore_tag_items[TAG_NUM_OF_ITEM_TYPES]; typedef uint_least32_t tag_mask_t;
extern tag_mask_t global_tag_mask;
#ifdef __cplusplus #ifdef __cplusplus
@ -33,7 +35,7 @@ gcc_const
static inline bool static inline bool
IsTagEnabled(unsigned tag) IsTagEnabled(unsigned tag)
{ {
return !ignore_tag_items[tag]; return global_tag_mask & (1u << tag);
} }
gcc_const gcc_const