DetachedSong: compare start_time and end_time in IsSame()

This method is used by DecoderControl::IsCurrentSong(), which is used by the player thread to check whether the current decoder instance can be reused to seek. When switching to another song in the same CUE sheet, previously DetachedSong::IsSame() returned true, and thus the old decoder instance was used for the new song, not considering the new end_time. This led to the old decoder quickly quitting.

DetachedSong: compare start_time and end_time in IsSame()
e847ddf0 · Max Kellermann · 7e8b4489 · e847ddf0 · e847ddf0
Commit e847ddf0 authored Jan 15, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

NEWS NEWS +2 -0

DetachedSong.hxx src/DetachedSong.hxx +3 -1

No files found.
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ ver 0.20.2 (not yet released)
  - alsa: fix the DSD_U32 byte order
  - alsa: support DSD_U16
  - recorder: fix error "Failed to create : No such file or directory"
+* playlist
+  - cue: fix skipping songs
 ver 0.20.1 (2017/01/09)
 * input

--- a/src/DetachedSong.hxx
+++ b/src/DetachedSong.hxx
@@ -146,7 +146,9 @@ public:
 	 */
 	gcc_pure
 	bool IsSame(const DetachedSong &other) const {
-		return uri == other.uri;
+		return uri == other.uri &&
+			start_time == other.start_time &&
+			end_time == other.end_time;
 	}
 	gcc_pure gcc_nonnull_all