PlaylistSave: use DetachedSong::GetRealURI() in playlist_print_song()

The DetachedSong instance already knows its own absolute path, and there is no need to ask the mapper again.

PlaylistSave: use DetachedSong::GetRealURI() in playlist_print_song()
3341b282 · Max Kellermann · bb3b836d · 3341b282
Commit 3341b282 authored Feb 07, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 12 deletions

PlaylistSave.cxx src/PlaylistSave.cxx +7 -12

No files found.
--- a/src/PlaylistSave.cxx
+++ b/src/PlaylistSave.cxx
@@ -39,18 +39,13 @@
 void
 playlist_print_song(FILE *file, const DetachedSong &song)
 {
-	if (playlist_saveAbsolutePaths &&
-	    song.IsInDatabase() && song.IsFile()) {
-		const auto path = map_song_fs(song);
-		if (!path.IsNull())
-			fprintf(file, "%s\n", path.c_str());
-	} else {
-		const auto uri_utf8 = song.GetURI();
-		const auto uri_fs = AllocatedPath::FromUTF8(uri_utf8);
-
-		if (!uri_fs.IsNull())
-			fprintf(file, "%s\n", uri_fs.c_str());
-	}
+	const char *uri_utf8 = playlist_saveAbsolutePaths
+		? song.GetRealURI()
+		: song.GetURI();
+
+	const auto uri_fs = AllocatedPath::FromUTF8(uri_utf8);
+	if (!uri_fs.IsNull())
+		fprintf(file, "%s\n", uri_fs.c_str());
 }

 void