oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'neheb/h'

Browse Source
This commit is contained in:
Max Kellermann
2020-03-16 17:29:05 +01:00
parent 256cfc545d 5e4b7e2fb7
commit fd71514068
16 changed files with 72 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/player/CrossFade.cxx
View File

@@ -23,10 +23,10 @@
#include "pcm/AudioFormat.hxx"
#include "util/NumberParser.hxx"
#include "util/Domain.hxx"
#include "util/Math.hxx"
#include "Log.hxx"
#include <cassert>
#include <cmath>
static constexpr Domain cross_fade_domain("cross_fade");
@@ -111,7 +111,7 @@ CrossFadeSettings::Calculate(SignedSongTime total_time,
if (mixramp_delay <= FloatDuration::zero() ||
!mixramp_start || !mixramp_prev_end) {
chunks = std::lround(duration / chunk_duration);
chunks = lround(duration / chunk_duration);
} else {
/* Calculate mixramp overlap. */
const auto mixramp_overlap_current =