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

db/upnp/Directory: make "attributes" a local variable

Browse Source 
We only need it inside StartElement().  Reduces bloat.
This commit is contained in:
Max Kellermann
2014-01-10 21:04:54 +01:00
parent 040a5ddad5
commit 10abb07960
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,6 @@ class UPnPDirParser final : public CommonExpatParser {
struct StackEl { struct StackEl {
StackEl(const std::string& nm) : name(nm) {} StackEl(const std::string& nm) : name(nm) {}
std::string name; std::string name;
std::map<std::string,std::string> attributes;
}; };
std::vector<StackEl> m_path; std::vector<StackEl> m_path;
@@ -73,17 +72,18 @@ 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(StackEl(name));
for (int i = 0; attrs[i] != 0; i += 2) {
m_path.back().attributes[attrs[i]] = attrs[i+1]; std::map<std::string,std::string> attributes;
} for (int i = 0; attrs[i] != 0; i += 2)
attributes[attrs[i]] = attrs[i+1];
switch (name[0]) { switch (name[0]) {
case 'c': case 'c':
if (!strcmp(name, "container")) { if (!strcmp(name, "container")) {
m_tobj.clear(); m_tobj.clear();
m_tobj.type = UPnPDirObject::Type::CONTAINER; m_tobj.type = UPnPDirObject::Type::CONTAINER;
m_tobj.m_id = m_path.back().attributes["id"]; m_tobj.m_id = attributes["id"];
m_tobj.m_pid = m_path.back().attributes["parentID"]; m_tobj.m_pid = attributes["parentID"];
} }
break; break;
@@ -91,8 +91,8 @@ protected:
if (!strcmp(name, "item")) { if (!strcmp(name, "item")) {
m_tobj.clear(); m_tobj.clear();
m_tobj.type = UPnPDirObject::Type::ITEM; m_tobj.type = UPnPDirObject::Type::ITEM;
m_tobj.m_id = m_path.back().attributes["id"]; m_tobj.m_id = attributes["id"];
m_tobj.m_pid = m_path.back().attributes["parentID"]; m_tobj.m_pid = attributes["parentID"];
} }
break; break;
@@ -102,12 +102,12 @@ protected:
// bitrate="24576" duration="00:03:35" sampleFrequency="44100" // bitrate="24576" duration="00:03:35" sampleFrequency="44100"
// nrAudioChannels="2"> // nrAudioChannels="2">
std::string s; std::string s;
s="protocolInfo";m_tobj.m_props[s] = m_path.back().attributes[s]; s="protocolInfo";m_tobj.m_props[s] = attributes[s];
s="size";m_tobj.m_props[s] = m_path.back().attributes[s]; s="size";m_tobj.m_props[s] = attributes[s];
s="bitrate";m_tobj.m_props[s] = m_path.back().attributes[s]; s="bitrate";m_tobj.m_props[s] = attributes[s];
s="duration";m_tobj.m_props[s] = m_path.back().attributes[s]; s="duration";m_tobj.m_props[s] = attributes[s];
s="sampleFrequency";m_tobj.m_props[s] = m_path.back().attributes[s]; s="sampleFrequency";m_tobj.m_props[s] = attributes[s];
s="nrAudioChannels";m_tobj.m_props[s] = m_path.back().attributes[s]; s="nrAudioChannels";m_tobj.m_props[s] = attributes[s];
} }
break; break;