diff options
author | Max Kellermann <max@duempel.org> | 2009-11-04 18:47:42 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-11-04 18:47:42 +0100 |
commit | a434c35eb46ff71e2b0441595dcc7985e1b292c2 (patch) | |
tree | 073d3e51ab3a11090afecda68d6530415908ef79 /src/tag.c | |
parent | 7af8c88e37610fe7ebb167fadc28656385705d18 (diff) | |
download | mpd-a434c35eb46ff71e2b0441595dcc7985e1b292c2.tar.gz mpd-a434c35eb46ff71e2b0441595dcc7985e1b292c2.tar.xz mpd-a434c35eb46ff71e2b0441595dcc7985e1b292c2.zip |
tag: added function tag_name_parse()
Convert a string into a tag_type enum.
Diffstat (limited to '')
-rw-r--r-- | src/tag.c | 50 |
1 files changed, 41 insertions, 9 deletions
@@ -66,6 +66,36 @@ const char *tag_item_names[TAG_NUM_OF_ITEM_TYPES] = { bool ignore_tag_items[TAG_NUM_OF_ITEM_TYPES]; +enum tag_type +tag_name_parse(const char *name) +{ + assert(name != NULL); + + for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i) { + assert(tag_item_names[i] != NULL); + + if (strcmp(name, tag_item_names[i]) == 0) + return (enum tag_type)i; + } + + return TAG_NUM_OF_ITEM_TYPES; +} + +enum tag_type +tag_name_parse_i(const char *name) +{ + assert(name != NULL); + + for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i) { + assert(tag_item_names[i] != NULL); + + if (g_ascii_strcasecmp(name, tag_item_names[i]) == 0) + return (enum tag_type)i; + } + + return TAG_NUM_OF_ITEM_TYPES; +} + static size_t items_size(const struct tag *tag) { return tag->num_items * sizeof(struct tag_item *); @@ -78,7 +108,7 @@ void tag_lib_init(void) char *temp; char *s; char *c; - int i; + enum tag_type type; /* parse the "metadata_to_use" config parameter below */ @@ -100,16 +130,18 @@ void tag_lib_init(void) if (*s == '\0') quit = 1; *s = '\0'; - for (i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) { - if (g_ascii_strcasecmp(c, tag_item_names[i]) == 0) { - ignore_tag_items[i] = false; - break; - } - } - if (strlen(c) && i == TAG_NUM_OF_ITEM_TYPES) { + + c = g_strstrip(c); + if (*c == 0) + continue; + + type = tag_name_parse_i(c); + if (type == TAG_NUM_OF_ITEM_TYPES) g_error("error parsing metadata item \"%s\"", c); - } + + ignore_tag_items[type] = false; + s++; c = s; } |