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

PlaylistSong: don't map relative URI to absolute path

Browse Source 
This didn't make sense.
This commit is contained in:
Max Kellermann 2014-01-20 22:43:08 +01:00
parent a237e7f860
commit 414d5b648c
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/PlaylistSong.cxx
View File

@ -51,30 +51,14 @@ merge_song_metadata(DetachedSong &dest, const DetachedSong &base,
static DetachedSong * static DetachedSong *
apply_song_metadata(DetachedSong *dest, const DetachedSong &src) apply_song_metadata(DetachedSong *dest, const DetachedSong &src)
{ {
DetachedSong *tmp;
assert(dest != nullptr); assert(dest != nullptr);
if (!src.GetTag().IsDefined() && if (!src.GetTag().IsDefined() &&
src.GetStartMS() == 0 && src.GetEndMS() == 0) src.GetStartMS() == 0 && src.GetEndMS() == 0)
return dest; return dest;
if (dest->IsInDatabase()) { DetachedSong *tmp = new DetachedSong(dest->GetURI());
const auto path_fs = map_song_fs(*dest); merge_song_metadata(*tmp, *dest, src);
if (path_fs.IsNull())
return dest;
std::string path_utf8 = path_fs.ToUTF8();
if (path_utf8.empty())
path_utf8 = path_fs.c_str();
tmp = new DetachedSong(std::move(path_utf8));
merge_song_metadata(*tmp, *dest, src);
} else {
tmp = new DetachedSong(dest->GetURI());
merge_song_metadata(*tmp, *dest, src);
}
if (dest->GetTag().IsDefined() && dest->GetTag().time > 0 && if (dest->GetTag().IsDefined() && dest->GetTag().time > 0 &&
src.GetStartMS() > 0 && src.GetEndMS() == 0 && src.GetStartMS() > 0 && src.GetEndMS() == 0 &&