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

db/upnp/Directory: move "res" tag handler to StartElement()

Browse Source 
No need to handle this in EndElement() - in StartElement(), we already
have all we need.
This commit is contained in:
Max Kellermann 2014-01-10 21:01:45 +01:00
parent e7eb04954d
commit 040a5ddad5
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,7 @@ protected:
m_tobj.m_pid = m_path.back().attributes["parentID"]; m_tobj.m_pid = m_path.back().attributes["parentID"];
} }
break; break;
case 'i': case 'i':
if (!strcmp(name, "item")) { if (!strcmp(name, "item")) {
m_tobj.clear(); m_tobj.clear();
@ -94,7 +95,21 @@ protected:
m_tobj.m_pid = m_path.back().attributes["parentID"]; m_tobj.m_pid = m_path.back().attributes["parentID"];
} }
break; break;
default:
case 'r':
if (!strcmp(name, "res")) {
// <res protocolInfo="http-get:*:audio/mpeg:*" size="5171496"
// bitrate="24576" duration="00:03:35" sampleFrequency="44100"
// nrAudioChannels="2">
std::string s;
s="protocolInfo";m_tobj.m_props[s] = m_path.back().attributes[s];
s="size";m_tobj.m_props[s] = m_path.back().attributes[s];
s="bitrate";m_tobj.m_props[s] = m_path.back().attributes[s];
s="duration";m_tobj.m_props[s] = m_path.back().attributes[s];
s="sampleFrequency";m_tobj.m_props[s] = m_path.back().attributes[s];
s="nrAudioChannels";m_tobj.m_props[s] = m_path.back().attributes[s];
}
break; break;
} }
} }
@ -135,17 +150,6 @@ protected:
if (checkobjok()) { if (checkobjok()) {
m_dir.m_items.push_back(m_tobj); m_dir.m_items.push_back(m_tobj);
} }
} else if (!strcmp(name, "res")) {
// <res protocolInfo="http-get:*:audio/mpeg:*" size="5171496"
// bitrate="24576" duration="00:03:35" sampleFrequency="44100"
// nrAudioChannels="2">
std::string s;
s="protocolInfo";m_tobj.m_props[s] = m_path.back().attributes[s];
s="size";m_tobj.m_props[s] = m_path.back().attributes[s];
s="bitrate";m_tobj.m_props[s] = m_path.back().attributes[s];
s="duration";m_tobj.m_props[s] = m_path.back().attributes[s];
s="sampleFrequency";m_tobj.m_props[s] = m_path.back().attributes[s];
s="nrAudioChannels";m_tobj.m_props[s] = m_path.back().attributes[s];
} }
m_path.pop_back(); m_path.pop_back();