player/CrossFade: fix inverted check and wrong variable

The inverted check was introduced by commit 46d00dd8, and commit 8ad17d25 added a check for the wrong variable. D'oh! Closes https://github.com/MusicPlayerDaemon/MPD/issues/1303

player/CrossFade: fix inverted check and wrong variable
0c4bf12b · Max Kellermann · b8e0855e · 0c4bf12b · 0c4bf12b
Commit 0c4bf12b authored Oct 22, 2021 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

NEWS NEWS +2 -0

CrossFade.cxx src/player/CrossFade.cxx +2 -2

No files found.
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ ver 0.23.2 (not yet released)
  - pipewire: DSD support
 * neighbor
  - mention failed plugin name in error message
+* player
+  - fix cross-fade regression
 * fix crash with libfmt versions older than 7
 ver 0.23.1 (2021/10/19)

--- a/src/player/CrossFade.cxx
+++ b/src/player/CrossFade.cxx
@@ -34,8 +34,8 @@ inline bool
 CrossFadeSettings::CanCrossFadeSong(SignedSongTime total_time) const noexcept
 {
 	return !total_time.IsNegative() &&
-		duration >= MIN_TOTAL_TIME &&
+		total_time >= MIN_TOTAL_TIME &&
-		duration >= std::chrono::duration_cast<FloatDuration>(total_time);
+		duration < std::chrono::duration_cast<FloatDuration>(total_time);
 }
 gcc_pure