diff options
| author | Max Kellermann <max@duempel.org> | 2013-12-03 12:30:55 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-12-03 12:30:55 +0100 |
| commit | 187069bec91ffaab5ca17461c7e76f668de9c87b (patch) | |
| tree | 0b03b297c7f545ff77ae5f461fd3e6ab9045e2ef | |
| parent | 01de768f09e32113fb4fb7ac3d8f123eb54e5697 (diff) | |
| download | mpd-187069bec91ffaab5ca17461c7e76f668de9c87b.tar.gz mpd-187069bec91ffaab5ca17461c7e76f668de9c87b.tar.xz mpd-187069bec91ffaab5ca17461c7e76f668de9c87b.zip | |
playlist/xspf: rename "tag" to "tag_type"
| -rw-r--r-- | src/playlist/XspfPlaylistPlugin.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/playlist/XspfPlaylistPlugin.cxx b/src/playlist/XspfPlaylistPlugin.cxx index 57e88a08d..ef37b847f 100644 --- a/src/playlist/XspfPlaylistPlugin.cxx +++ b/src/playlist/XspfPlaylistPlugin.cxx @@ -56,7 +56,7 @@ struct XspfParser { * valid if state==TRACK. TAG_NUM_OF_ITEM_TYPES means there * is no (known) tag. */ - TagType tag; + TagType tag_type; /** * The current song. It is allocated after the "location" @@ -94,7 +94,7 @@ xspf_start_element(gcc_unused GMarkupParseContext *context, if (strcmp(element_name, "track") == 0) { parser->state = XspfParser::TRACK; parser->song = nullptr; - parser->tag = TAG_NUM_OF_ITEM_TYPES; + parser->tag_type = TAG_NUM_OF_ITEM_TYPES; } break; @@ -103,17 +103,17 @@ xspf_start_element(gcc_unused GMarkupParseContext *context, if (strcmp(element_name, "location") == 0) parser->state = XspfParser::LOCATION; else if (strcmp(element_name, "title") == 0) - parser->tag = TAG_TITLE; + parser->tag_type = TAG_TITLE; else if (strcmp(element_name, "creator") == 0) /* TAG_COMPOSER would be more correct according to the XSPF spec */ - parser->tag = TAG_ARTIST; + parser->tag_type = TAG_ARTIST; else if (strcmp(element_name, "annotation") == 0) - parser->tag = TAG_COMMENT; + parser->tag_type = TAG_COMMENT; else if (strcmp(element_name, "album") == 0) - parser->tag = TAG_ALBUM; + parser->tag_type = TAG_ALBUM; else if (strcmp(element_name, "trackNum") == 0) - parser->tag = TAG_TRACK; + parser->tag_type = TAG_TRACK; break; @@ -152,7 +152,7 @@ xspf_end_element(gcc_unused GMarkupParseContext *context, parser->state = XspfParser::TRACKLIST; } else - parser->tag = TAG_NUM_OF_ITEM_TYPES; + parser->tag_type = TAG_NUM_OF_ITEM_TYPES; break; @@ -177,10 +177,10 @@ xspf_text(gcc_unused GMarkupParseContext *context, case XspfParser::TRACK: if (parser->song != nullptr && - parser->tag != TAG_NUM_OF_ITEM_TYPES) { + parser->tag_type != TAG_NUM_OF_ITEM_TYPES) { if (parser->song->tag == nullptr) parser->song->tag = new Tag(); - parser->song->tag->AddItem(parser->tag, text, text_len); + parser->song->tag->AddItem(parser->tag_type, text, text_len); } break; |