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

playlist/asx: use class TagBuilder

This commit is contained in:
Max Kellermann 2013-12-03 12:14:33 +01:00
parent b23d2ad43b
commit 78c0d8cc88
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/playlist/AsxPlaylistPlugin.cxx
View File

@ -23,7 +23,7 @@
#include "MemorySongEnumerator.hxx" #include "MemorySongEnumerator.hxx"
#include "InputStream.hxx" #include "InputStream.hxx"
#include "Song.hxx" #include "Song.hxx"
#include "tag/Tag.hxx" #include "tag/TagBuilder.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
@ -65,6 +65,8 @@ struct AsxParser {
*/ */
Song *song; Song *song;
TagBuilder tag_builder;
AsxParser() AsxParser()
:state(ROOT) {} :state(ROOT) {}
@ -106,18 +108,13 @@ asx_start_element(gcc_unused GMarkupParseContext *context,
attribute_values, attribute_values,
"href"); "href");
if (href != nullptr) { if (href != nullptr) {
/* create new song object, and copy /* create new song object; we cannot
the existing tag over; we cannot
replace the existing song's URI, replace the existing song's URI,
because that attribute is because that attribute is
immutable */ immutable */
Song *song = Song::NewRemote(href); Song *song = Song::NewRemote(href);
if (parser->song != nullptr)
if (parser->song != nullptr) {
song->tag = parser->song->tag;
parser->song->tag = nullptr;
parser->song->Free(); parser->song->Free();
}
parser->song = song; parser->song = song;
} }
@ -145,9 +142,11 @@ asx_end_element(gcc_unused GMarkupParseContext *context,
case AsxParser::ENTRY: case AsxParser::ENTRY:
if (StringEqualsCaseASCII(element_name, "entry")) { if (StringEqualsCaseASCII(element_name, "entry")) {
if (strcmp(parser->song->uri, "asx:") != 0) if (strcmp(parser->song->uri, "asx:") != 0) {
assert(parser->song->tag == nullptr);
parser->song->tag = parser->tag_builder.Commit();
parser->songs.emplace_front(parser->song); parser->songs.emplace_front(parser->song);
else } else
parser->song->Free(); parser->song->Free();
parser->state = AsxParser::ROOT; parser->state = AsxParser::ROOT;
@ -171,10 +170,8 @@ asx_text(gcc_unused GMarkupParseContext *context,
case AsxParser::ENTRY: case AsxParser::ENTRY:
if (parser->tag_type != TAG_NUM_OF_ITEM_TYPES) { if (parser->tag_type != TAG_NUM_OF_ITEM_TYPES) {
if (parser->song->tag == nullptr) parser->tag_builder.AddItem(parser->tag_type,
parser->song->tag = new Tag(); text, text_len);
parser->song->tag->AddItem(parser->tag_type,
text, text_len);
} }
break; break;