Skip to content

M
mpd
Commit ca7f6a26 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

DecoderThread: use only DetachedSong::GetRealURI()

Don't use the mapper - all DetachedSong instances we get have already been mapped.
parent 9b69d22d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
src/decoder/DecoderThread.cxx
View file @ ca7f6a26
...@@ -25,7 +25,6 @@ ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment