Skip to content

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

player/CrossFade: add method IsEnabled()

parent cf6ca1b0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
src/player/CrossFade.cxx
View file @ ec52b134
...@@ -96,8 +96,8 @@ CrossFadeSettings::Calculate(SignedSongTime total_time, ...@@ -96,8 +96,8 @@ CrossFadeSettings::Calculate(SignedSongTime total_time,
{ {
unsigned int chunks = 0; unsigned int chunks = 0;
if (total_time.IsNegative() || if (!IsEnabled() ||
duration <= FloatDuration::zero() || total_time.IsNegative() ||
duration >= std::chrono::duration_cast<FloatDuration>(total_time) || duration >= std::chrono::duration_cast<FloatDuration>(total_time) ||
/* we can't crossfade when the audio formats are different */ /* we can't crossfade when the audio formats are different */
af != old_format) af != old_format)
......
src/player/CrossFade.hxx
View file @ ec52b134
...@@ -39,6 +39,10 @@ struct CrossFadeSettings { ...@@ -39,6 +39,10 @@ struct CrossFadeSettings {
*/ */
FloatDuration mixramp_delay{-1}; FloatDuration mixramp_delay{-1};
constexpr bool IsEnabled() const noexcept {
return duration.count() > 0;
}
/** /**
* Calculate how many music pipe chunks should be used for crossfading. * Calculate how many music pipe chunks should be used for crossfading.
* *
......
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