SongLoader: return instance, not pointer

2017-02-08 10:02:08 +01:00
parent d184231169
commit f689e28958
6 changed files with 23 additions and 35 deletions
--- a/src/command/QueueCommands.cxx
+++ b/src/command/QueueCommands.cxx
@@ -43,11 +43,9 @@
 static void
 AddUri(Client &client, const LocatedUri &uri)
 {
-	std::unique_ptr<DetachedSong> song(SongLoader(client).LoadSong(uri));
-	assert(song);
-
 	auto &partition = client.partition;
-	partition.playlist.AppendSong(partition.pc, std::move(*song));
+	partition.playlist.AppendSong(partition.pc,
+				      SongLoader(client).LoadSong(uri));
 }

 static CommandResult