73b0610d89
Playback with some decoder plugins was broken because the Queue's DetachedSong instances did not have the "real" URI (the mapped path).
98 lines
2.9 KiB
C++
98 lines
2.9 KiB
C++
/*
|
|
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include "PlaylistSong.hxx"
|
|
#include "SongLoader.hxx"
|
|
#include "tag/Tag.hxx"
|
|
#include "tag/TagBuilder.hxx"
|
|
#include "fs/Traits.hxx"
|
|
#include "util/UriUtil.hxx"
|
|
#include "util/Error.hxx"
|
|
#include "DetachedSong.hxx"
|
|
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
|
|
static void
|
|
merge_song_metadata(DetachedSong &add, const DetachedSong &base)
|
|
{
|
|
{
|
|
TagBuilder builder(add.GetTag());
|
|
builder.Complement(base.GetTag());
|
|
add.SetTag(builder.Commit());
|
|
}
|
|
|
|
add.SetLastModified(base.GetLastModified());
|
|
}
|
|
|
|
static void
|
|
apply_song_metadata(DetachedSong &dest, const DetachedSong &src)
|
|
{
|
|
if (!src.GetTag().IsDefined() &&
|
|
src.GetStartMS() == 0 && src.GetEndMS() == 0)
|
|
return;
|
|
|
|
merge_song_metadata(dest, src);
|
|
|
|
if (dest.GetTag().IsDefined() && dest.GetTag().time > 0 &&
|
|
src.GetStartMS() > 0 && src.GetEndMS() == 0 &&
|
|
src.GetStartMS() / 1000 < (unsigned)dest.GetTag().time)
|
|
/* the range is open-ended, and the playlist plugin
|
|
did not know the total length of the song file
|
|
(e.g. last track on a CUE file); fix it up here */
|
|
dest.WritableTag().time =
|
|
dest.GetTag().time - src.GetStartMS() / 1000;
|
|
}
|
|
|
|
static bool
|
|
playlist_check_load_song(DetachedSong &song, const SongLoader &loader)
|
|
{
|
|
DetachedSong *tmp = loader.LoadSong(song.GetURI(), IgnoreError());
|
|
if (tmp == nullptr)
|
|
return false;
|
|
|
|
song.SetURI(tmp->GetURI());
|
|
if (!song.HasRealURI() && tmp->HasRealURI())
|
|
song.SetRealURI(tmp->GetRealURI());
|
|
|
|
apply_song_metadata(song, *tmp);
|
|
delete tmp;
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
playlist_check_translate_song(DetachedSong &song, const char *base_uri,
|
|
const SongLoader &loader)
|
|
{
|
|
if (base_uri != nullptr && strcmp(base_uri, ".") == 0)
|
|
/* PathTraitsUTF8::GetParent() returns "." when there
|
|
is no directory name in the given path; clear that
|
|
now, because it would break the database lookup
|
|
functions */
|
|
base_uri = nullptr;
|
|
|
|
const char *uri = song.GetURI();
|
|
if (base_uri != nullptr && !uri_has_scheme(uri) &&
|
|
!PathTraitsUTF8::IsAbsolute(uri))
|
|
song.SetURI(PathTraitsUTF8::Build(base_uri, uri));
|
|
|
|
return playlist_check_load_song(song, loader);
|
|
}
|