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

playlist/asx: rename "tag" to "tag_type"

Browse Source
This commit is contained in:
Max Kellermann 2013-12-03 12:14:55 +01:00
parent ef68946e74
commit b23d2ad43b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/playlist/AsxPlaylistPlugin.cxx
View File

@ -57,7 +57,7 @@ struct AsxParser {
* valid if state==ENTRY. TAG_NUM_OF_ITEM_TYPES means there * valid if state==ENTRY. TAG_NUM_OF_ITEM_TYPES means there
* is no (known) tag. * is no (known) tag.
*/ */
TagType tag; TagType tag_type;
/** /**
* The current song. It is allocated after the "location" * The current song. It is allocated after the "location"
@ -95,7 +95,7 @@ asx_start_element(gcc_unused GMarkupParseContext *context,
if (StringEqualsCaseASCII(element_name, "entry")) { if (StringEqualsCaseASCII(element_name, "entry")) {
parser->state = AsxParser::ENTRY; parser->state = AsxParser::ENTRY;
parser->song = Song::NewRemote("asx:"); parser->song = Song::NewRemote("asx:");
parser->tag = TAG_NUM_OF_ITEM_TYPES; parser->tag_type = TAG_NUM_OF_ITEM_TYPES;
} }
break; break;
@ -124,9 +124,9 @@ asx_start_element(gcc_unused GMarkupParseContext *context,
} else if (StringEqualsCaseASCII(element_name, "author")) } else if (StringEqualsCaseASCII(element_name, "author"))
/* is that correct? or should it be COMPOSER /* is that correct? or should it be COMPOSER
or PERFORMER? */ or PERFORMER? */
parser->tag = TAG_ARTIST; parser->tag_type = TAG_ARTIST;
else if (StringEqualsCaseASCII(element_name, "title")) else if (StringEqualsCaseASCII(element_name, "title"))
parser->tag = TAG_TITLE; parser->tag_type = TAG_TITLE;
break; break;
} }
@ -152,7 +152,7 @@ asx_end_element(gcc_unused GMarkupParseContext *context,
parser->state = AsxParser::ROOT; parser->state = AsxParser::ROOT;
} else } else
parser->tag = TAG_NUM_OF_ITEM_TYPES; parser->tag_type = TAG_NUM_OF_ITEM_TYPES;
break; break;
} }
@ -170,10 +170,10 @@ asx_text(gcc_unused GMarkupParseContext *context,
break; break;
case AsxParser::ENTRY: case AsxParser::ENTRY:
if (parser->tag != TAG_NUM_OF_ITEM_TYPES) { if (parser->tag_type != TAG_NUM_OF_ITEM_TYPES) {
if (parser->song->tag == nullptr) if (parser->song->tag == nullptr)
parser->song->tag = new Tag(); parser->song->tag = new Tag();
parser->song->tag->AddItem(parser->tag, parser->song->tag->AddItem(parser->tag_type,
text, text_len); text, text_len);
} }