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

db/upnp/Directory: eliminate struct StackEl, use std::string

Browse Source 
Reduces bloat.
This commit is contained in:
Max Kellermann 2014-01-10 21:10:33 +01:00
parent 10abb07960
commit 791d6c1336
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,12 +53,7 @@ ParseItemClass(const char *name)
* An XML parser which builds directory contents from DIDL lite input. * An XML parser which builds directory contents from DIDL lite input.
*/ */
class UPnPDirParser final : public CommonExpatParser { class UPnPDirParser final : public CommonExpatParser {
struct StackEl { std::vector<std::string> m_path;
StackEl(const std::string& nm) : name(nm) {}
std::string name;
};
std::vector<StackEl> m_path;
UPnPDirObject m_tobj; UPnPDirObject m_tobj;
public: public:
@ -71,7 +66,7 @@ public:
protected: protected:
virtual void StartElement(const XML_Char *name, const XML_Char **attrs) virtual void StartElement(const XML_Char *name, const XML_Char **attrs)
{ {
m_path.push_back(StackEl(name)); m_path.push_back(name);
std::map<std::string,std::string> attributes; std::map<std::string,std::string> attributes;
for (int i = 0; attrs[i] != 0; i += 2) for (int i = 0; attrs[i] != 0; i += 2)
@ -161,19 +156,19 @@ protected:
return; return;
std::string str(s, len); std::string str(s, len);
trimstring(str); trimstring(str);
switch (m_path.back().name[0]) { switch (m_path.back()[0]) {
case 'd': case 'd':
if (!m_path.back().name.compare("dc:title")) if (!m_path.back().compare("dc:title"))
m_tobj.m_title += str; m_tobj.m_title += str;
break; break;
case 'r': case 'r':
if (!m_path.back().name.compare("res")) { if (!m_path.back().compare("res")) {
m_tobj.m_props["url"] += str; m_tobj.m_props["url"] += str;
} }
break; break;
case 'u': case 'u':
for (int i = 0; i < nupnptags; i++) { for (int i = 0; i < nupnptags; i++) {
if (!m_path.back().name.compare(upnptags[i])) { if (!m_path.back().compare(upnptags[i])) {
m_tobj.m_props[upnptags[i]] += str; m_tobj.m_props[upnptags[i]] += str;
} }
} }