Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 00:03:52 +02:00
Code Issues Releases Wiki Activity

More uses of min and max

Browse Source
This commit is contained in:
Paul Licameli
2016-09-02 12:50:40 -04:00
parent f372aee9a1
commit 919d77d176
8 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mix.cpp
View File

@@ -564,19 +564,10 @@ sampleCount Mixer::MixSameRate(int *channelFlags, WaveTrackCache &cache,
if ((backwards ? t <= tEnd : t >= tEnd))
return 0;
//if we're about to approach the end of the track or selection, figure out how much we need to grab
if (backwards) {
if (t - slen/track->GetRate() < tEnd)
slen = (int)((t - tEnd) * track->GetRate() + 0.5);
}
else {
if (t + slen/track->GetRate() > tEnd)
slen = (int)((tEnd - t) * track->GetRate() + 0.5);
}
if (slen > mMaxOut)
slen = mMaxOut;
wxASSERT(slen >= 0);
slen = std::min<decltype(slen)>( slen,
((backwards ? t - tEnd : tEnd - t) * track->GetRate() + 0.5)
);
slen = std::min(slen, mMaxOut);
if (backwards) {
auto results = cache.Get(floatSample, *pos - (slen - 1), slen);