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

db/upnp: use TagTable in upnpItemToSong()

Browse Source 
Reduces bloat by eliminating one std::map.
This commit is contained in:
Max Kellermann 2014-01-10 08:57:31 +01:00
parent 1583eb36e4
commit cfc25e08dc
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/db/UpnpDatabasePlugin.cxx
View File

@ -48,6 +48,17 @@
static const char *const rootid = "0"; static const char *const rootid = "0";
static const struct tag_table upnp_tags[] = {
{ "upnp:artist", TAG_ARTIST },
{ "upnp:album", TAG_ALBUM },
{ "upnp:originalTrackNumber", TAG_TRACK },
{ "upnp:genre", TAG_GENRE },
{ "dc:title", TAG_TITLE },
/* sentinel */
{ nullptr, TAG_NUM_OF_ITEM_TYPES }
};
class UpnpDatabase : public Database { class UpnpDatabase : public Database {
LibUPnP *m_lib; LibUPnP *m_lib;
UPnPDeviceDirectory *m_superdir; UPnPDeviceDirectory *m_superdir;
@ -276,17 +287,6 @@ upnpDurationToSeconds(const std::string &duration)
return atoi(v[0].c_str())*3600 + atoi(v[1].c_str())*60 + atoi(v[2].c_str()); return atoi(v[0].c_str())*3600 + atoi(v[1].c_str())*60 + atoi(v[2].c_str());
} }
// Upnp element to mpd tag number correspondance.
// Don't know the upnp equivalent if any: TAG_ALBUM_ARTIST TAG_NAME
// TAG_DATE TAG_COMPOSER TAG_PERFORMER TAG_COMMENT TAG_DISC
static std::map<std::string, TagType> propToTag = {
{"upnp:artist", TAG_ARTIST},
{"upnp:album", TAG_ALBUM},
{"upnp:originalTrackNumber", TAG_TRACK},
{"upnp:genre", TAG_GENRE},
{"dc:title", TAG_TITLE},
};
// If uri is empty, we use the object's url instead. This happens // If uri is empty, we use the object's url instead. This happens
// when the target of a Visit() is a song, which only happens when // when the target of a Visit() is a song, which only happens when
// "add"ing AFAIK. Visit() calls us with a null uri so that the url // "add"ing AFAIK. Visit() calls us with a null uri so that the url
@ -314,9 +314,9 @@ upnpItemToSong(const UPnPDirObject &dirent, const char *uri)
tag.AddItem(TAG_TITLE, titleToPathElt(dirent.m_title).c_str()); tag.AddItem(TAG_TITLE, titleToPathElt(dirent.m_title).c_str());
for (auto &pt : propToTag) for (auto i = upnp_tags; i->name != nullptr; ++i)
if (dirent.getprop(pt.first, sprop)) if (dirent.getprop(i->name, sprop))
tag.AddItem(pt.second, sprop.c_str()); tag.AddItem(i->type, sprop.c_str());
s->tag = tag.CommitNew(); s->tag = tag.CommitNew();
return s; return s;
@ -364,17 +364,6 @@ UpnpDatabase::GetSong(const char *uri, Error &error) const
return song; return song;
} }
static const struct tag_table upnp_tags[] = {
{ "upnp:artist", TAG_ARTIST },
{ "upnp:album", TAG_ALBUM },
{ "upnp:originalTrackNumber", TAG_TRACK },
{ "upnp:genre", TAG_GENRE },
{ "dc:title", TAG_TITLE },
/* sentinel */
{ nullptr, TAG_NUM_OF_ITEM_TYPES }
};
/** /**
* Retrieve the value for an MPD tag from an object entry. * Retrieve the value for an MPD tag from an object entry.
*/ */