Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-05 22:28:57 +02:00
Code Issues Releases Wiki Activity

use std::min and std::max

Browse Source
This commit is contained in:
Paul Licameli 2016-08-22 16:21:41 -04:00
parent 82a5950a6c
commit a6de680cdb
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/WaveTrack.cpp
View File

@ -1628,11 +1628,10 @@ sampleCount WaveTrack::GetBestBlockSize(sampleCount s) const
sampleCount WaveTrack::GetMaxBlockSize() const
{
int maxblocksize = 0;
decltype(GetMaxBlockSize()) maxblocksize = 0;
for (const auto &clip : mClips)
{
if (clip->GetSequence()->GetMaxBlockSize() > maxblocksize)
maxblocksize = clip->GetSequence()->GetMaxBlockSize();
maxblocksize = std::max(maxblocksize, clip->GetSequence()->GetMaxBlockSize());
}
if (maxblocksize == 0)

2
src/effects/VST/VSTEffect.cpp
View File

@ -1545,7 +1545,7 @@ sampleCount VSTEffect::RealtimeProcess(int group, float **inbuf, float **outbuf,
mMasterIn[c][s] += inbuf[c][s];
}
}
mNumSamples = wxMax(numSamples, mNumSamples);
mNumSamples = std::max(numSamples, mNumSamples);
return mSlaves[group]->ProcessBlock(inbuf, outbuf, numSamples);
}

2
src/effects/nyquist/Nyquist.cpp
View File

@ -641,7 +641,7 @@ _("Selection too long for Nyquist code.\nMaximum allowed selection is %ld sample
return false;
}
if (mCurLen > mMaxLen) mCurLen = mMaxLen;
mCurLen = std::min(mCurLen, mMaxLen);
mProgressIn = 0.0;
mProgressOut = 0.0;