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

queue/QueueCommands: use std::unique_ptr

Browse Source
This commit is contained in:
Max Kellermann 2016-02-28 10:56:37 +01:00
parent c81747dd15
commit ea626368a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/QueueCommands.cxx
View File

@ -40,6 +40,7 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include <memory>
#include <limits> #include <limits>
#include <string.h> #include <string.h>
@ -48,14 +49,13 @@ static CommandResult
AddUri(Client &client, const LocatedUri &uri, Response &r) AddUri(Client &client, const LocatedUri &uri, Response &r)
{ {
Error error; Error error;
DetachedSong *song = SongLoader(client).LoadSong(uri, error); std::unique_ptr<DetachedSong> song(SongLoader(client).LoadSong(uri, error));
if (song == nullptr) if (song == nullptr)
return print_error(r, error); return print_error(r, error);
auto &partition = client.partition; auto &partition = client.partition;
unsigned id = partition.playlist.AppendSong(partition.pc, unsigned id = partition.playlist.AppendSong(partition.pc,
std::move(*song), error); std::move(*song), error);
delete song;
if (id == 0) if (id == 0)
return print_error(r, error); return print_error(r, error);