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

db/upnp: simplify GetSong()

Browse Source
This commit is contained in:
Max Kellermann
2014-01-21 22:43:04 +01:00
parent 7471f65d95
commit dc5ef9ad01
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/db/UpnpDatabasePlugin.cxx
View File

@@ -219,9 +219,12 @@ UpnpDatabase::ReturnSong(const LightSong *_song) const
const LightSong * const LightSong *
UpnpDatabase::GetSong(const char *uri, Error &error) const UpnpDatabase::GetSong(const char *uri, Error &error) const
{ {
UpnpSong *song = nullptr;
auto vpath = stringToTokens(uri, "/", true); auto vpath = stringToTokens(uri, "/", true);
if (vpath.size() >= 2) { if (vpath.size() < 2) {
error.Format(db_domain, DB_NOT_FOUND, "No such song: %s", uri);
return nullptr;
}
ContentDirectoryService server; ContentDirectoryService server;
if (!m_superdir->getServer(vpath[0].c_str(), server, error)) if (!m_superdir->getServer(vpath[0].c_str(), server, error))
return nullptr; return nullptr;
@@ -238,12 +241,7 @@ UpnpDatabase::GetSong(const char *uri, Error &error) const
return nullptr; return nullptr;
} }
song = new UpnpSong(std::move(dirent), uri); return new UpnpSong(std::move(dirent), uri);
}
if (song == nullptr)
error.Format(db_domain, DB_NOT_FOUND, "No such song: %s", uri);
return song;
} }
/** /**