Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1853] trunk/OpenMPT
|
From: <man...@us...> - 2013-04-12 13:35:43
|
Revision: 1853
http://sourceforge.net/p/modplug/code/1853
Author: manxorist
Date: 2013-04-12 13:35:31 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
[Ref] Replace Util::Min and Util::Max with std::min and std::max.
Modified Paths:
--------------
trunk/OpenMPT/common/misc_util.h
trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
trunk/OpenMPT/mptrack/CleanupSong.cpp
trunk/OpenMPT/mptrack/Ctrl_pat.h
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/Mainbar.cpp
trunk/OpenMPT/mptrack/Mod2wave.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/Undo.cpp
trunk/OpenMPT/mptrack/View_ins.cpp
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/View_smp.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/VstPresets.cpp
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/soundlib/ITCompression.cpp
trunk/OpenMPT/soundlib/LOAD_AMF.CPP
trunk/OpenMPT/soundlib/LOAD_DMF.CPP
trunk/OpenMPT/soundlib/Load_ams.cpp
trunk/OpenMPT/soundlib/Load_imf.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_mod.cpp
trunk/OpenMPT/soundlib/Load_mtm.cpp
trunk/OpenMPT/soundlib/Load_psm.cpp
trunk/OpenMPT/soundlib/Load_s3m.cpp
trunk/OpenMPT/soundlib/Load_stm.cpp
trunk/OpenMPT/soundlib/Load_ult.cpp
trunk/OpenMPT/soundlib/Load_wav.cpp
trunk/OpenMPT/soundlib/Load_xm.cpp
trunk/OpenMPT/soundlib/Message.cpp
trunk/OpenMPT/soundlib/ModSequence.cpp
trunk/OpenMPT/soundlib/SampleFormats.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Sndmix.cpp
trunk/OpenMPT/soundlib/WAVTools.cpp
trunk/OpenMPT/soundlib/XMTools.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
trunk/OpenMPT/soundlib/pattern.cpp
trunk/OpenMPT/soundlib/plugins/PluginEventQueue.h
Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/common/misc_util.h 2013-04-12 13:35:31 UTC (rev 1853)
@@ -259,14 +259,8 @@
template <> struct NumericTraits<uint64> {static const uint64 maxValue = uint64_max; static const uint64 minValue = 0;};
template <> struct NumericTraits<unsigned long> {static const unsigned long maxValue = ULONG_MAX; static const unsigned long minValue = 0;};
- // Like std::max, but avoids conflict with max-macro.
- template <class T> inline const T& Max(const T& a, const T& b) {return (std::max)(a, b);}
-
- // Like std::min, but avoids conflict with min-macro.
- template <class T> inline const T& Min(const T& a, const T& b) {return (std::min)(a, b);}
-
// Minimum of 3 values
- template <class T> inline const T& Min(const T& a, const T& b, const T& c) {return Min(Min(a, b), c);}
+ template <class T> inline const T& Min(const T& a, const T& b, const T& c) {return std::min(std::min(a, b), c);}
// Returns maximum value of given integer type.
template <class T> inline T MaxValueOfType(const T&) {static_assert(std::numeric_limits<T>::is_integer == true, "Only integer types are allowed."); return (std::numeric_limits<T>::max)();}
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -478,7 +478,7 @@
m_pPresetMenuGroup[bank]->CreatePopupMenu();
CString label;
- label.Format("Bank %d (%d-%d)", bank + 1, prog, Util::Min(prog + PRESETS_PER_GROUP - 1, numProgs));
+ label.Format("Bank %d (%d-%d)", bank + 1, prog, std::min(prog + PRESETS_PER_GROUP - 1, numProgs));
m_PresetMenu.AppendMenu(MF_POPUP | (bank % 32 == 0 ? MF_MENUBREAK : 0), reinterpret_cast<UINT_PTR>(m_pPresetMenuGroup[bank]->m_hMenu), label);
}
}
Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -582,7 +582,7 @@
loopLength = sample.nLoopEnd;
if(sample.uFlags[CHN_SUSTAINLOOP])
{
- loopLength = Util::Max(sample.nLoopEnd, sample.nSustainEnd);
+ loopLength = std::max(sample.nLoopEnd, sample.nSustainEnd);
}
}
@@ -608,7 +608,7 @@
// Sustain loop is played before normal loop, and it can actually be located after the normal loop.
if(sample.uFlags[CHN_SUSTAINLOOP])
{
- loopLength = Util::Max(sample.nLoopEnd, sample.nSustainEnd);
+ loopLength = std::max(sample.nLoopEnd, sample.nSustainEnd);
}
}
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.h 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.h 2013-04-12 13:35:31 UTC (rev 1853)
@@ -80,7 +80,7 @@
ORDERINDEX GetMargins() { return GetMargins(GetMarginsMax()); }
// Returns the effective margin value.
- ORDERINDEX GetMargins(const ORDERINDEX maxMargins) const { return Util::Min(maxMargins, static_cast<ORDERINDEX>(m_nOrderlistMargins)); }
+ ORDERINDEX GetMargins(const ORDERINDEX maxMargins) const { return std::min(maxMargins, static_cast<ORDERINDEX>(m_nOrderlistMargins)); }
// Returns maximum margin value given current window width.
ORDERINDEX GetMarginsMax() { return GetMarginsMax(GetLength()); }
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -293,7 +293,7 @@
{
// Must move first shown sequence item to left in order to show
// the new active order.
- m_nXScroll = Util::Max(ORDERINDEX(0), static_cast<ORDERINDEX>(nOrder - nMargins));
+ m_nXScroll = std::max(ORDERINDEX(0), static_cast<ORDERINDEX>(nOrder - nMargins));
SetScrollPos(SB_HORZ, m_nXScroll);
InvalidateRect(NULL, FALSE);
} else
@@ -682,7 +682,7 @@
if(sndFile.Order.GetLength() > maxEntries)
{
// Only computed if potentially needed.
- maxEntries = Util::Max(maxEntries, sndFile.Order.GetLengthTailTrimmed());
+ maxEntries = std::max(maxEntries, sndFile.Order.GetLengthTailTrimmed());
}
// Scrolling the shown orders(the showns rectangles)?
@@ -737,7 +737,7 @@
{
if(nPat == sndFile.Order.GetInvalidPatIndex()) strcpy(s, "---");
else if(nPat == sndFile.Order.GetIgnoreIndex()) strcpy(s, "+++");
- else if(nPat < Util::Max(sndFile.Patterns.Size(), sndFile.GetModSpecifications().patternsMax)) wsprintf(s, "%u", nPat);
+ else if(nPat < std::max(sndFile.Patterns.Size(), sndFile.GetModSpecifications().patternsMax)) wsprintf(s, "%u", nPat);
else strcpy(s, "???");
}
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -2011,7 +2011,7 @@
m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
// Swap sample buffer pointer to new buffer, update song + sample data & free old sample buffer
- ctrlSmp::ReplaceSample(sample, (LPSTR)pNewSample, Util::Min(nLengthCounter, nNewSampleLength), *m_pSndFile);
+ ctrlSmp::ReplaceSample(sample, (LPSTR)pNewSample, std::min(nLengthCounter, nNewSampleLength), *m_pSndFile);
// Free progress bar brushes
DeleteObject((HBRUSH)green);
Modified: trunk/OpenMPT/mptrack/Mainbar.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mainbar.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/Mainbar.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -518,10 +518,10 @@
{
if (n < 0)
{
- pSndFile->m_nMusicSpeed = Util::Max(UINT(nCurrentSpeed - 1), pSndFile->GetModSpecifications().speedMin);
+ pSndFile->m_nMusicSpeed = std::max(UINT(nCurrentSpeed - 1), pSndFile->GetModSpecifications().speedMin);
} else
{
- pSndFile->m_nMusicSpeed = Util::Min(UINT(nCurrentSpeed + 1), pSndFile->GetModSpecifications().speedMax);
+ pSndFile->m_nMusicSpeed = std::min(UINT(nCurrentSpeed + 1), pSndFile->GetModSpecifications().speedMax);
}
m_SpinSpeed.SetPos(0);
}
@@ -1162,7 +1162,7 @@
if(horizontal)
{
- const int cx = Util::Max(1, rect.Width());
+ const int cx = std::max(1, rect.Width());
int v = (vu * cx) >> 8;
for(int rx = rect.left; rx <= rect.right; rx += 2)
@@ -1182,7 +1182,7 @@
lastV[index] = v;
} else
{
- const int cy = Util::Max(1, rect.Height());
+ const int cy = std::max(1, rect.Height());
int v = (vu * cy) >> 8;
for(int ry = rect.bottom - 1; ry > rect.top; ry -= 2)
Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -750,7 +750,7 @@
// calculate maximum samples
ULONGLONG max = ullMaxSamples;
- ULONGLONG l = ((ULONGLONG)m_pSndFile->GetSongTime()) * m_pWaveFormat->nSamplesPerSec * (ULONGLONG)Util::Max(1, 1 + m_pSndFile->GetRepeatCount());
+ ULONGLONG l = ((ULONGLONG)m_pSndFile->GetSongTime()) * m_pWaveFormat->nSamplesPerSec * (ULONGLONG)std::max(1, 1 + m_pSndFile->GetRepeatCount());
if (m_nMaxPatterns > 0)
{
DWORD dwOrds = m_pSndFile->Order.GetLengthFirstEmpty();
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -1033,7 +1033,7 @@
pChn->nPosLo = 0;
pChn->nLoopStart = loopStart;
pChn->nLoopEnd = loopEnd;
- pChn->nLength = Util::Min(loopEnd, pChn->pModSample->nLength);
+ pChn->nLength = std::min(loopEnd, pChn->pModSample->nLength);
}
// Handle extra-loud flag
@@ -1726,7 +1726,7 @@
m_SndFile.SetRepeatCount(0);
} else
{
- m_SndFile.SetRepeatCount(Util::Max(0, wsdlg.loopCount - 1));
+ m_SndFile.SetRepeatCount(std::max(0, wsdlg.loopCount - 1));
}
CDoWaveConvert dwcdlg(&m_SndFile, thisName, &wsdlg.WaveFormat.Format, wsdlg.m_bNormalize, pMainFrm);
@@ -2712,7 +2712,7 @@
CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
if(pMainFrm != nullptr)
{
- pMainFrm->SetElapsedTime(Util::Max(0.0, t));
+ pMainFrm->SetElapsedTime(std::max(0.0, t));
}
}
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -274,7 +274,7 @@
const SAMPLEINDEX oldNumSamples = m_SndFile.GetNumSamples(), newNumSamples = static_cast<SAMPLEINDEX>(newOrder.size());
- for(SAMPLEINDEX i = 0; i < Util::Min(newNumSamples, oldNumSamples); i++)
+ for(SAMPLEINDEX i = 0; i < std::min(newNumSamples, oldNumSamples); i++)
{
if(newOrder[i] != i + 1)
{
Modified: trunk/OpenMPT/mptrack/Undo.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Undo.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/Undo.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -140,7 +140,7 @@
{
// Add or remove channels
vector<CHANNELINDEX> channels(undo.channelInfo->oldNumChannels, CHANNELINDEX_INVALID);
- const CHANNELINDEX copyCount = Util::Min(sndFile.GetNumChannels(), undo.channelInfo->oldNumChannels);
+ const CHANNELINDEX copyCount = std::min(sndFile.GetNumChannels(), undo.channelInfo->oldNumChannels);
for(CHANNELINDEX i = 0; i < copyCount; i++)
{
channels[i] = i;
Modified: trunk/OpenMPT/mptrack/View_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/View_ins.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -328,7 +328,7 @@
tickDiff = envelope->Ticks[nPoint] - tickDiff;
for(uint32 i = nPoint + 1; i < envelope->nNodes; i++)
{
- envelope->Ticks[i] = (uint16)(Util::Max(0, (int)envelope->Ticks[i] + tickDiff));
+ envelope->Ticks[i] = (uint16)(std::max(0, (int)envelope->Ticks[i] + tickDiff));
}
}
@@ -2511,7 +2511,7 @@
if (nFlags == MK_CONTROL)
{
// Speed up zoom scrolling by some factor (might need some tuning).
- const float speedUpFactor = Util::Max(1.0f, m_fZoom * 7.0f / ENV_MAX_ZOOM);
+ const float speedUpFactor = std::max(1.0f, m_fZoom * 7.0f / ENV_MAX_ZOOM);
EnvSetZoom(m_fZoom + speedUpFactor * (zDelta / WHEEL_DELTA));
}
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -2901,7 +2901,7 @@
// Don't allow notes outside our supported note range.
const ModCommand::NOTE noteMin = pSndFile->GetModSpecifications().noteMin;
const ModCommand::NOTE noteMax = pSndFile->GetModSpecifications().noteMax;
- const int instrMax = Util::Min(static_cast<int>(Util::MaxValueOfType(ModCommand::INSTR())), static_cast<int>(pSndFile->GetNumInstruments() ? pSndFile->GetModSpecifications().instrumentsMax : pSndFile->GetModSpecifications().samplesMax));
+ const int instrMax = std::min(static_cast<int>(Util::MaxValueOfType(ModCommand::INSTR())), static_cast<int>(pSndFile->GetNumInstruments() ? pSndFile->GetModSpecifications().instrumentsMax : pSndFile->GetModSpecifications().samplesMax));
const EffectInfo effectInfo(*pSndFile);
const int offset = up ? 1 : -1;
Modified: trunk/OpenMPT/mptrack/View_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/View_smp.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -2790,7 +2790,7 @@
// Solve samplesPerPixel from [2], then "m_nZoom" from [1].
float zoom = static_cast<float>(smp.nLength) / static_cast<float>(m_rcClient.Width());
zoom = 1 + (log10(zoom) / log10(2.0f));
- return static_cast<UINT>(Util::Max(zoom + 1, MIN_ZOOM + 1.0f));
+ return static_cast<UINT>(std::max(zoom + 1, MIN_ZOOM + 1.0f));
}
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -2122,8 +2122,8 @@
if(Reporting::Confirm(_T("Replace the current orderlist?"), _T("Sequence import")) == cnfNo)
return false;
}
- pSndFile->Order.resize(Util::Min(pSndFile->GetModSpecifications().ordersMax, pOrigSeq->GetLength()), pSndFile->Order.GetInvalidPatIndex());
- for(ORDERINDEX nOrd = 0; nOrd < Util::Min(pSndFile->GetModSpecifications().ordersMax, pOrigSeq->GetLengthTailTrimmed()); nOrd++)
+ pSndFile->Order.resize(std::min(pSndFile->GetModSpecifications().ordersMax, pOrigSeq->GetLength()), pSndFile->Order.GetInvalidPatIndex());
+ for(ORDERINDEX nOrd = 0; nOrd < std::min(pSndFile->GetModSpecifications().ordersMax, pOrigSeq->GetLengthTailTrimmed()); nOrd++)
{
PATTERNINDEX nOrigPat = pDragSndFile->Order.GetSequence(nOrigSeq)[nOrd];
// translate pattern index
Modified: trunk/OpenMPT/mptrack/VstPresets.cpp
===================================================================
--- trunk/OpenMPT/mptrack/VstPresets.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/VstPresets.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -135,7 +135,7 @@
// Write unfinished header... We need to update the size once we're done writing.
Write(header, f);
- uint32 numProgs = Util::Max(plugin.GetNumPrograms(), VstInt32(1)), curProg = plugin.GetCurrentProgram();
+ uint32 numProgs = std::max(plugin.GetNumPrograms(), VstInt32(1)), curProg = plugin.GetCurrentProgram();
WriteBE(numProgs, f);
WriteBE(curProg, f);
char reserved[124];
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -1537,14 +1537,14 @@
VstInt32 CVstPlugin::GetNumPrograms()
//-----------------------------------
{
- return Util::Max(m_Effect.numPrograms, VstInt32(0));
+ return std::max(m_Effect.numPrograms, VstInt32(0));
}
PlugParamIndex CVstPlugin::GetNumParameters()
//-------------------------------------------
{
- return Util::Max(m_Effect.numParams, VstInt32(0));
+ return std::max(m_Effect.numParams, VstInt32(0));
}
@@ -2421,7 +2421,7 @@
bool bankChanged = (channel.currentBank != --wMidiBank) && (wMidiBank < 0x4000);
bool progChanged = (channel.currentProgram != --nMidiProg) && (nMidiProg < 0x80);
//get vol in [0,128[
- uint8 volume = static_cast<uint8>(Util::Min(vol / 2, 127));
+ uint8 volume = static_cast<uint8>(std::min(vol / 2, 127));
// Bank change
if(wMidiBank < 0x4000 && bankChanged)
Modified: trunk/OpenMPT/soundlib/ITCompression.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ITCompression.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/ITCompression.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -119,7 +119,7 @@
void ITCompression::Compress(const void *data, SmpLength offset, SmpLength actualLength)
//--------------------------------------------------------------------------------------
{
- baseLength = Util::Min(actualLength, SmpLength(blockSize / sizeof(Properties::sample_t)));
+ baseLength = std::min(actualLength, SmpLength(blockSize / sizeof(Properties::sample_t)));
CopySample<Properties::sample_t>(sampleData, data, offset, baseLength, mptSample.GetNumChannels());
@@ -374,7 +374,7 @@
void ITDecompression::Uncompress(void *target)
//--------------------------------------------
{
- curLength = Util::Min(mptSample.nLength - writtenSamples, SmpLength(ITCompression::blockSize / sizeof(Properties::sample_t)));
+ curLength = std::min(mptSample.nLength - writtenSamples, SmpLength(ITCompression::blockSize / sizeof(Properties::sample_t)));
int width = Properties::defWidth;
while(curLength > 0)
Modified: trunk/OpenMPT/soundlib/LOAD_AMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_AMF.CPP 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/LOAD_AMF.CPP 2013-04-12 13:35:31 UTC (rev 1853)
@@ -56,7 +56,7 @@
{
mptSmp.Initialize();
mptSmp.nFineTune = MOD2XMFineTune(finetune);
- mptSmp.nVolume = Util::Min(defaultVolume, uint8(64)) * 4u;
+ mptSmp.nVolume = std::min(defaultVolume, uint8(64)) * 4u;
mptSmp.RelativeTone = transpose;
mptSmp.nLength = length;
@@ -272,7 +272,7 @@
// 03: Volume
case 0x03:
- param = Util::Min(param, uint8(64));
+ param = std::min(param, uint8(64));
if(m.volcmd == VOLCMD_NONE || m.volcmd == VOLCMD_VOLUME)
{
m.volcmd = VOLCMD_VOLUME;
@@ -465,7 +465,7 @@
}
sample.nC5Speed = file.ReadUint16LE();
- sample.nVolume = Util::Min(file.ReadUint8(), uint8(64)) * 4u;
+ sample.nVolume = std::min(file.ReadUint8(), uint8(64)) * 4u;
if(fileHeader.version < 10)
{
@@ -497,7 +497,7 @@
sample.nLoopStart = sample.nLoopEnd = 0;
}
- maxSamplePos = Util::Max(maxSamplePos, samplePos[smp - 1]);
+ maxSamplePos = std::max(maxSamplePos, samplePos[smp - 1]);
}
}
@@ -507,7 +507,7 @@
uint16 trackCount = 0;
for(vector<uint16>::const_iterator i = trackMap.begin(); i != trackMap.end(); i++)
{
- trackCount = Util::Max(trackCount, *i);
+ trackCount = std::max(trackCount, *i);
}
// Store Tracks Positions
Modified: trunk/OpenMPT/soundlib/LOAD_DMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-04-12 13:35:31 UTC (rev 1853)
@@ -390,7 +390,7 @@
}
PatternRow m = sndFile.Patterns[pat].GetRow(0);
- const CHANNELINDEX numChannels = Util::Min(sndFile.GetNumChannels(), CHANNELINDEX(patHead.numTracks));
+ const CHANNELINDEX numChannels = std::min(sndFile.GetNumChannels(), CHANNELINDEX(patHead.numTracks));
// When breaking to a pattern with less channels that the previous pattern,
// all voices in the now unused channels are killed:
@@ -431,7 +431,7 @@
{
case 1: // Set Tick Frame Speed
settings.realBPMmode = false;
- settings.tempoTicks = Util::Max(uint8(1), globalData); // Tempo in 1/4 rows per second
+ settings.tempoTicks = std::max(uint8(1), globalData); // Tempo in 1/4 rows per second
settings.tempoBPM = 0; // Automatically updated by X-Tracker
tempoChange = true;
break;
@@ -514,7 +514,7 @@
// For some reason, using settings.tempoTicks + 1 gives more accurate results than just settings.tempoTicks... (same problem in the old libmodplug DMF loader)
// Original unoptimized formula:
//const int tickspeed = (tempoRealBPMmode) ? MAX(1, (tempoData * beat * 4) / 60) : tempoData;
- const int tickspeed = (settings.realBPMmode) ? Util::Max(1, settings.tempoBPM * settings.beat * 2) : ((settings.tempoTicks + 1) * 30);
+ const int tickspeed = (settings.realBPMmode) ? std::max(1, settings.tempoBPM * settings.beat * 2) : ((settings.tempoTicks + 1) * 30);
// Try to find matching speed - try higher speeds first, so that effects like arpeggio and tremor work better.
for(speed = 255; speed > 1; speed--)
{
@@ -975,7 +975,7 @@
{
return false;
}
- const ORDERINDEX numOrders = Util::Min(MAX_ORDERS, static_cast<ORDERINDEX>((chunk.GetLength() - sizeof(DMFSequence)) / 2));
+ const ORDERINDEX numOrders = std::min(MAX_ORDERS, static_cast<ORDERINDEX>((chunk.GetLength() - sizeof(DMFSequence)) / 2));
Order.resize(numOrders, Order.GetInvalidPatIndex());
for(ORDERINDEX i = 0; i < numOrders; i++)
Modified: trunk/OpenMPT/soundlib/Load_ams.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ams.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_ams.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -170,7 +170,7 @@
case CMD_VOLUME:
m.command = CMD_NONE;
m.volcmd = VOLCMD_VOLUME;
- m.vol = static_cast<ModCommand::VOL>(Util::Min((m.param + 1) / 2, 64));
+ m.vol = static_cast<ModCommand::VOL>(std::min((m.param + 1) / 2, 64));
break;
case CMD_MODCMDEX:
@@ -206,13 +206,13 @@
case 0x11:
case 0x12:
// Extra fine slides
- m.param = static_cast<ModCommand::PARAM>(Util::Min(uint8(0x0F), m.param) | 0xE0);
+ m.param = static_cast<ModCommand::PARAM>(std::min(uint8(0x0F), m.param) | 0xE0);
break;
case 0x15:
case 0x16:
// Fine slides
- m.param = static_cast<ModCommand::PARAM>((Util::Min(0x10, m.param + 1) / 2) | 0xF0);
+ m.param = static_cast<ModCommand::PARAM>((std::min(0x10, m.param + 1) / 2) | 0xF0);
break;
case 0x1E:
@@ -247,7 +247,7 @@
case 0x1C:
// Adjust channel volume range
- m.param = static_cast<ModCommand::PARAM>(Util::Min((m.param + 1) / 2, 64));
+ m.param = static_cast<ModCommand::PARAM>(std::min((m.param + 1) / 2, 64));
break;
}
}
@@ -339,10 +339,10 @@
mptSmp.Initialize();
mptSmp.nLength = length;
- mptSmp.nLoopStart = Util::Min(loopStart, length);
- mptSmp.nLoopEnd = Util::Min(loopEnd, length);
+ mptSmp.nLoopStart = std::min(loopStart, length);
+ mptSmp.nLoopEnd = std::min(loopEnd, length);
- mptSmp.nVolume = (Util::Min(uint8(127), volume) * 256 + 64) / 127;
+ mptSmp.nVolume = (std::min(uint8(127), volume) * 256 + 64) / 127;
if(panFinetune & 0xF0)
{
mptSmp.nPan = (panFinetune & 0xF0);
@@ -541,7 +541,7 @@
}
STATIC_ASSERT(MAX_ENVPOINTS >= CountOf(data));
- mptEnv.nNodes = Util::Min(numPoints, uint8(CountOf(data)));
+ mptEnv.nNodes = std::min(numPoints, uint8(CountOf(data)));
mptEnv.nLoopStart = loopStart;
mptEnv.nLoopEnd = loopEnd;
mptEnv.nSustainStart = mptEnv.nSustainEnd = sustainPoint;
@@ -550,7 +550,7 @@
{
if(i != 0)
{
- mptEnv.Ticks[i] = mptEnv.Ticks[i - 1] + static_cast<uint16>(Util::Max(1, data[i][0] | ((data[i][1] & 0x01) << 8)));
+ mptEnv.Ticks[i] = mptEnv.Ticks[i - 1] + static_cast<uint16>(std::max(1, data[i][0] | ((data[i][1] & 0x01) << 8)));
}
mptEnv.Values[i] = data[i][2];
}
@@ -645,8 +645,8 @@
mptSmp.Initialize();
mptSmp.nLength = length;
- mptSmp.nLoopStart = Util::Min(loopStart, length);
- mptSmp.nLoopEnd = Util::Min(loopEnd, length);
+ mptSmp.nLoopStart = std::min(loopStart, length);
+ mptSmp.nLoopEnd = std::min(loopEnd, length);
mptSmp.nC5Speed = c4speed * 2;
if(c4speed == 0)
@@ -657,7 +657,7 @@
uint32 newC4speed = ModSample::TransposeToFrequency(relativeTone, MOD2XMFineTune(panFinetune & 0x0F));
mptSmp.nC5Speed = (mptSmp.nC5Speed * newC4speed) / 8363;
- mptSmp.nVolume = (Util::Min(uint8(127), volume) * 256 + 64) / 127;
+ mptSmp.nVolume = (std::min(uint8(127), volume) * 256 + 64) / 127;
if(panFinetune & 0xF0)
{
mptSmp.nPan = (panFinetune & 0xF0);
@@ -717,14 +717,14 @@
uint16 headerFlags;
if(fileHeader.format == 0x202)
{
- m_nDefaultTempo = Util::Max(uint8(32), static_cast<uint8>(file.ReadUint16LE() >> 8)); // 16.16 Tempo
- m_nDefaultSpeed = Util::Max(uint8(1), file.ReadUint8());
+ m_nDefaultTempo = std::max(uint8(32), static_cast<uint8>(file.ReadUint16LE() >> 8)); // 16.16 Tempo
+ m_nDefaultSpeed = std::max(uint8(1), file.ReadUint8());
file.Skip(3); // Default values for pattern editor
headerFlags = file.ReadUint16LE();
} else if(fileHeader.format == 0x201)
{
- m_nDefaultTempo = Util::Max(uint8(32), file.ReadUint8());
- m_nDefaultSpeed = Util::Max(uint8(1), file.ReadUint8());
+ m_nDefaultTempo = std::max(uint8(32), file.ReadUint8());
+ m_nDefaultSpeed = std::max(uint8(1), file.ReadUint8());
headerFlags = file.ReadUint8();
} else
{
@@ -793,9 +793,9 @@
// Scale envelopes to correct range
for(size_t i = 0; i < MAX_ENVPOINTS; i++)
{
- instrument->VolEnv.Values[i] = Util::Min(uint8(ENVELOPE_MAX), static_cast<uint8>((instrument->VolEnv.Values[i] * ENVELOPE_MAX + 64u) / 127u));
- instrument->PanEnv.Values[i] = Util::Min(uint8(ENVELOPE_MAX), static_cast<uint8>((instrument->PanEnv.Values[i] * ENVELOPE_MAX + 128u) / 255u));
- instrument->PitchEnv.Values[i] = Util::Min(uint8(ENVELOPE_MAX), static_cast<uint8>(32 + (static_cast<int8>(instrument->PitchEnv.Values[i] - 128) * vibAmp) / 255));
+ instrument->VolEnv.Values[i] = std::min(uint8(ENVELOPE_MAX), static_cast<uint8>((instrument->VolEnv.Values[i] * ENVELOPE_MAX + 64u) / 127u));
+ instrument->PanEnv.Values[i] = std::min(uint8(ENVELOPE_MAX), static_cast<uint8>((instrument->PanEnv.Values[i] * ENVELOPE_MAX + 128u) / 255u));
+ instrument->PitchEnv.Values[i] = std::min(uint8(ENVELOPE_MAX), static_cast<uint8>(32 + (static_cast<int8>(instrument->PitchEnv.Values[i] - 128) * vibAmp) / 255));
}
// Sample headers - we will have to read them even for shadow samples, and we will have to load them several times,
@@ -819,7 +819,7 @@
}
firstSample.push_back(firstSmp);
- m_nSamples = static_cast<SAMPLEINDEX>(Util::Min(MAX_SAMPLES - 1, GetNumSamples() + numSamples));
+ m_nSamples = static_cast<SAMPLEINDEX>(std::min(MAX_SAMPLES - 1, GetNumSamples() + numSamples));
}
// Text
@@ -857,7 +857,7 @@
{
c = textIn[readLen++];
uint32 count = textIn[readLen++];
- for(size_t i = Util::Min(descriptionHeader.unpackedLen - writeLen, count); i != 0; i--)
+ for(size_t i = std::min(descriptionHeader.unpackedLen - writeLen, count); i != 0; i--)
{
textOut[writeLen++] = c;
}
@@ -980,7 +980,7 @@
if(--i != 0 && ch == packCharacter)
{
uint8 repCount = *(in++);
- repCount = static_cast<uint8>(Util::Min(static_cast<size_t>(repCount), j));
+ repCount = static_cast<uint8>(std::min(static_cast<size_t>(repCount), j));
if(--i != 0 && repCount)
{
ch = *(in++);
Modified: trunk/OpenMPT/soundlib/Load_imf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_imf.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_imf.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -117,9 +117,9 @@
uint16 minTick = 0; // minimum tick value for next node
for(uint32 n = 0; n < mptEnv.nNodes; n++)
{
- minTick = mptEnv.Ticks[n] = Util::Max(minTick, nodes[e][n].tick);
+ minTick = mptEnv.Ticks[n] = std::max(minTick, nodes[e][n].tick);
minTick++;
- mptEnv.Values[n] = static_cast<uint8>(Util::Min(nodes[e][n].value >> shift, ENVELOPE_MAX));
+ mptEnv.Values[n] = static_cast<uint8>(std::min(nodes[e][n].value >> shift, ENVELOPE_MAX));
}
}
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -403,8 +403,8 @@
m_nDefaultGlobalVolume = fileHeader.globalvol << 1;
if(m_nDefaultGlobalVolume > MAX_GLOBAL_VOLUME) m_nDefaultGlobalVolume = MAX_GLOBAL_VOLUME;
if(fileHeader.speed) m_nDefaultSpeed = fileHeader.speed;
- m_nDefaultTempo = Util::Max(uint8(32), fileHeader.tempo); // Tempo 31 is possible. due to conflicts with the rest of the engine, let's just clamp it to 32.
- m_nSamplePreAmp = Util::Min(fileHeader.mv, uint8(128));
+ m_nDefaultTempo = std::max(uint8(32), fileHeader.tempo); // Tempo 31 is possible. due to conflicts with the rest of the engine, let's just clamp it to 32.
+ m_nSamplePreAmp = std::min(fileHeader.mv, uint8(128));
// Reading Channels Pan Positions
for(CHANNELINDEX i = 0; i < 64; i++) if(fileHeader.chnpan[i] != 0xFF)
@@ -461,7 +461,7 @@
{
if(insPos[n] > 0)
{
- minPtr = Util::Min(minPtr, insPos[n]);
+ minPtr = std::min(minPtr, insPos[n]);
}
}
@@ -469,7 +469,7 @@
{
if(smpPos[n] > 0)
{
- minPtr = Util::Min(minPtr, smpPos[n]);
+ minPtr = std::min(minPtr, smpPos[n]);
}
}
@@ -477,13 +477,13 @@
{
if(patPos[n] > 0)
{
- minPtr = Util::Min(minPtr, patPos[n]);
+ minPtr = std::min(minPtr, patPos[n]);
}
}
if(fileHeader.special & ITFileHeader::embedSongMessage)
{
- minPtr = Util::Min(minPtr, fileHeader.msgoffset);
+ minPtr = std::min(minPtr, fileHeader.msgoffset);
}
// Reading IT Edit History Info
@@ -557,7 +557,7 @@
if(file.ReadMagic("CNAM"))
{
FileReader chnNames = file.GetChunk(file.ReadUint32LE());
- const CHANNELINDEX readChns = Util::Min(MAX_BASECHANNELS, static_cast<CHANNELINDEX>(chnNames.GetLength() / MAX_CHANNELNAME));
+ const CHANNELINDEX readChns = std::min(MAX_BASECHANNELS, static_cast<CHANNELINDEX>(chnNames.GetLength() / MAX_CHANNELNAME));
m_nChannels = readChns;
for(CHANNELINDEX i = 0; i < readChns; i++)
@@ -588,7 +588,7 @@
m_nInstruments = 0;
if(fileHeader.flags & ITFileHeader::instrumentMode)
{
- m_nInstruments = Util::Min(fileHeader.insnum, INSTRUMENTINDEX(MAX_INSTRUMENTS - 1));
+ m_nInstruments = std::min(fileHeader.insnum, INSTRUMENTINDEX(MAX_INSTRUMENTS - 1));
}
for(INSTRUMENTINDEX i = 0; i < GetNumInstruments(); i++)
{
@@ -614,7 +614,7 @@
}
// Reading Samples
- m_nSamples = Util::Min(fileHeader.smpnum, SAMPLEINDEX(MAX_SAMPLES - 1));
+ m_nSamples = std::min(fileHeader.smpnum, SAMPLEINDEX(MAX_SAMPLES - 1));
for(SAMPLEINDEX i = 0; i < GetNumSamples(); i++)
{
ITSample sampleHeader;
@@ -629,12 +629,12 @@
if(file.Seek(sampleOffset))
{
sampleHeader.GetSampleFormat(fileHeader.cwtv).ReadSample(Samples[i + 1], file);
- lastSampleOffset = Util::Max(lastSampleOffset, file.GetPosition());
+ lastSampleOffset = std::max(lastSampleOffset, file.GetPosition());
}
}
}
}
- m_nSamples = Util::Max(SAMPLEINDEX(1), GetNumSamples());
+ m_nSamples = std::max(SAMPLEINDEX(1), GetNumSamples());
m_nMinPeriod = 8;
m_nMaxPeriod = 0xF000;
@@ -653,7 +653,7 @@
}
LoadExtendedSongProperties(GetType(), file, &interpretModPlugMade);
- const PATTERNINDEX numPats = Util::Min(static_cast<PATTERNINDEX>(patPos.size()), GetModSpecifications().patternsMax);
+ const PATTERNINDEX numPats = std::min(static_cast<PATTERNINDEX>(patPos.size()), GetModSpecifications().patternsMax);
if(numPats != patPos.size())
{
@@ -725,7 +725,7 @@
}
}
// Reading Patterns
- Patterns.ResizeArray(Util::Max(MAX_PATTERNS, numPats));
+ Patterns.ResizeArray(std::max(MAX_PATTERNS, numPats));
for(PATTERNINDEX pat = 0; pat < numPats; pat++)
{
if(patPos[pat] == 0 || !file.Seek(patPos[pat]))
@@ -1026,8 +1026,8 @@
itHeader.id = ITFileHeader::itMagic;
StringFixer::WriteString<StringFixer::nullTerminated>(itHeader.songname, m_szNames[0]);
- itHeader.highlight_minor = (uint8)Util::Min(m_nDefaultRowsPerBeat, ROWINDEX(uint8_max));
- itHeader.highlight_major = (uint8)Util::Min(m_nDefaultRowsPerMeasure, ROWINDEX(uint8_max));
+ itHeader.highlight_minor = (uint8)std::min(m_nDefaultRowsPerBeat, ROWINDEX(uint8_max));
+ itHeader.highlight_major = (uint8)std::min(m_nDefaultRowsPerMeasure, ROWINDEX(uint8_max));
if(GetType() == MOD_TYPE_MPT)
{
@@ -1040,13 +1040,13 @@
{
// An additional "---" pattern is appended so Impulse Tracker won't ignore the last order item.
// Interestingly, this can exceed IT's 256 order limit. Also, IT will always save at least two orders.
- itHeader.ordnum = Util::Min(Order.GetLengthTailTrimmed(), specs.ordersMax) + 1;
+ itHeader.ordnum = std::min(Order.GetLengthTailTrimmed(), specs.ordersMax) + 1;
if(itHeader.ordnum < 2) itHeader.ordnum = 2;
}
- itHeader.insnum = Util::Min(m_nInstruments, specs.instrumentsMax);
- itHeader.smpnum = Util::Min(m_nSamples, specs.samplesMax);
- itHeader.patnum = Util::Min(Patterns.GetNumPatterns(), specs.patternsMax);
+ itHeader.insnum = std::min(m_nInstruments, specs.instrumentsMax);
+ itHeader.smpnum = std::min(m_nSamples, specs.samplesMax);
+ itHeader.patnum = std::min(Patterns.GetNumPatterns(), specs.patternsMax);
// Parapointers
vector<uint32> patpos(itHeader.patnum, 0);
@@ -1289,7 +1289,7 @@
patpos[pat] = dwPos;
// Write pattern header
- ROWINDEX writeRows = Util::Min(Patterns[pat].GetNumRows(), ROWINDEX(uint16_max));
+ ROWINDEX writeRows = std::min(Patterns[pat].GetNumRows(), ROWINDEX(uint16_max));
uint16 patinfo[4];
patinfo[0] = 0;
patinfo[1] = (uint16)writeRows;
@@ -2025,9 +2025,9 @@
// Case macros.
#define CASE(id, data) \
- case id: fadr = reinterpret_cast<char *>(&data); maxReadCount = Util::Min(size_t(size), sizeof(data)); break;
+ case id: fadr = reinterpret_cast<char *>(&data); maxReadCount = std::min(size_t(size), sizeof(data)); break;
#define CASE_NOTXM(id, data) \
- case id: if(modtype != MOD_TYPE_XM) { fadr = reinterpret_cast<char *>(&data); maxReadCount = Util::Min(size_t(size), sizeof(data));} break;
+ case id: if(modtype != MOD_TYPE_XM) { fadr = reinterpret_cast<char *>(&data); maxReadCount = std::min(size_t(size), sizeof(data));} break;
while(file.BytesLeft() > 6)
{
@@ -2063,7 +2063,7 @@
if(size <= (MAX_BASECHANNELS - 64) * 2 && (size % 2u) == 0)
{
STATIC_ASSERT(CountOf(ChnSettings) >= 64);
- const CHANNELINDEX loopLimit = Util::Min(uint16(size / 2), uint16(CountOf(ChnSettings) - 64));
+ const CHANNELINDEX loopLimit = std::min(uint16(size / 2), uint16(CountOf(ChnSettings) - 64));
for(CHANNELINDEX i = 0; i < loopLimit; i++)
{
Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -595,7 +595,7 @@
// Prevent clipping based on number of channels... If all channels are playing at full volume, "256 / #channels"
// is the maximum possible sample pre-amp without getting distortion (Compatible mix levels given).
// The more channels we have, the less likely it is that all of them are used at the same time, though, so clip at 32...
- m_nSamplePreAmp = Util::Max(32, 256 / m_nChannels);
+ m_nSamplePreAmp = std::max(32, 256 / m_nChannels);
m_SongFlags.reset();
// Setup channel pan positions and volume
@@ -797,7 +797,7 @@
// UST only handles samples up to 9999 bytes. Master Soundtracker 1.0 and SoundTracker 2.0 introduce 32KB samples.
if(sampleHeader.length > 4999 || sampleHeader.loopStart > 9999)
{
- minVersion = Util::Max(minVersion, MST1_00);
+ minVersion = std::max(minVersion, MST1_00);
}
}
@@ -849,11 +849,11 @@
if(minVersion > UST1_80)
{
// D.O.C. SoundTracker IX re-introduced the variable tempo after some other versions dropped it.
- minVersion = Util::Max(minVersion, hasDiskNames ? ST_IX : MST1_00);
+ minVersion = std::max(minVersion, hasDiskNames ? ST_IX : MST1_00);
} else
{
// Ultimate Soundtracker 1.8 adds variable tempo
- minVersion = Util::Max(minVersion, hasDiskNames ? UST1_80 : ST2_00_Exterminator);
+ minVersion = std::max(minVersion, hasDiskNames ? UST1_80 : ST2_00_Exterminator);
}
}
}
@@ -900,7 +900,7 @@
} else if(eff == 1 && param < 0x03)
{
// This doesn't look like an arpeggio.
- minVersion = Util::Max(minVersion, ST2_00_Exterminator);
+ minVersion = std::max(minVersion, ST2_00_Exterminator);
}
break;
case 0x0B:
@@ -909,16 +909,16 @@
case 0x0C:
case 0x0D:
case 0x0E:
- minVersion = Util::Max(minVersion, ST2_00_Exterminator);
+ minVersion = std::max(minVersion, ST2_00_Exterminator);
if(eff == 0x0D && param == 0)
{
// Assume this is a pattern break command.
- minVersion = Util::Max(minVersion, ST2_00);
+ minVersion = std::max(minVersion, ST2_00);
}
emptyCmds = 1;
break;
case 0x0F:
- minVersion = Util::Max(minVersion, ST_III);
+ minVersion = std::max(minVersion, ST_III);
break;
}
}
@@ -1107,7 +1107,7 @@
// Write magic bytes
char modMagic[6];
- CHANNELINDEX writeChannels = Util::Min(CHANNELINDEX(99), GetNumChannels());
+ CHANNELINDEX writeChannels = std::min(CHANNELINDEX(99), GetNumChannels());
if(writeChannels == 4)
{
if(writePatterns < 64)
Modified: trunk/OpenMPT/soundlib/Load_mtm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mtm.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_mtm.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -64,7 +64,7 @@
void ConvertToMPT(ModSample &mptSmp) const
{
mptSmp.Initialize();
- mptSmp.nVolume = Util::Min(uint16(volume * 4), uint16(256));
+ mptSmp.nVolume = std::min(uint16(volume * 4), uint16(256));
if(length > 2)
{
mptSmp.nLength = length;
@@ -137,7 +137,7 @@
file.Skip(128 - readOrders);
// Reading Patterns
- const ROWINDEX rowsPerPat = Util::Min(ROWINDEX(fileHeader.beatsPerTrack), MAX_PATTERN_ROWS);
+ const ROWINDEX rowsPerPat = std::min(ROWINDEX(fileHeader.beatsPerTrack), MAX_PATTERN_ROWS);
FileReader tracks = file.GetChunk(192 * fileHeader.numTracks);
for(PATTERNINDEX pat = 0; pat <= fileHeader.lastPattern; pat++)
Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -1235,7 +1235,7 @@
{
// volume present
m.volcmd = VOLCMD_VOLUME;
- m.vol = Util::Min(patternChunk.ReadUint8(), uint8(64));
+ m.vol = std::min(patternChunk.ReadUint8(), uint8(64));
}
if(chnFlag & effectFlag)
{
Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -806,7 +806,7 @@
fileHeader.usePanningTable = S3MFileHeader::idPanning;
// Channel Table
- const uint8 midCh = static_cast<uint8>(Util::Min(GetNumChannels() / 2, 8));
+ const uint8 midCh = static_cast<uint8>(std::min(GetNumChannels() / 2, 8));
for(CHANNELINDEX chn = 0; chn < 32; chn++)
{
if(chn < GetNumChannels())
Modified: trunk/OpenMPT/soundlib/Load_stm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_stm.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_stm.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -38,7 +38,7 @@
StringFixer::ReadString<StringFixer::nullTerminated>(mptSmp.filename, filename);
mptSmp.nC5Speed = sampleRate;
- mptSmp.nVolume = Util::Min(volume * 4u, 256u);
+ mptSmp.nVolume = std::min(volume * 4u, 256u);
mptSmp.nLength = length;
mptSmp.nLoopStart = loopStart;
mptSmp.nLoopEnd = loopEnd;
@@ -55,7 +55,7 @@
&& mptSmp.nLoopEnd != 0xFFFF)
{
mptSmp.uFlags = CHN_LOOP;
- mptSmp.nLoopEnd = Util::Min(mptSmp.nLoopEnd, mptSmp.nLength);
+ mptSmp.nLoopEnd = std::min(mptSmp.nLoopEnd, mptSmp.nLength);
}
}
Modified: trunk/OpenMPT/soundlib/Load_ult.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ult.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_ult.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -70,7 +70,7 @@
mptSmp.nLength = sizeEnd - sizeStart;
mptSmp.nLoopStart = loopStart;
- mptSmp.nLoopEnd = Util::Min(static_cast<SmpLength>(loopEnd), mptSmp.nLength);
+ mptSmp.nLoopEnd = std::min(static_cast<SmpLength>(loopEnd), mptSmp.nLength);
mptSmp.nVolume = volume;
mptSmp.nGlobalVol = 64;
Modified: trunk/OpenMPT/soundlib/Load_wav.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_wav.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_wav.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -55,7 +55,7 @@
return false;
}
- m_nChannels = Util::Max(wavFile.GetNumChannels(), uint16(2));
+ m_nChannels = std::max(wavFile.GetNumChannels(), uint16(2));
if(Patterns.Insert(0, 64) || Patterns.Insert(1, 64))
{
return false;
@@ -66,7 +66,7 @@
// Setting up module length
// Calculate sample length in ticks at tempo 125
const uint32 sampleTicks = ((sampleLength * 50) / wavFile.GetSampleRate()) + 1;
- uint32 ticksPerRow = Util::Max((sampleTicks + 63u) / 63u, 1u);
+ uint32 ticksPerRow = std::max((sampleTicks + 63u) / 63u, 1u);
Order.clear();
Order.Append(0);
Modified: trunk/OpenMPT/soundlib/Load_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -257,7 +257,7 @@
|| fileHeader.channels == 0
|| fileHeader.channels > MAX_BASECHANNELS
|| _strnicmp(fileHeader.signature, "Extended Module: ", 17)
- || !Order.ReadAsByte(file, Util::Min(ORDERINDEX(fileHeader.orders), MAX_ORDERS))
+ || !Order.ReadAsByte(file, std::min(ORDERINDEX(fileHeader.orders), MAX_ORDERS))
|| !file.Seek(fileHeader.size + 60))
{
return false;
@@ -281,7 +281,7 @@
m_nRestartPos = fileHeader.restartPos;
m_nChannels = fileHeader.channels;
- m_nInstruments = Util::Min(fileHeader.instruments, uint16(MAX_INSTRUMENTS - 1));
+ m_nInstruments = std::min(fileHeader.instruments, uint16(MAX_INSTRUMENTS - 1));
m_nSamples = 0;
m_nDefaultSpeed = Clamp(fileHeader.speed, uint16(1), uint16(31));
m_nDefaultTempo = Clamp(fileHeader.tempo, uint16(32), uint16(512));
@@ -456,7 +456,7 @@
// Read pattern names: "PNAM"
if(file.ReadMagic("PNAM"))
{
- const PATTERNINDEX namedPats = Util::Min(static_cast<PATTERNINDEX>(file.ReadUint32LE() / MAX_PATTERNNAME), Patterns.Size());
+ const PATTERNINDEX namedPats = std::min(static_cast<PATTERNINDEX>(file.ReadUint32LE() / MAX_PATTERNNAME), Patterns.Size());
for(PATTERNINDEX pat = 0; pat < namedPats; pat++)
{
@@ -470,7 +470,7 @@
// Read channel names: "CNAM"
if(file.ReadMagic("CNAM"))
{
- const CHANNELINDEX namedChans = Util::Min(static_cast<CHANNELINDEX>(file.ReadUint32LE() / MAX_CHANNELNAME), GetNumChannels());
+ const CHANNELINDEX namedChans = std::min(static_cast<CHANNELINDEX>(file.ReadUint32LE() / MAX_CHANNELNAME), GetNumChannels());
for(CHANNELINDEX chn = 0; chn < namedChans; chn++)
{
file.ReadString<StringFixer::maybeNullTerminated>(ChnSettings[chn].szName, MAX_CHANNELNAME);
Modified: trunk/OpenMPT/soundlib/Message.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Message.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Message.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -166,7 +166,7 @@
for(size_t line = 0, fpos = 0, cpos = 0; line < numLines; line++, fpos += (lineLength + lineEndingLength), cpos += (lineLength + 1))
{
- memcpy(m_lpszSongComments + cpos, data + fpos, Util::Min(lineLength, length - fpos));
+ memcpy(m_lpszSongComments + cpos, data + fpos, std::min(lineLength, length - fpos));
m_lpszSongComments[cpos + lineLength] = INTERNAL_LINEENDING;
// fix weird chars
Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -156,7 +156,7 @@
{
const ORDERINDEX nLength = GetLength();
if(nLength == 0) return 0;
- ORDERINDEX next = Util::Min(ORDERINDEX(nLength - 1), ORDERINDEX(start + 1));
+ ORDERINDEX next = std::min(ORDERINDEX(nLength - 1), ORDERINDEX(start + 1));
while(next+1 < nLength && (*this)[next] == GetIgnoreIndex()) next++;
return next;
}
@@ -167,7 +167,7 @@
{
const ORDERINDEX nLength = GetLength();
if(start == 0 || nLength == 0) return 0;
- ORDERINDEX prev = Util::Min(ORDERINDEX(start - 1), ORDERINDEX(nLength - 1));
+ ORDERINDEX prev = std::min(ORDERINDEX(start - 1), ORDERINDEX(nLength - 1));
while(prev > 0 && (*this)[prev] == GetIgnoreIndex()) prev--;
return prev;
}
@@ -583,7 +583,7 @@
}
// Remove order name + fill up with empty patterns.
m_sName = "";
- const ORDERINDEX nMinLength = Util::Min(ModSequenceSet::s_nCacheSize, m_pSndFile->GetModSpecifications().ordersMax);
+ const ORDERINDEX nMinLength = std::min(ModSequenceSet::s_nCacheSize, m_pSndFile->GetModSpecifications().ordersMax);
if(GetLength() < nMinLength)
resize(nMinLength);
return true;
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -1568,7 +1568,7 @@
samplemap[i] = smp;
const FileReader::off_t offset = file.GetPosition();
ReadITSSample(smp, file, false);
- extraOffset = Util::Max(extraOffset, file.GetPosition());
+ extraOffset = std::max(extraOffset, file.GetPosition());
file.Seek(offset + sizeof(ITSample));
}
if(GetNumSamples() < smp) m_nSamples = smp;
@@ -1926,7 +1926,7 @@
}
// Number of samples to be copied in this call
- const SmpLength copySamples = Util::Min(static_cast<SmpLength>(frame->header.blocksize), static_cast<SmpLength>(sample.nLength - frame->header.number.sample_number));
+ const SmpLength copySamples = std::min(static_cast<SmpLength>(frame->header.blocksize), static_cast<SmpLength>(sample.nLength - frame->header.number.sample_number));
// Number of target channels
const uint8 modChannels = sample.GetNumChannels();
// Offset (in samples) into target data
@@ -2245,7 +2245,7 @@
size_t FileReaderRead(void *fp, void *buf, size_t count)
{
FileReader &file = *static_cast<FileReader *>(fp);
- size_t readBytes = Util::Min(count, static_cast<size_t>(file.BytesLeft()));
+ size_t readBytes = std::min(count, static_cast<size_t>(file.BytesLeft()));
memcpy(buf, file.GetRawData(), readBytes);
file.Skip(readBytes);
return readBytes;
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -3699,10 +3699,10 @@
//data = (unsigned char)MIN((pChn->nCalcVolume * pChn->nGlobalVol * m_nGlobalVolume) >> (7 + 6 + 8), 127);
} else if(macro[pos] == 'x') // x: pan set
{
- data = (unsigned char)Util::Min(pChn->nPan / 2, 127);
+ data = (unsigned char)std::min(pChn->nPan / 2, 127);
} else if(macro[pos] == 'y') // y: calculated pan
{
- data = (unsigned char)Util::Min(pChn->nRealPan / 2, 127);
+ data = (unsigned char)std::min(pChn->nRealPan / 2, 127);
} else if(macro[pos] == 'a') // a: high byte of bank select
{
if(pIns && pIns->wMidiBank)
@@ -3987,7 +3987,7 @@
for(size_t pos = 0; pos < macroLen; pos += 3)
{
DWORD curData = 0;
- memcpy(&curData, macro + pos, Util::Min(3u, macroLen - pos));
+ memcpy(&curData, macro + pos, std::min(3u, macroLen - pos));
pPlugin->MidiSend(curData);
}
}
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -1462,7 +1462,7 @@
}
SAMPLEINDEX nRemoved = 0;
- for(SAMPLEINDEX nSmp = Util::Min(GetNumSamples(), static_cast<SAMPLEINDEX>(keepSamples.size() - 1)); nSmp >= 1; nSmp--)
+ for(SAMPLEINDEX nSmp = std::min(GetNumSamples(), static_cast<SAMPLEINDEX>(keepSamples.size() - 1)); nSmp >= 1; nSmp--)
{
if(!keepSamples[nSmp])
{
@@ -2080,7 +2080,7 @@
// Previously the values were just added up, so let's fix this!
m.volcmd = VOLCMD_NONE;
const uint16 param = static_cast<uint16>(m.param) + static_cast<uint16>(m.vol << 4);
- m.param = static_cast<uint8>(Util::Min(param, uint16(0xFF)));
+ m.param = static_cast<uint8>(std::min(param, uint16(0xFF)));
}
}
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2013-04-12 13:35:31 UTC (rev 1853)
@@ -708,7 +708,7 @@
bool ReadMessage(const BYTE *data, FileReader::off_t length, enmLineEndings lineEnding, void (*pTextConverter)(char &) = nullptr);
bool ReadMessage(FileReader &file, FileReader::off_t length, enmLineEndings lineEnding, void (*pTextConverter)(char &) = nullptr)
{
- FileReader::off_t readLength = Util::Min(length, file.BytesLeft());
+ FileReader::off_t readLength = std::min(length, file.BytesLeft());
bool success = ReadMessage(reinterpret_cast<const BYTE*>(file.GetRawData()), readLength, lineEnding, pTextConverter);
file.Skip(readLength);
return success;
@@ -724,7 +724,7 @@
bool ReadFixedLineLengthMessage(const BYTE *data, const FileReader::off_t length, const size_t lineLength, const size_t lineEndingLength, void (*pTextConverter)(char &) = nullptr);
bool ReadFixedLineLengthMessage(FileReader &file, const FileReader::off_t length, const size_t lineLength, const size_t lineEndingLength, void (*pTextConverter)(char &) = nullptr)
{
- FileReader::off_t readLength = Util::Min(length, file.BytesLeft());
+ FileReader::off_t readLength = std::min(length, file.BytesLeft());
bool success = ReadFixedLineLengthMessage(reinterpret_cast<const BYTE*>(file.GetRawData()), readLength, lineLength, lineEndingLength, pTextConverter);
file.Skip(readLength);
return success;
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -2144,10 +2144,10 @@
uint8 vol = 0xFF;
if(chn.rowCommand.volcmd == VOLCMD_VOLUME)
{
- vol = Util::Min(chn.rowCommand.vol, uint8(64));
+ vol = std::min(chn.rowCommand.vol, uint8(64));
} else if(chn.rowCommand.command == CMD_VOLUME)
{
- vol = Util::Min(chn.rowCommand.param, uint8(64));
+ vol = std::min(chn.rowCommand.param, uint8(64));
}
const bool hasVolCommand = (vol != 0xFF);
Modified: trunk/OpenMPT/soundlib/WAVTools.cpp
===================================================================
--- trunk/OpenMPT/soundlib/WAVTools.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/WAVTools.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -161,9 +161,9 @@
{
if(mptInfo.flags & WAVExtraChunk::setPanning) sample.uFlags.set(CHN_PANNING);
- sample.nPan = Util::Min(mptInfo.defaultPan, uint16(256));
- sample.nVolume = Util::Min(mptInfo.defaultVolume, uint16(256));
- sample.nGlobalVol = Util::Min(mptInfo.globalVolume, uint16(64));
+ sample.nPan = std::min(mptInfo.defaultPan, uint16(256));
+ sample.nVolume = std::min(mptInfo.defaultVolume, uint16(256));
+ sample.nGlobalVol = std::min(mptInfo.globalVolume, uint16(64));
sample.nVibType = mptInfo.vibratoType;
sample.nVibSweep = mptInfo.vibratoSweep;
sample.nVibDepth = mptInfo.vibratoDepth;
@@ -188,7 +188,7 @@
// Some WAV files seem to have loops going from 0 to 0... We should ignore those.
return;
}
- start = Util::Min(static_cast<SmpLength>(loopStart), sampleLength);
+ start = std::min(static_cast<SmpLength>(loopStart), sampleLength);
end = Clamp(static_cast<SmpLength>(loopEnd), start, sampleLength);
if(!mptLoopFix && end < sampleLength)
{
Modified: trunk/OpenMPT/soundlib/XMTools.cpp
===================================================================
--- trunk/OpenMPT/soundlib/XMTools.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/XMTools.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -52,12 +52,12 @@
void XMInstrument::ConvertEnvelopeToXM(const InstrumentEnvelope &mptEnv, uint8 &numPoints, uint8 &flags, uint8 &sustain, uint8 &loopStart, uint8 &loopEnd, uint16 (&envData)[24])
//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
{
- numPoints = static_cast<uint8>(Util::Min(12u, mptEnv.nNodes));
+ numPoints = static_cast<uint8>(std::min(12u, mptEnv.nNodes));
// Envelope Data
for(size_t i = 0; i < numPoints; i++)
{
- envData[i * 2] = Util::Min(mptEnv.Ticks[i], uint16_max);
+ envData[i * 2] = std::min(mptEnv.Ticks[i], uint16_max);
envData[i * 2 + 1] = mptEnv.Values[i];
}
@@ -67,9 +67,9 @@
if(mptEnv.dwFlags[ENV_LOOP]) flags |= XMInstrument::envLoop;
// Envelope Loops
- sustain = Util::Min(uint8(12), mptEnv.nSustainStart);
- loopStart = Util::Min(uint8(12), mptEnv.nLoopStart);
- loopEnd = Util::Min(uint8(12), mptEnv.nLoopEnd);
+ sustain = std::min(uint8(12), mptEnv.nSustainStart);
+ loopStart = std::min(uint8(12), mptEnv.nLoopStart);
+ loopEnd = std::min(uint8(12), mptEnv.nLoopEnd);
}
@@ -81,7 +81,7 @@
MemsetZero(*this);
// FFF is maximum in the FT2 GUI, but it can also accept other values. MilkyTracker just allows 0...4095 and 32767 ("cut")
- volFade = static_cast<uint16>(Util::Min(mptIns.nFadeOut, uint32(32767)));
+ volFade = static_cast<uint16>(std::min(mptIns.nFadeOut, uint32(32767)));
// Convert envelopes
ConvertEnvelopeToXM(mptIns.VolEnv, volPoints, volFlags, volSustain, volLoopStart, volLoopEnd, volEnv);
@@ -108,7 +108,7 @@
midiChannel = (mptIns.nMidiChannel != MidiMappedChannel ? (mptIns.nMidiChannel - MidiFirstChannel) : 0);
}
midiProgram = (mptIns.nMidiProgram != 0 ? mptIns.nMidiProgram - 1 : 0);
- pitchWheelRange = Util::Min(mptIns.midiPWD, int8(36));
+ pitchWheelRange = std::min(mptIns.midiPWD, int8(36));
return static_cast<uint16>(sampleList.size());
}
@@ -370,8 +370,8 @@
MemsetZero(*this);
// Volume / Panning
- vol = static_cast<uint8>(Util::Min(mptSmp.nVolume / 4u, 64u));
- pan = static_cast<uint8>(Util::Min(mptSmp.nPan, uint16(255)));
+ vol = static_cast<uint8>(std::min(mptSmp.nVolume / 4u, 64u));
+ pan = static_cast<uint8>(std::min(mptSmp.nPan, uint16(255)));
// Sample Frequency
if((fromType & (MOD_TYPE_MOD | MOD_TYPE_XM)))
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -175,7 +175,7 @@
mptEnv.dwFlags.set(ENV_LOOP, (flags & AMFFEnvelope::envLoop) && mptEnv.nLoopStart <= mptEnv.nLoopEnd && mptEnv.nLoopStart <= mptEnv.nNodes);
// The buggy mod2j2b converter will actually NOT limit this to 10 points if the envelope is longer.
- mptEnv.nNodes = Util::Min(numPoints, static_cast<uint8>(10));
+ mptEnv.nNodes = std::min(numPoints, static_cast<uint8>(10));
mptEnv.nSustainStart = mptEnv.nSustainEnd = sustainPoint;
@@ -381,7 +381,7 @@
mptEnv.dwFlags.set(ENV_SUSTAIN, (flags & AMFFEnvelope::envSustain) && mptEnv.nSustainStart <= mptEnv.nNodes);
mptEnv.dwFlags.set(ENV_LOOP, (flags & AMFFEnvelope::envLoop) && mptEnv.nLoopStart <= mptEnv.nLoopEnd && mptEnv.nLoopStart <= mptEnv.nNodes);
- mptEnv.nNodes = Util::Min(numPoints + 1, 10);
+ mptEnv.nNodes = std::min(numPoints + 1, 10);
mptEnv.nSustainStart = mptEnv.nSustainEnd = sustainPoint;
@@ -502,8 +502,8 @@
void ConvertToMPT(AMInstrumentHeader &instrHeader, ModSample &mptSmp) const
{
mptSmp.Initialize();
- mptSmp.nPan = Util::Min(pan, static_cast<uint16>(32767)) * 256 / 32767;
- mptSmp.nVolume = Util::Min(volume, static_cast<uint16>(32767)) * 256 / 32767;
+ mptSmp.nPan = std::min(pan, static_cast<uint16>(32767)) * 256 / 32767;
+ mptSmp.nVolume = std::min(volume, static_cast<uint16>(32767)) * 256 / 32767;
mptSmp.nGlobalVol = 64;
mptSmp.nLength = length;
mptSmp.nLoopStart = loopStart;
Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -565,8 +565,8 @@
if(!(smp.uFlags & CHN_LOOP) && (sndFile.GetType() & MOD_TYPE_MOD) && sampleOffset == 0) sampleOffset = 2;
// Just look at the first four samples, starting from the given offset.
- sampleOffset = Util::Min(sampleOffset, smp.nLength);
- const SmpLength smpCount = Util::Min(4u, smp.nLength - sampleOffset) * smp.GetNumChannels();
+ sampleOffset = std::min(sampleOffset, smp.nLength);
+ const SmpLength smpCount = std::min(4u, smp.nLength - sampleOffset) * smp.GetNumChannels();
if(smp.pSample == nullptr || smpCount == 0) return false;
if(smp.GetElementarySampleSize() == 2)
Modified: trunk/OpenMPT/soundlib/pattern.cpp
===================================================================
--- trunk/OpenMPT/soundlib/pattern.cpp 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/pattern.cpp 2013-04-12 13:35:31 UTC (rev 1853)
@@ -84,7 +84,7 @@
}
// Copy over pattern data
- memcpy(newPattern, m_ModCommands, GetNumChannels() * Util::Min(m_Rows, newRowCount) * sizeof(ModCommand));
+ memcpy(newPattern, m_ModCommands, GetNumChannels() * std::min(m_Rows, newRowCount) * sizeof(ModCommand));
CriticalSection cs;
FreePattern(m_ModCommands);
Modified: trunk/OpenMPT/soundlib/plugins/PluginEventQueue.h
===================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginEventQueue.h 2013-04-12 13:19:24 UTC (rev 1852)
+++ trunk/OpenMPT/soundlib/plugins/PluginEventQueue.h 2013-04-12 13:35:31 UTC (rev 1853)
@@ -91,7 +91,7 @@
ASSERT(event->type != kVstMidiType || event->byteSize == sizeof(VstMid...
[truncated message content] |
