Skip to content

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

PlaylistSong, CueParser: don't override Tag::time

Now that Song::GetDuration() is used (which considers start_ms and end_ms), we don't need to override the Tag's duration value.
parent 071d0546
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 11 deletions
src/playlist/PlaylistSong.cxx
View file @ 5ca6e291
......@@ -50,15 +50,6 @@ apply_song_metadata(DetachedSong &dest, const DetachedSong &src)
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
......
src/playlist/cue/CueParser.cxx
View file @ 5ca6e291
......@@ -270,8 +270,6 @@ CueParser::Feed2(char *p)
previous->GetStartMS() < (unsigned)position_ms) {
last_updated = true;
previous->SetEndMS(position_ms);
previous->WritableTag().time =
(previous->GetEndMS() - previous->GetStartMS() + 500) / 1000;
}
current->SetStartMS(position_ms);
......
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