Skip to content

M
mpd
Commit dc5ef9ad authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

db/upnp: simplify GetSong()

parent 7471f65d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
src/db/UpnpDatabasePlugin.cxx
View file @ dc5ef9ad
...@@ -219,9 +219,12 @@ UpnpDatabase::ReturnSong(const LightSong *_song) const ...@@ -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 ...@@ -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;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment