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

SongSave: wrap DetachedSong* in std::unique_ptr

Browse Source
This commit is contained in:
Max Kellermann
2017-11-26 12:18:31 +01:00
parent 28fdf1e9ed
commit 75582d47b9
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/queue/QueueSave.cxx
View File

@@ -89,7 +89,7 @@ queue_load_song(TextFile &file, const SongLoader &loader,
return;
}
DetachedSong *song;
std::unique_ptr<DetachedSong> song;
if ((p = StringAfterPrefix(line, SONG_BEGIN))) {
const char *uri = p;
@@ -111,14 +111,11 @@ queue_load_song(TextFile &file, const SongLoader &loader,
const char *uri = endptr + 1;
song = new DetachedSong(uri);
song = std::make_unique<DetachedSong>(uri);
}
if (!playlist_check_translate_song(*song, nullptr, loader)) {
delete song;
if (playlist_check_translate_song(*song, nullptr, loader))
return;
}
queue.Append(std::move(*song), priority);
delete song;
}