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

SongLoader: return instance, not pointer

Browse Source
This commit is contained in:
Max Kellermann
2017-02-08 10:02:08 +01:00
parent d184231169
commit f689e28958
6 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/playlist/PlaylistSong.cxx
View File

@@ -44,25 +44,17 @@ merge_song_metadata(DetachedSong &add, const DetachedSong &base)
static bool
playlist_check_load_song(DetachedSong &song, const SongLoader &loader)
{
DetachedSong *tmp;
try {
DetachedSong tmp = loader.LoadSong(song.GetURI());
try {
tmp = loader.LoadSong(song.GetURI());
} catch (const std::runtime_error &) {
return false;
}
song.SetURI(tmp.GetURI());
if (!song.HasRealURI() && tmp.HasRealURI())
song.SetRealURI(tmp.GetRealURI());
if (tmp == nullptr)
return false;
song.SetURI(tmp->GetURI());
if (!song.HasRealURI() && tmp->HasRealURI())
song.SetRealURI(tmp->GetRealURI());
merge_song_metadata(song, *tmp);
delete tmp;
merge_song_metadata(song, tmp);
return true;
} catch (const std::runtime_error &) {
return false;
}
bool