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

db/upnp/Directory: parse item_class in StartElement

Browse Source 
Don't add to the std::map.
This commit is contained in:
Max Kellermann 2014-01-11 01:40:21 +01:00
parent 44a65fc5de
commit 65ebfb16c9
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/db/upnp/Directory.cxx
View File

@ -32,7 +32,6 @@ static const char *const upnptags[] = {
"upnp:album", "upnp:album",
"upnp:genre", "upnp:genre",
"upnp:originalTrackNumber", "upnp:originalTrackNumber",
"upnp:class",
nullptr, nullptr,
}; };
@ -105,6 +104,12 @@ protected:
const char *pid = GetAttribute(attrs, "parentID"); const char *pid = GetAttribute(attrs, "parentID");
if (pid != nullptr) if (pid != nullptr)
m_tobj.m_pid = pid; m_tobj.m_pid = pid;
const char *item_class_name =
GetAttribute(attrs, "upnp:class");
if (item_class_name != nullptr)
m_tobj.item_class =
ParseItemClass(item_class_name);
} }
break; break;
@ -126,19 +131,10 @@ protected:
bool checkobjok() { bool checkobjok() {
if (m_tobj.m_id.empty() || m_tobj.m_pid.empty() || if (m_tobj.m_id.empty() || m_tobj.m_pid.empty() ||
m_tobj.m_title.empty()) m_tobj.m_title.empty() ||
m_tobj.item_class == UPnPDirObject::ItemClass::UNKNOWN)
return false; return false;
if (m_tobj.type == UPnPDirObject::Type::ITEM) {
const char *item_class_name =
m_tobj.m_props["upnp:class"].c_str();
auto item_class = ParseItemClass(item_class_name);
if (item_class == UPnPDirObject::ItemClass::UNKNOWN)
return false;
m_tobj.item_class = item_class;
}
return true; return true;
} }