From ca7f6a26b56dc5be3f00b1ff0feea3bbbdad493b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 7 Feb 2014 18:44:26 +0100 Subject: DecoderThread: use only DetachedSong::GetRealURI() Don't use the mapper - all DetachedSong instances we get have already been mapped. --- src/decoder/DecoderThread.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/decoder') diff --git a/src/decoder/DecoderThread.cxx b/src/decoder/DecoderThread.cxx index fad0f9276..4199b4269 100644 --- a/src/decoder/DecoderThread.cxx +++ b/src/decoder/DecoderThread.cxx @@ -25,7 +25,6 @@ #include "DecoderPlugin.hxx" #include "DetachedSong.hxx" #include "system/FatalError.hxx" -#include "Mapper.hxx" #include "fs/Traits.hxx" #include "fs/AllocatedPath.hxx" #include "DecoderAPI.hxx" @@ -415,11 +414,10 @@ decoder_run(DecoderControl &dc) Path path_fs = Path::Null(); AllocatedPath path_buffer = AllocatedPath::Null(); - if (song.IsFile()) { - path_buffer = map_song_fs(song); + if (PathTraitsUTF8::IsAbsolute(uri_utf8)) { + path_buffer = AllocatedPath::FromUTF8(uri_utf8, dc.error); if (path_buffer.IsNull()) { dc.state = DecoderState::ERROR; - dc.error.Set(decoder_domain, "Failed to map song"); decoder_command_finished_locked(dc); return; } -- cgit v1.2.3