aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-07 18:44:26 +0100
committerMax Kellermann <max@duempel.org>2014-02-07 18:50:07 +0100
commitca7f6a26b56dc5be3f00b1ff0feea3bbbdad493b (patch)
treea0f50366270db5ded6f14c0241dd3731f2e6997c
parent9b69d22d7e29f268b177fcc5220a09d21c421a9c (diff)
downloadmpd-ca7f6a26b56dc5be3f00b1ff0feea3bbbdad493b.tar.gz
mpd-ca7f6a26b56dc5be3f00b1ff0feea3bbbdad493b.tar.xz
mpd-ca7f6a26b56dc5be3f00b1ff0feea3bbbdad493b.zip
DecoderThread: use only DetachedSong::GetRealURI()
Don't use the mapper - all DetachedSong instances we get have already been mapped.
Diffstat (limited to '')
-rw-r--r--src/decoder/DecoderThread.cxx6
1 files changed, 2 insertions, 4 deletions
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;
}