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

DecoderThread: use only DetachedSong::GetRealURI()

Browse Source 
Don't use the mapper - all DetachedSong instances we get have already
been mapped.
This commit is contained in:
Max Kellermann
2014-02-07 18:44:26 +01:00
parent 9b69d22d7e
commit ca7f6a26b5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/decoder/DecoderThread.cxx
View File

@@ -25,7 +25,6 @@
#include "DecoderPlugin.hxx" #include "DecoderPlugin.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "system/FatalError.hxx" #include "system/FatalError.hxx"
#include "Mapper.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
@@ -415,11 +414,10 @@ decoder_run(DecoderControl &dc)
Path path_fs = Path::Null(); Path path_fs = Path::Null();
AllocatedPath path_buffer = AllocatedPath::Null(); AllocatedPath path_buffer = AllocatedPath::Null();
if (song.IsFile()) { if (PathTraitsUTF8::IsAbsolute(uri_utf8)) {
path_buffer = map_song_fs(song); path_buffer = AllocatedPath::FromUTF8(uri_utf8, dc.error);
if (path_buffer.IsNull()) { if (path_buffer.IsNull()) {
dc.state = DecoderState::ERROR; dc.state = DecoderState::ERROR;
dc.error.Set(decoder_domain, "Failed to map song");
decoder_command_finished_locked(dc); decoder_command_finished_locked(dc);
return; return;
} }