Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1852] trunk/OpenMPT
|
From: <man...@us...> - 2013-04-12 13:19:38
|
Revision: 1852
http://sourceforge.net/p/modplug/code/1852
Author: manxorist
Date: 2013-04-12 13:19:24 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
[Ref] The min and max macros conflict with STL. Prevent windows from defining those and add our own MIN and MAX macros as a replacement. Convert all usage sites.
Modified Paths:
--------------
trunk/OpenMPT/common/StringFixer.h
trunk/OpenMPT/common/misc_util.h
trunk/OpenMPT/common/serialization_utils.cpp
trunk/OpenMPT/common/serialization_utils.h
trunk/OpenMPT/common/stdafx.h
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
trunk/OpenMPT/mptrack/Autotune.cpp
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/DefaultVstEditor.cpp
trunk/OpenMPT/mptrack/Draw_pat.cpp
trunk/OpenMPT/mptrack/MIDIMapping.cpp
trunk/OpenMPT/mptrack/Mainbar.cpp
trunk/OpenMPT/mptrack/Mod2wave.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/PatternCursor.h
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/View_gen.cpp
trunk/OpenMPT/mptrack/View_ins.cpp
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/VstPresets.cpp
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/soundlib/ITTools.cpp
trunk/OpenMPT/soundlib/LOAD_DMF.CPP
trunk/OpenMPT/soundlib/Load_gdm.cpp
trunk/OpenMPT/soundlib/Load_imf.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_itp.cpp
trunk/OpenMPT/soundlib/Load_med.cpp
trunk/OpenMPT/soundlib/Load_mod.cpp
trunk/OpenMPT/soundlib/Load_okt.cpp
trunk/OpenMPT/soundlib/Load_psm.cpp
trunk/OpenMPT/soundlib/Load_ptm.cpp
trunk/OpenMPT/soundlib/Load_s3m.cpp
trunk/OpenMPT/soundlib/Load_ult.cpp
trunk/OpenMPT/soundlib/Load_xm.cpp
trunk/OpenMPT/soundlib/MIDIMacros.cpp
trunk/OpenMPT/soundlib/ModInstrument.h
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/XMTools.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
trunk/OpenMPT/soundlib/modcommand.cpp
trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
trunk/OpenMPT/soundlib/pattern.cpp
trunk/OpenMPT/soundlib/patternContainer.cpp
trunk/OpenMPT/soundlib/plugins/PluginEventQueue.h
trunk/OpenMPT/soundlib/tuning.cpp
Modified: trunk/OpenMPT/common/StringFixer.h
===================================================================
--- trunk/OpenMPT/common/StringFixer.h 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/common/StringFixer.h 2013-04-12 13:19:24 UTC (rev 1852)
@@ -85,7 +85,7 @@
STATIC_ASSERT(destSize > 0);
//ASSERT(srcSize > 0);
- const size_t maxSize = min(destSize, srcSize);
+ const size_t maxSize = MIN(destSize, srcSize);
char *dst = destBuffer;
const char *src = srcBuffer;
@@ -111,7 +111,7 @@
} else
{
// Last character of source buffer may actually be a valid character.
- destBuffer[min(destSize - 1, srcSize)] = '\0';
+ destBuffer[MIN(destSize - 1, srcSize)] = '\0';
}
} else if(mode == spacePadded || mode == spacePaddedNull)
@@ -181,7 +181,7 @@
STATIC_ASSERT(destSize > 0);
ASSERT(srcSize > 0);
- const size_t maxSize = min(destSize, srcSize);
+ const size_t maxSize = MIN(destSize, srcSize);
char *dst = destBuffer;
const char *src = srcBuffer;
@@ -229,7 +229,7 @@
void CopyN(char (&destBuffer)[destSize], const char *srcBuffer, const size_t srcSize = SIZE_T_MAX)
//------------------------------------------------------------------------------------------------
{
- const size_t copySize = min(destSize - 1, srcSize);
+ const size_t copySize = MIN(destSize - 1, srcSize);
strncpy(destBuffer, srcBuffer, copySize);
destBuffer[copySize] = '\0';
}
Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/common/misc_util.h 2013-04-12 13:19:24 UTC (rev 1852)
@@ -112,7 +112,7 @@
// Like Limit, but returns value
#ifndef CLAMP
-#define CLAMP(number, low, high) min(high, max(low, number))
+#define CLAMP(number, low, high) MIN(high, MAX(low, number))
#endif
Modified: trunk/OpenMPT/common/serialization_utils.cpp
===================================================================
--- trunk/OpenMPT/common/serialization_utils.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/common/serialization_utils.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -163,9 +163,9 @@
Binaryread(iStrm, id, 1);
const uint8 nSizeBytes = (id & 12) >> 2; // 12 == 1100b
if (nSizeBytes > 0)
- iStrm.read(reinterpret_cast<char*>(&id) + 1, min(3, nSizeBytes));
+ iStrm.read(reinterpret_cast<char*>(&id) + 1, MIN(3, nSizeBytes));
// Limit to 1 MB.
- str.resize(min(id >> 4, 1000000));
+ str.resize(MIN(id >> 4, 1000000));
for(size_t i = 0; i < str.size(); i++)
iStrm.read(&str[i], 1);
@@ -906,7 +906,7 @@
}
// Seek to end.
- oStrm.seekp(max(posMapEnd, posDataEnd));
+ oStrm.seekp(MAX(posMapEnd, posDataEnd));
if (m_fpLogFunc)
m_fpLogFunc(tstrEndOfStream, uint32(oStrm.tellp() - m_posStart));
Modified: trunk/OpenMPT/common/serialization_utils.h
===================================================================
--- trunk/OpenMPT/common/serialization_utils.h 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/common/serialization_utils.h 2013-04-12 13:19:24 UTC (rev 1852)
@@ -413,7 +413,7 @@
inline void Binarywrite(OutStream& oStrm, const T& data, const Offtype bytecount)
//--------------------------------------------------------------------------
{
- oStrm.write(reinterpret_cast<const char*>(&data), min(bytecount, sizeof(data)));
+ oStrm.write(reinterpret_cast<const char*>(&data), MIN(bytecount, sizeof(data)));
}
template <class T>
Modified: trunk/OpenMPT/common/stdafx.h
===================================================================
--- trunk/OpenMPT/common/stdafx.h 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/common/stdafx.h 2013-04-12 13:19:24 UTC (rev 1852)
@@ -15,6 +15,8 @@
#define _WIN32_WINNT 0x0500 // 0x0500 = Windows 2000
+// no stupid min/max macros
+#define NOMINMAX
// windows excludes
#define NOMCX
// mmreg excludes
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/common/typedefs.h 2013-04-12 13:19:24 UTC (rev 1852)
@@ -32,6 +32,14 @@
#define CountOf(x) (sizeof(x)/sizeof(x[0]))
#endif
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
// Compile time assert.
#ifndef C_ASSERT
#define C_ASSERT(expr) typedef char __C_ASSERT__[(expr)?1:-1]
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -823,14 +823,14 @@
void CAbstractVstEditor::OnVSTPresetBackwardJump()
//------------------------------------------------
{
- OnSetPreset(max(ID_PRESET_SET + m_VstPlugin.GetCurrentProgram() - 10, ID_PRESET_SET));
+ OnSetPreset(MAX(ID_PRESET_SET + m_VstPlugin.GetCurrentProgram() - 10, ID_PRESET_SET));
}
void CAbstractVstEditor::OnVSTPresetForwardJump()
//-----------------------------------------------
{
- OnSetPreset(min(ID_PRESET_SET + m_VstPlugin.GetCurrentProgram() + 10, ID_PRESET_SET + m_VstPlugin.GetNumPrograms() - 1));
+ OnSetPreset(MIN(ID_PRESET_SET + m_VstPlugin.GetCurrentProgram() + 10, ID_PRESET_SET + m_VstPlugin.GetNumPrograms() - 1));
}
Modified: trunk/OpenMPT/mptrack/Autotune.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Autotune.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Autotune.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -39,7 +39,7 @@
//---------------------------------------------------------------------------------------
{
const double fundamentalFrequency = NoteToFrequency((double)note / BINS_PER_NOTE, pitchReference);
- return (SmpLength)max(Util::Round((double)sampleFreq / fundamentalFrequency), 1);
+ return (SmpLength)MAX(Util::Round((double)sampleFreq / fundamentalFrequency), 1);
}
@@ -103,7 +103,7 @@
}
// We should analyse at least a one second (= GetSampleRate() samples) long sample.
- sampleLength = max(sampleLoopEnd, sample.GetSampleRate(modType)) + maxShift;
+ sampleLength = MAX(sampleLoopEnd, sample.GetSampleRate(modType)) + maxShift;
if(sampleData != nullptr)
{
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -909,7 +909,7 @@
m_OrderList.SetCurSel(nInsertWhere);
// If the first duplicated order is e.g. a +++ item, we need to move the pattern display on or else we'll still edit the previously shown pattern.
- ORDERINDEX showPattern = min(nInsertWhere, pSndFile->Order.GetLastIndex());
+ ORDERINDEX showPattern = MIN(nInsertWhere, pSndFile->Order.GetLastIndex());
while(!pSndFile->Patterns.IsValidPat(pSndFile->Order[showPattern]) && showPattern < pSndFile->Order.GetLastIndex())
{
showPattern++;
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -1142,9 +1142,9 @@
nInsertEnd + i + 1 < sndFile.Order.GetLength())
sndFile.Order[nInsertEnd + i + 1] = sndFile.Order[nInsertEnd - nInsertCount + i];
}
- m_nScrollPos = min(nInsertEnd + 1, sndFile.Order.GetLastIndex());
+ m_nScrollPos = MIN(nInsertEnd + 1, sndFile.Order.GetLastIndex());
if(nInsertCount > 0)
- m_nScrollPos2nd = min(m_nScrollPos + nInsertCount, sndFile.Order.GetLastIndex());
+ m_nScrollPos2nd = MIN(m_nScrollPos + nInsertCount, sndFile.Order.GetLastIndex());
else
m_nScrollPos2nd = ORDERINDEX_INVALID;
@@ -1375,7 +1375,7 @@
else if(nSeq < sndFile.Order.GetNumSequences())
sndFile.Order.SetSequence(nSeq);
ORDERINDEX nPosCandidate = sndFile.Order.GetLengthTailTrimmed() - 1;
- SetCurSel(min(m_nScrollPos, nPosCandidate), true, false, true);
+ SetCurSel(MIN(m_nScrollPos, nPosCandidate), true, false, true);
if (m_pParent)
m_pParent->SetCurrentPattern(sndFile.Order[m_nScrollPos]);
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -1766,10 +1766,10 @@
//Update loop points only if no error occured.
if(errorcode == 0)
{
- sample.nLoopStart = (UINT)min(sample.nLoopStart * (m_dTimeStretchRatio / 100.0), sample.nLength);
- sample.nLoopEnd = (UINT)min(sample.nLoopEnd * (m_dTimeStretchRatio/100.0), sample.nLength);
- sample.nSustainStart = (UINT)min(sample.nSustainStart * (m_dTimeStretchRatio/100.0), sample.nLength);
- sample.nSustainEnd = (UINT)min(sample.nSustainEnd * (m_dTimeStretchRatio/100.0), sample.nLength);
+ sample.nLoopStart = (UINT)MIN(sample.nLoopStart * (m_dTimeStretchRatio / 100.0), sample.nLength);
+ sample.nLoopEnd = (UINT)MIN(sample.nLoopEnd * (m_dTimeStretchRatio/100.0), sample.nLength);
+ sample.nSustainStart = (UINT)MIN(sample.nSustainStart * (m_dTimeStretchRatio/100.0), sample.nLength);
+ sample.nSustainEnd = (UINT)MIN(sample.nSustainEnd * (m_dTimeStretchRatio/100.0), sample.nLength);
}
}
Modified: trunk/OpenMPT/mptrack/DefaultVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/DefaultVstEditor.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/DefaultVstEditor.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -240,7 +240,7 @@
//-----------------------------------------------------------
{
const PlugParamIndex numParams = m_VstPlugin.GetNumParameters();
- const PlugParamIndex scrollMax = numParams - min(numParams, NUM_PLUGINEDITOR_PARAMETERS);
+ const PlugParamIndex scrollMax = numParams - MIN(numParams, NUM_PLUGINEDITOR_PARAMETERS);
LimitMax(paramOffset, scrollMax);
int curScrollMin, curScrollMax;
@@ -341,14 +341,14 @@
case SB_PAGELEFT: // Scroll one page left.
if(curpos > minpos)
{
- curpos = max(minpos, curpos - (int)sbInfo.nPage);
+ curpos = MAX(minpos, curpos - (int)sbInfo.nPage);
}
break;
case SB_PAGERIGHT: // Scroll one page right.
if(curpos < maxpos)
{
- curpos = min(maxpos, curpos + (int)sbInfo.nPage);
+ curpos = MIN(maxpos, curpos + (int)sbInfo.nPage);
}
break;
Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -466,7 +466,7 @@
if(mc.IsPcNote())
{ //If note is parameter control note, drawing volume command differently.
- const int val = min(ModCommand::maxColumnValue, mc.GetValueVolCol());
+ const int val = MIN(ModCommand::maxColumnValue, mc.GetValueVolCol());
m_Dib.TextBlt(x, y, 1, COLUMN_HEIGHT, pfnt->nClrX, pfnt->nClrY);
m_Dib.TextBlt(x + 1, y, pfnt->nVolCmdWidth, COLUMN_HEIGHT,
@@ -687,7 +687,7 @@
if(pSndFile->Patterns.IsValidPat(nPrevPat))
{
ROWINDEX nPrevRows = pSndFile->Patterns[nPrevPat].GetNumRows();
- ROWINDEX n = min(static_cast<ROWINDEX>(nSkip), nPrevRows);
+ ROWINDEX n = MIN(static_cast<ROWINDEX>(nSkip), nPrevRows);
ypaint += (nSkip - n) * m_szCell.cy;
rect.SetRect(0, m_szHeader.cy, nColumnWidth * ncols + m_szHeader.cx, ypaint - 1);
@@ -733,7 +733,7 @@
if(pSndFile->Patterns.IsValidPat(nNextPat))
{
ROWINDEX nNextRows = pSndFile->Patterns[nNextPat].GetNumRows();
- ROWINDEX n = min(static_cast<ROWINDEX>(nVisRows), nNextRows);
+ ROWINDEX n = MIN(static_cast<ROWINDEX>(nVisRows), nNextRows);
m_Dib.SetBlendMode(0x80);
DrawPatternData(hdc, pSndFile, nNextPat, false, false,
Modified: trunk/OpenMPT/mptrack/MIDIMapping.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MIDIMapping.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/MIDIMapping.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -105,7 +105,7 @@
memcpy(&i16, ptr, 2); ptr += 2; //Channel, event, MIDIbyte1.
memcpy(&i8, ptr, 1); ptr++; //Plugindex
const BYTE remainingbytes = psize - 4;
- memcpy(&i32, ptr, min(4, remainingbytes)); ptr += remainingbytes;
+ memcpy(&i32, ptr, MIN(4, remainingbytes)); ptr += remainingbytes;
s.SetChannel(((i16 & 1) != 0) ? 0 : 1 + ((i16 >> 1) & 0xF));
s.SetEvent(static_cast<BYTE>((i16 >> 5) & 0xF));
Modified: trunk/OpenMPT/mptrack/Mainbar.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mainbar.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Mainbar.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -508,9 +508,9 @@
if ((n = (short int)m_SpinTempo.GetPos()) != 0)
{
if (n < 0)
- pSndFile->SetTempo(max(nCurrentTempo - 1, pSndFile->GetModSpecifications().tempoMin), true);
+ pSndFile->SetTempo(MAX(nCurrentTempo - 1, pSndFile->GetModSpecifications().tempoMin), true);
else
- pSndFile->SetTempo(min(nCurrentTempo + 1, pSndFile->GetModSpecifications().tempoMax), true);
+ pSndFile->SetTempo(MIN(nCurrentTempo + 1, pSndFile->GetModSpecifications().tempoMax), true);
m_SpinTempo.SetPos(0);
}
Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -616,7 +616,7 @@
m_EditAlbum.GetWindowText(sText, sizeof(sText));
m_FileTags.album = sText;
- m_EditYear.GetWindowText(sText, min(5, sizeof(sText)));
+ m_EditYear.GetWindowText(sText, MIN(5, sizeof(sText)));
m_FileTags.year = sText;
if(m_FileTags.year == "0")
m_FileTags.year = "";
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -693,7 +693,7 @@
m_SndFile.m_nMixLevels = m_SndFile.GetModSpecifications().defaultMixLevels;
m_SndFile.m_PlayConfig.SetMixLevels(m_SndFile.m_nMixLevels);
// ...and the order length
- m_SndFile.Order.resize(min(ModSequenceSet::s_nCacheSize, m_SndFile.GetModSpecifications().ordersMax));
+ m_SndFile.Order.resize(MIN(ModSequenceSet::s_nCacheSize, m_SndFile.GetModSpecifications().ordersMax));
if (m_SndFile.Order[0] >= m_SndFile.Patterns.Size())
m_SndFile.Order[0] = 0;
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -513,7 +513,7 @@
}
const INSTRUMENTINDEX nInstrumentMax = m_SndFile.GetModSpecifications().instrumentsMax;
- const SAMPLEINDEX nInstruments = min(m_SndFile.GetNumSamples(), nInstrumentMax);
+ const SAMPLEINDEX nInstruments = MIN(m_SndFile.GetNumSamples(), nInstrumentMax);
for(SAMPLEINDEX smp = 1; smp <= nInstruments; smp++)
{
@@ -544,7 +544,7 @@
{
//Remove all plugins whose keepMask[plugindex] is false.
UINT nRemoved = 0;
- const PLUGINDEX maxPlug = min(MAX_MIXPLUGINS, keepMask.size());
+ const PLUGINDEX maxPlug = MIN(MAX_MIXPLUGINS, keepMask.size());
for (PLUGINDEX nPlug = 0; nPlug < maxPlug; nPlug++)
{
@@ -844,12 +844,12 @@
bool CModDoc::MoveOrder(ORDERINDEX nSourceNdx, ORDERINDEX nDestNdx, bool bUpdate, bool bCopy, SEQUENCEINDEX nSourceSeq, SEQUENCEINDEX nDestSeq)
//---------------------------------------------------------------------------------------------------------------------------------------------
{
- if (max(nSourceNdx, nDestNdx) >= m_SndFile.Order.size()) return false;
+ if (MAX(nSourceNdx, nDestNdx) >= m_SndFile.Order.size()) return false;
if (nDestNdx >= m_SndFile.GetModSpecifications().ordersMax) return false;
if(nSourceSeq == SEQUENCEINDEX_INVALID) nSourceSeq = m_SndFile.Order.GetCurrentSequenceIndex();
if(nDestSeq == SEQUENCEINDEX_INVALID) nDestSeq = m_SndFile.Order.GetCurrentSequenceIndex();
- if (max(nSourceSeq, nDestSeq) >= m_SndFile.Order.GetNumSequences()) return false;
+ if (MAX(nSourceSeq, nDestSeq) >= m_SndFile.Order.GetNumSequences()) return false;
PATTERNINDEX nSourcePat = m_SndFile.Order.GetSequence(nSourceSeq)[nSourceNdx];
// save current working sequence
@@ -1013,7 +1013,7 @@
sscanf(p + dwPos, pszEnvFmt, &nPoints, &susBegin, &susEnd, &loopBegin, &loopEnd, &bSus, &bLoop, &bCarry);
while ((dwPos < dwMemSize) && (p[dwPos] != '\r') && (p[dwPos] != '\n')) dwPos++;
- nPoints = min(nPoints, m_SndFile.GetModSpecifications().envelopePointsMax);
+ nPoints = MIN(nPoints, m_SndFile.GetModSpecifications().envelopePointsMax);
if (susEnd >= nPoints) susEnd = 0;
if (susBegin > susEnd) susBegin = susEnd;
if (loopEnd >= nPoints) loopEnd = 0;
Modified: trunk/OpenMPT/mptrack/PatternCursor.h
===================================================================
--- trunk/OpenMPT/mptrack/PatternCursor.h 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/PatternCursor.h 2013-04-12 13:19:24 UTC (rev 1852)
@@ -114,7 +114,7 @@
// Move the cursor relatively.
void Move(int rows, int channels, int columns)
{
- int row = max(0, static_cast<int>(GetRow()) + rows);
+ int row = MAX(0, static_cast<int>(GetRow()) + rows);
int chn = static_cast<int>(GetChannel()) + channels;
int col = static_cast<int>(GetColumnType() + columns);
@@ -179,7 +179,7 @@
// Ensure that the point lies within a given pattern size.
void Sanitize(ROWINDEX maxRows, CHANNELINDEX maxChans)
{
- ROWINDEX row = min(GetRow(), maxRows - 1);
+ ROWINDEX row = MIN(GetRow(), maxRows - 1);
CHANNELINDEX chn = GetChannel();
Columns col = GetColumnType();
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -429,7 +429,7 @@
if(DefaultPlugVolumeHandling >= PLUGIN_VOLUMEHANDLING_MAX) DefaultPlugVolumeHandling = PLUGIN_VOLUMEHANDLING_IGNORE;
m_nSampleUndoMaxBuffer = CMainFrame::GetPrivateProfileLong("Sample Editor" , "UndoBufferSize", m_nSampleUndoMaxBuffer >> 20, iniFile);
- m_nSampleUndoMaxBuffer = max(1, m_nSampleUndoMaxBuffer) << 20;
+ m_nSampleUndoMaxBuffer = MAX(1, m_nSampleUndoMaxBuffer) << 20;
PatternClipboard::SetClipboardSize(GetPrivateProfileInt("Pattern Editor", "NumClipboards", PatternClipboard::GetClipboardSize(), iniFile));
Modified: trunk/OpenMPT/mptrack/View_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_gen.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/View_gen.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -346,7 +346,7 @@
m_TabCtrl.DeleteAllItems();
for (int iItem=0; iItem<nTabCount; iItem++)
{
- const int lastItem = min(iItem * 4 + 4, MAX_BASECHANNELS);
+ const int lastItem = MIN(iItem * 4 + 4, MAX_BASECHANNELS);
wsprintf(s, "%d - %d", iItem * 4 + 1, lastItem);
tci.mask = TCIF_TEXT | TCIF_PARAM;
tci.pszText = s;
@@ -699,7 +699,7 @@
short int pos;
LockControls();
- const CHANNELINDEX nLoopLimit = min(4, pModDoc->GetSoundFile()->GetNumChannels() - nChn);
+ const CHANNELINDEX nLoopLimit = MIN(4, pModDoc->GetSoundFile()->GetNumChannels() - nChn);
for (CHANNELINDEX iCh = 0; iCh < nLoopLimit; iCh++)
{
// Volume sliders
Modified: trunk/OpenMPT/mptrack/View_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/View_ins.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -836,9 +836,9 @@
nPrevTick = nTick;
nRow = nTick / speed;
- if (nRow % max(1, nRowsPerMeasure) == 0)
+ if (nRow % MAX(1, nRowsPerMeasure) == 0)
m_dcGrid.SelectObject(CMainFrame::penGray80);
- else if (nRow % max(1, nRowsPerBeat) == 0)
+ else if (nRow % MAX(1, nRowsPerBeat) == 0)
m_dcGrid.SelectObject(CMainFrame::penGray55);
else
m_dcGrid.SelectObject(CMainFrame::penGray33);
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -860,7 +860,7 @@
}
// Adjust selection
- m_Selection = PatternRect(startSel, PatternCursor(min(finalDest, pSndFile->Patterns[m_nPattern].GetNumRows() - 1), endSel));
+ m_Selection = PatternRect(startSel, PatternCursor(MIN(finalDest, pSndFile->Patterns[m_nPattern].GetNumRows() - 1), endSel));
InvalidatePattern(false);
SetModified();
@@ -961,7 +961,7 @@
}
// Adjust selection
- m_Selection = PatternRect(startSel, PatternCursor(min(finalDest, pSndFile->Patterns[m_nPattern].GetNumRows() - 1), endSel));
+ m_Selection = PatternRect(startSel, PatternCursor(MIN(finalDest, pSndFile->Patterns[m_nPattern].GetNumRows() - 1), endSel));
InvalidatePattern(false);
SetModified();
@@ -2057,15 +2057,15 @@
if(m_findReplace.findFlags[FindReplace::InChannels])
{
// Limit search to given channels
- firstChannel = min(m_findReplace.findMinChn, lastChannel);
- lastChannel = min(m_findReplace.findMaxChn, lastChannel);
+ firstChannel = MIN(m_findReplace.findMinChn, lastChannel);
+ lastChannel = MIN(m_findReplace.findMaxChn, lastChannel);
}
if(m_findReplace.findFlags[FindReplace::InPatSelection])
{
// Limit search to pattern selection
- firstChannel = min(m_findReplace.selection.GetStartChannel(), lastChannel);
- lastChannel = min(m_findReplace.selection.GetEndChannel(), lastChannel);
+ firstChannel = MIN(m_findReplace.selection.GetStartChannel(), lastChannel);
+ lastChannel = MIN(m_findReplace.selection.GetEndChannel(), lastChannel);
}
for(PATTERNINDEX pat = patStart; pat < patEnd; pat++)
@@ -4812,7 +4812,7 @@
if(usePlaybackPosition && m_nPlayTick && pTarget->command == CMD_NONE && !doQuantize)
{
pTarget->command = (sndFile.TypeIsS3M_IT_MPT()) ? CMD_S3MCMDEX : CMD_MODCMDEX;
- pTarget->param = 0xD0 | min(0xF, m_nPlayTick);
+ pTarget->param = 0xD0 | MIN(0xF, m_nPlayTick);
}
//Enter note off
@@ -4831,7 +4831,7 @@
if(usePlaybackPosition && m_nPlayTick && !doQuantize) // ECx
{
pTarget->command = (sndFile.TypeIsS3M_IT_MPT()) ? CMD_S3MCMDEX : CMD_MODCMDEX;
- pTarget->param = 0xC0 | min(0xF, m_nPlayTick);
+ pTarget->param = 0xC0 | MIN(0xF, m_nPlayTick);
} else // C00
{
pTarget->note = NOTE_NONE;
@@ -5104,8 +5104,8 @@
{
newcmd.command = (sndFile.TypeIsS3M_IT_MPT()) ? CMD_S3MCMDEX : CMD_MODCMDEX;
UINT maxSpeed = 0x0F;
- if(sndFile.m_nMusicSpeed > 0) maxSpeed = min(0x0F, sndFile.m_nMusicSpeed - 1);
- newcmd.param = 0xD0 + min(maxSpeed, m_nPlayTick);
+ if(sndFile.m_nMusicSpeed > 0) maxSpeed = MIN(0x0F, sndFile.m_nMusicSpeed - 1);
+ newcmd.param = 0xD0 + MIN(maxSpeed, m_nPlayTick);
}
}
Modified: trunk/OpenMPT/mptrack/VstPresets.cpp
===================================================================
--- trunk/OpenMPT/mptrack/VstPresets.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/VstPresets.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -196,7 +196,7 @@
const uint32 numParams = plugin.GetNumParameters();
WriteBE(numParams, f);
- char name[max(kVstMaxProgNameLen + 1, 256)];
+ char name[MAX(kVstMaxProgNameLen + 1, 256)];
plugin.Dispatch(effGetProgramName, 0, 0, name, 0);
f.write(name, 28);
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -778,7 +778,7 @@
// Time signature. numerator = rows per beats / rows pear measure (should sound somewhat logical to you).
// the denominator is a bit more tricky, since it cannot be set explicitely. so we just assume quarters for now.
- timeInfo.timeSigNumerator = sndFile.m_nCurrentRowsPerMeasure / max(sndFile.m_nCurrentRowsPerBeat, 1);
+ timeInfo.timeSigNumerator = sndFile.m_nCurrentRowsPerMeasure / MAX(sndFile.m_nCurrentRowsPerBeat, 1);
timeInfo.timeSigDenominator = 4; //gcd(pSndFile->m_nCurrentRowsPerMeasure, pSndFile->m_nCurrentRowsPerBeat);
}
}
@@ -1442,7 +1442,7 @@
m_nOutputs = m_Effect.numOutputs;
// Input pointer array size must be >= 2 for now - the input buffer assignment might write to non allocated mem. otherwise
- bool result = mixBuffer.Initialize(max(m_nInputs, 2), m_nOutputs);
+ bool result = mixBuffer.Initialize(MAX(m_nInputs, 2), m_nOutputs);
m_MixState.pOutBufferL = mixBuffer.GetInputBuffer(0);
m_MixState.pOutBufferR = mixBuffer.GetInputBuffer(1);
@@ -1613,7 +1613,7 @@
defaultDir = defaultDir.substr(0, defaultDir.find_last_of("\\/"));
}
- char rawname[max(kVstMaxProgNameLen + 1, 256)] = ""; // kVstMaxProgNameLen is 24...
+ char rawname[MAX(kVstMaxProgNameLen + 1, 256)] = ""; // kVstMaxProgNameLen is 24...
Dispatch(effGetProgramName, 0, 0, rawname, 0);
SanitizeFilename(rawname);
StringFixer::SetNullTerminator(rawname);
@@ -1745,7 +1745,7 @@
CString CVstPlugin::GetFormattedProgramName(VstInt32 index)
//---------------------------------------------------------
{
- char rawname[max(kVstMaxProgNameLen + 1, 256)]; // kVstMaxProgNameLen is 24...
+ char rawname[MAX(kVstMaxProgNameLen + 1, 256)]; // kVstMaxProgNameLen is 24...
if(!GetProgramNameIndexed(index, -1, rawname))
{
// Fallback: Try to get current program name.
@@ -1841,7 +1841,7 @@
CString CVstPlugin::GetParamPropertyString(VstInt32 param, VstInt32 opcode)
//-------------------------------------------------------------------------
{
- CHAR s[max(kVstMaxParamStrLen + 1, 64)]; // Increased to 64 bytes since 32 bytes doesn't seem to suffice for all plugs. Kind of ridiculous if you consider that kVstMaxParamStrLen = 8...
+ CHAR s[MAX(kVstMaxParamStrLen + 1, 64)]; // Increased to 64 bytes since 32 bytes doesn't seem to suffice for all plugs. Kind of ridiculous if you consider that kVstMaxParamStrLen = 8...
s[0] = '\0';
if(m_Effect.numParams > 0 && param < m_Effect.numParams)
@@ -2041,7 +2041,7 @@
void CVstPlugin::SetDryRatio(UINT param)
//--------------------------------------
{
- param = min(param, 127);
+ param = MIN(param, 127);
m_pMixStruct->fDryRatio = static_cast<float>(1.0-(static_cast<double>(param)/127.0));
}
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -526,7 +526,7 @@
BOOL CRemoveChannelsDlg::OnInitDialog()
//-------------------------------------
{
- CHAR label[max(100, 20 + MAX_CHANNELNAME)];
+ CHAR label[MAX(100, 20 + MAX_CHANNELNAME)];
CDialog::OnInitDialog();
for (UINT n = 0; n < m_nChannels; n++)
{
@@ -1324,7 +1324,7 @@
void AppendNotesToControl(CComboBox& combobox, const ModCommand::NOTE noteStart, const ModCommand::NOTE noteEnd)
//------------------------------------------------------------------------------------------------------------------
{
- const ModCommand::NOTE upperLimit = min(CountOf(szDefaultNoteNames) - 1, noteEnd);
+ const ModCommand::NOTE upperLimit = MIN(CountOf(szDefaultNoteNames) - 1, noteEnd);
for(ModCommand::NOTE note = noteStart; note <= upperLimit; ++note)
combobox.SetItemData(combobox.AddString(szDefaultNoteNames[note]), note);
}
Modified: trunk/OpenMPT/soundlib/ITTools.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ITTools.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/ITTools.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -44,7 +44,7 @@
if(mptEnv.dwFlags[ENV_CARRY]) flags |= ITEnvelope::envCarry;
// Nodes and Loops
- num = (uint8)min(mptEnv.nNodes, 25);
+ num = (uint8)MIN(mptEnv.nNodes, 25);
lpb = (uint8)mptEnv.nLoopStart;
lpe = (uint8)mptEnv.nLoopEnd;
slb = (uint8)mptEnv.nSustainStart;
@@ -82,10 +82,10 @@
mptEnv.dwFlags.set(ENV_CARRY, (flags & ITEnvelope::envCarry) != 0);
// Nodes and Loops
- mptEnv.nNodes = min(num, maxNodes);
- mptEnv.nLoopStart = min(lpb, static_cast<uint8>(maxNodes));
+ mptEnv.nNodes = MIN(num, maxNodes);
+ mptEnv.nLoopStart = MIN(lpb, static_cast<uint8>(maxNodes));
mptEnv.nLoopEnd = Clamp(lpe, mptEnv.nLoopStart, static_cast<uint8>(maxNodes));
- mptEnv.nSustainStart = min(slb, static_cast<uint8>(maxNodes));
+ mptEnv.nSustainStart = MIN(slb, static_cast<uint8>(maxNodes));
mptEnv.nSustainEnd = Clamp(sle, mptEnv.nSustainStart, static_cast<uint8>(maxNodes));
// Envelope Data
@@ -187,8 +187,8 @@
mptIns.VolEnv.Values[i] = nodes[i * 2 + 1];
}
- if(max(mptIns.VolEnv.nLoopStart, mptIns.VolEnv.nLoopEnd) >= mptIns.VolEnv.nNodes) mptIns.VolEnv.dwFlags.reset(ENV_LOOP);
- if(max(mptIns.VolEnv.nSustainStart, mptIns.VolEnv.nSustainEnd) >= mptIns.VolEnv.nNodes) mptIns.VolEnv.dwFlags.reset(ENV_SUSTAIN);
+ if(MAX(mptIns.VolEnv.nLoopStart, mptIns.VolEnv.nLoopEnd) >= mptIns.VolEnv.nNodes) mptIns.VolEnv.dwFlags.reset(ENV_LOOP);
+ if(MAX(mptIns.VolEnv.nSustainStart, mptIns.VolEnv.nSustainEnd) >= mptIns.VolEnv.nNodes) mptIns.VolEnv.dwFlags.reset(ENV_SUSTAIN);
}
@@ -218,14 +218,14 @@
StringFixer::WriteString<StringFixer::nullTerminated>(name, mptIns.name);
// Volume / Panning
- fadeout = static_cast<uint16>(min(mptIns.nFadeOut >> 5, 256));
- gbv = static_cast<uint8>(min(mptIns.nGlobalVol * 2, 128));
- dfp = static_cast<uint8>(min(mptIns.nPan / 4, 64));
+ fadeout = static_cast<uint16>(MIN(mptIns.nFadeOut >> 5, 256));
+ gbv = static_cast<uint8>(MIN(mptIns.nGlobalVol * 2, 128));
+ dfp = static_cast<uint8>(MIN(mptIns.nPan / 4, 64));
if(!mptIns.dwFlags[INS_SETPANNING]) dfp |= ITInstrument::ignorePanning;
// Random Variation
- rv = min(mptIns.nVolSwing, 100);
- rp = min(mptIns.nPanSwing, 64);
+ rv = MIN(mptIns.nVolSwing, 100);
+ rp = MIN(mptIns.nPanSwing, 64);
// NNA Stuff
nna = mptIns.nNNA;
@@ -307,8 +307,8 @@
mptIns.dwFlags.set(INS_SETPANNING, !(dfp & ITInstrument::ignorePanning));
// Random Variation
- mptIns.nVolSwing = min(rv, 100);
- mptIns.nPanSwing = min(rp, 64);
+ mptIns.nVolSwing = MIN(rv, 100);
+ mptIns.nPanSwing = MIN(rp, 64);
// NNA Stuff
mptIns.nNNA = nna;
@@ -529,9 +529,9 @@
// Auto Vibrato settings
static const uint8 autovibxm2it[8] = { 0, 2, 4, 1, 3, 0, 0, 0 }; // OpenMPT VibratoType -> IT Vibrato
vit = autovibxm2it[mptSmp.nVibType & 7];
- vis = min(mptSmp.nVibRate, 64);
- vid = min(mptSmp.nVibDepth, 32);
- vir = min(mptSmp.nVibSweep, 255);
+ vis = MIN(mptSmp.nVibRate, 64);
+ vid = MIN(mptSmp.nVibDepth, 32);
+ vir = MIN(mptSmp.nVibSweep, 255);
if((vid | vis) != 0 && (fromType & MOD_TYPE_XM))
{
Modified: trunk/OpenMPT/soundlib/LOAD_DMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-04-12 13:19:24 UTC (rev 1852)
@@ -239,7 +239,7 @@
else if((val <= 0x0F || internalTicks < 2) && hasFine)
return (val | 0xF0);
else
- return max(1, (val / (internalTicks - 1))); // no porta on first tick!
+ return MAX(1, (val / (internalTicks - 1))); // no porta on first tick!
}
@@ -247,10 +247,10 @@
static uint8 DMFslide2MPT(uint8 val, const uint8 internalTicks, const bool up)
//----------------------------------------------------------------------------
{
- val = max(1, val / 4);
+ val = MAX(1, val / 4);
const bool isFine = (val < 0x0F) || (internalTicks < 2);
if(!isFine)
- val = max(1, (val + internalTicks - 2) / (internalTicks - 1)); // no slides on first tick! "+ internalTicks - 2" for rounding precision
+ val = MAX(1, (val + internalTicks - 2) / (internalTicks - 1)); // no slides on first tick! "+ internalTicks - 2" for rounding precision
if(up)
return (isFine ? 0x0F : 0x00) | (val << 4);
@@ -288,9 +288,9 @@
{
// MPT: 1 vibrato period == 64 ticks... we have internalTicks ticks per row.
// X-Tracker: Period length specified in rows!
- const int periodInTicks = max(1, (val >> 4)) * internalTicks;
+ const int periodInTicks = MAX(1, (val >> 4)) * internalTicks;
const uint8 matchingPeriod = (uint8)CLAMP((128 / periodInTicks), 1, 15);
- return (matchingPeriod << 4) | max(1, (val & 0x0F));
+ return (matchingPeriod << 4) | MAX(1, (val & 0x0F));
}
@@ -513,7 +513,7 @@
// => Tempo = 60 * Rows per Second * Speed / 24
// 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 = (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);
// Try to find matching speed - try higher speeds first, so that effects like arpeggio and tremor work better.
for(speed = 255; speed > 1; speed--)
@@ -645,7 +645,7 @@
}
break;
case 5: // Tremolo Retrig Sample (who invented those stupid effect names?)
- effectParam1 = max(1, DMFdelay2MPT(effectParam1, settings.internalTicks));
+ effectParam1 = MAX(1, DMFdelay2MPT(effectParam1, settings.internalTicks));
effect1 = CMD_RETRIG;
settings.channels[chn].playDir = false;
break;
@@ -690,7 +690,7 @@
case 1: // Note Finetune
effect2 = static_cast<ModCommand::COMMAND>(effectParam2 < 128 ? CMD_PORTAMENTOUP : CMD_PORTAMENTODOWN);
if(effectParam2 > 128) effectParam2 = 255 - effectParam2 + 1;
- effectParam2 = 0xF0 | min(0x0F, effectParam2); // Well, this is not too accurate...
+ effectParam2 = 0xF0 | MIN(0x0F, effectParam2); // Well, this is not too accurate...
break;
case 2: // Note Delay (wtf is the difference to Sample Delay?)
effectParam2 = DMFdelay2MPT(effectParam2, settings.internalTicks);
Modified: trunk/OpenMPT/soundlib/Load_gdm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_gdm.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_gdm.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -159,7 +159,7 @@
{
if(fileHeader.panMap[i] < 16)
{
- ChnSettings[i].nPan = min((fileHeader.panMap[i] * 16) + 8, 256);
+ ChnSettings[i].nPan = MIN((fileHeader.panMap[i] * 16) + 8, 256);
} else if(fileHeader.panMap[i] == 16)
{
ChnSettings[i].nPan = 128;
@@ -171,7 +171,7 @@
}
}
- m_nDefaultGlobalVolume = min(fileHeader.masterVol * 4, 256);
+ m_nDefaultGlobalVolume = MIN(fileHeader.masterVol * 4, 256);
m_nDefaultSpeed = fileHeader.tempo;
m_nDefaultTempo = fileHeader.bpm;
m_nRestartPos = 0; // Not supported in this format, so use the default value
@@ -216,8 +216,8 @@
Samples[smp].nLength /= 2;
}
- Samples[smp].nLoopStart = min(gdmSample.loopBegin, Samples[smp].nLength); // in samples
- Samples[smp].nLoopEnd = min(gdmSample.loopEnd - 1, Samples[smp].nLength); // dito
+ Samples[smp].nLoopStart = MIN(gdmSample.loopBegin, Samples[smp].nLength); // in samples
+ Samples[smp].nLoopEnd = MIN(gdmSample.loopEnd - 1, Samples[smp].nLength); // dito
Samples[smp].FrequencyToTranspose(); // set transpose + finetune for mod files
// Fix transpose + finetune for some rare cases where transpose is not C-5 (e.g. sample 4 in wander2.gdm)
@@ -244,7 +244,7 @@
if(gdmSample.flags & GDMSampleHeader::smpVolume)
{
// Default volume is used... 0...64, 255 = no default volume
- Samples[smp].nVolume = min(gdmSample.volume, 64) * 4;
+ Samples[smp].nVolume = MIN(gdmSample.volume, 64) * 4;
} else
{
Samples[smp].nVolume = 256;
@@ -255,7 +255,7 @@
// Default panning is used
Samples[smp].uFlags |= CHN_PANNING;
// 0...15, 16 = surround (not supported), 255 = no default panning
- Samples[smp].nPan = (gdmSample.panning > 15) ? 128 : min((gdmSample.panning * 16) + 8, 256);
+ Samples[smp].nPan = (gdmSample.panning > 15) ? 128 : MIN((gdmSample.panning * 16) + 8, 256);
} else
{
Samples[smp].nPan = 128;
@@ -277,7 +277,7 @@
}
// Read patterns
- Patterns.ResizeArray(max(MAX_PATTERNS, fileHeader.lastPattern + 1));
+ Patterns.ResizeArray(MAX(MAX_PATTERNS, fileHeader.lastPattern + 1));
const CModSpecifications &modSpecs = GetModSpecifications(GetBestSaveFormat());
@@ -406,7 +406,7 @@
break;
case CMD_VOLUME:
- m.param = min(m.param, 64);
+ m.param = MIN(m.param, 64);
if(modSpecs.HasVolCommand(VOLCMD_VOLUME))
{
m.volcmd = VOLCMD_VOLUME;
Modified: trunk/OpenMPT/soundlib/Load_imf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_imf.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_imf.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -302,13 +302,13 @@
break;
case 0xF: // set finetune
// we don't implement this, but let's at least import the value
- m.param = 0x20 | min(m.param >> 4, 0x0F);
+ m.param = 0x20 | MIN(m.param >> 4, 0x0F);
break;
case 0x14: // fine slide up
case 0x15: // fine slide down
// this is about as close as we can do...
if(m.param >> 4)
- m.param = 0xF0 | min(m.param >> 4, 0x0F);
+ m.param = 0xF0 | MIN(m.param >> 4, 0x0F);
else
m.param |= 0xE0;
break;
@@ -316,7 +316,7 @@
m.param >>= 1;
break;
case 0x1F: // set global volume
- m.param = min(m.param << 1, 0xFF);
+ m.param = MIN(m.param << 1, 0xFF);
break;
case 0x21:
n = 0;
@@ -506,13 +506,13 @@
if(e1c == 0x0C)
{
- m.vol = min(e1d, 0x40);
+ m.vol = MIN(e1d, 0x40);
m.volcmd = VOLCMD_VOLUME;
m.command = e2c;
m.param = e2d;
} else if(e2c == 0x0C)
{
- m.vol = min(e2d, 0x40);
+ m.vol = MIN(e2d, 0x40);
m.volcmd = VOLCMD_VOLUME;
m.command = e1c;
m.param = e1d;
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -229,7 +229,7 @@
static uint8 ConvertVolParam(const ModCommand *m)
//-----------------------------------------------
{
- return min(m->vol, 9);
+ return MIN(m->vol, 9);
}
@@ -956,7 +956,7 @@
const size_t num = 0;
#endif // MODPLUG_TRACKER
- uint16 fnum = (uint16)min(num, uint16_max); // Number of entries that are actually going to be written
+ uint16 fnum = (uint16)MIN(num, uint16_max); // Number of entries that are actually going to be written
const size_t bytes_written = 2 + fnum * 8; // Number of bytes that are actually going to be written
if(f == nullptr)
@@ -1032,7 +1032,7 @@
if(GetType() == MOD_TYPE_MPT)
{
if(!Order.NeedsExtraDatafield()) itHeader.ordnum = Order.size();
- else itHeader.ordnum = min(Order.size(), MAX_ORDERS); //Writing MAX_ORDERS at max here, and if there's more, writing them elsewhere.
+ else itHeader.ordnum = MIN(Order.size(), MAX_ORDERS); //Writing MAX_ORDERS at max here, and if there's more, writing them elsewhere.
//Crop unused orders from the end.
while(itHeader.ordnum > 1 && Order[itHeader.ordnum - 1] == Order.GetInvalidPatIndex()) itHeader.ordnum--;
@@ -1091,9 +1091,9 @@
if(m_SongFlags[SONG_EXFILTERRANGE] && !compatibilityExport) itHeader.flags |= ITFileHeader::extendedFilterRange;
itHeader.globalvol = (uint8)(m_nDefaultGlobalVolume >> 1);
- itHeader.mv = (uint8)min(m_nSamplePreAmp, 128);
- itHeader.speed = (uint8)min(m_nDefaultSpeed, 255);
- itHeader.tempo = (uint8)min(m_nDefaultTempo, 255); //Limit this one to 255, we save the real one as an extension below.
+ itHeader.mv = (uint8)MIN(m_nSamplePreAmp, 128);
+ itHeader.speed = (uint8)MIN(m_nDefaultSpeed, 255);
+ itHeader.tempo = (uint8)MIN(m_nDefaultTempo, 255); //Limit this one to 255, we save the real one as an extension below.
itHeader.sep = 128; // pan separation
// IT doesn't have a per-instrument Pitch Wheel Depth setting, so we just store the first non-zero PWD setting in the header.
for(INSTRUMENTINDEX ins = 1; ins < GetNumInstruments(); ins++)
@@ -1110,7 +1110,7 @@
memset(itHeader.chnpan, 0xA0, 64);
memset(itHeader.chnvol, 64, 64);
- for (CHANNELINDEX ich = 0; ich < min(m_nChannels, 64); ich++) // Header only has room for settings for 64 chans...
+ for (CHANNELINDEX ich = 0; ich < MIN(m_nChannels, 64); ich++) // Header only has room for settings for 64 chans...
{
itHeader.chnpan[ich] = (uint8)(ChnSettings[ich].nPan >> 2);
if (ChnSettings[ich].dwFlags[CHN_SURROUND]) itHeader.chnpan[ich] = 100;
@@ -1159,7 +1159,7 @@
if(m_lpszSongComments)
{
itHeader.special |= ITFileHeader::embedSongMessage;
- itHeader.msglength = msglength = (uint16)min(strlen(m_lpszSongComments) + 1, uint16_max);
+ itHeader.msglength = msglength = (uint16)MIN(strlen(m_lpszSongComments) + 1, uint16_max);
itHeader.msgoffset = dwHdrPos + dwExtra + (itHeader.insnum + itHeader.smpnum + itHeader.patnum) * 4;
}
@@ -1300,7 +1300,7 @@
fwrite(patinfo, 8, 1, f);
dwPos += 8;
- const CHANNELINDEX maxChannels = min(specs.channelsMax, GetNumChannels());
+ const CHANNELINDEX maxChannels = MIN(specs.channelsMax, GetNumChannels());
vector<BYTE> chnmask(maxChannels, 0xFF);
vector<ModCommand> lastvalue(maxChannels, ModCommand::Empty());
@@ -1794,9 +1794,9 @@
UINT maxNodes = 0;
for(INSTRUMENTINDEX nIns = 1; nIns <= m_nInstruments; nIns++) if(Instruments[nIns] != nullptr)
{
- maxNodes = max(maxNodes, Instruments[nIns]->VolEnv.nNodes);
- maxNodes = max(maxNodes, Instruments[nIns]->PanEnv.nNodes);
- maxNodes = max(maxNodes, Instruments[nIns]->PitchEnv.nNodes);
+ maxNodes = MAX(maxNodes, Instruments[nIns]->VolEnv.nNodes);
+ maxNodes = MAX(maxNodes, Instruments[nIns]->PanEnv.nNodes);
+ maxNodes = MAX(maxNodes, Instruments[nIns]->PitchEnv.nNodes);
}
// write full envelope information for MPTM files (more env points)
if(maxNodes > 25)
Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -390,7 +390,7 @@
// number of pattern name strings
PATTERNINDEX numNamedPats = Patterns.GetNumNamedPatterns();
- numNamedPats = min(numNamedPats, MAX_PATTERNS);
+ numNamedPats = MIN(numNamedPats, MAX_PATTERNS);
id = numNamedPats;
fwrite(&id, 1, sizeof(id), f);
Modified: trunk/OpenMPT/soundlib/Load_med.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_med.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -703,7 +703,7 @@
// Song Comments (null-terminated)
UINT annotxt = BigEndian(pmex->annotxt);
UINT annolen = BigEndian(pmex->annolen);
- annolen = min(annolen, MED_MAX_COMMENT_LENGTH); //Thanks to Luigi Auriemma for pointing out an overflow risk
+ annolen = MIN(annolen, MED_MAX_COMMENT_LENGTH); //Thanks to Luigi Auriemma for pointing out an overflow risk
if ((annotxt) && (annolen) && (annolen <= dwMemLength) && (annotxt <= dwMemLength - annolen) )
{
ReadMessage(lpStream + annotxt, annolen - 1, leAutodetect);
Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -96,7 +96,7 @@
{
if(param <= 0x80)
{
- param = min(param << 1, 0xFF);
+ param = MIN(param << 1, 0xFF);
}
else if(param == 0xA4) // surround
{
@@ -118,8 +118,8 @@
case CMD_VOLUME: command = 0x0C; break;
case CMD_PATTERNBREAK: command = 0x0D; param = ((param / 10) << 4) | (param % 10); break;
case CMD_MODCMDEX: command = 0x0E; break;
- case CMD_SPEED: command = 0x0F; param = min(param, (toXM) ? 0x1Fu : 0x20u); break;
- case CMD_TEMPO: command = 0x0F; param = max(param, (toXM) ? 0x20u : 0x21u); break;
+ case CMD_SPEED: command = 0x0F; param = MIN(param, (toXM) ? 0x1Fu : 0x20u); break;
+ case CMD_TEMPO: command = 0x0F; param = MAX(param, (toXM) ? 0x20u : 0x21u); break;
case CMD_GLOBALVOLUME: command = 'G' - 55; break;
case CMD_GLOBALVOLSLIDE: command = 'H' - 55; break;
case CMD_KEYOFF: command = 'K' - 55; break;
@@ -227,7 +227,7 @@
mptSmp.Initialize(MOD_TYPE_MOD);
mptSmp.nLength = length * 2;
mptSmp.nFineTune = MOD2XMFineTune(finetune & 0x0F);
- mptSmp.nVolume = 4 * min(volume, 64);
+ mptSmp.nVolume = 4 * MIN(volume, 64);
SmpLength lStart = loopStart * 2;
SmpLength lLength = loopLength * 2;
@@ -304,7 +304,7 @@
if(mptSmp.uFlags[CHN_LOOP])
{
loopStart = static_cast<uint16>(mptSmp.nLoopStart / 2);
- loopLength = static_cast<uint16>(max(1, (mptSmp.nLoopEnd - mptSmp.nLoopStart) / 2));
+ loopLength = static_cast<uint16>(MAX(1, (mptSmp.nLoopEnd - mptSmp.nLoopStart) / 2));
}
return writeLength;
@@ -353,7 +353,7 @@
m.param = 0x91;
} else
{
- m.param = min(m.param * 2, 0xFF);
+ m.param = MIN(m.param * 2, 0xFF);
}
}
}
@@ -1159,7 +1159,7 @@
{
// Maybe we can save some volume commands...
command = 0x0C;
- param = min(m.vol, 64);
+ param = MIN(m.vol, 64);
}
uint16 period = 0;
@@ -1209,7 +1209,7 @@
// First two bytes of oneshot samples have to be 0 due to PT's one-shot loop
const long sampleEnd = ftell(f);
fseek(f, sampleStart, SEEK_SET);
- fwrite(&silence, min(writtenBytes, 2), 1, f);
+ fwrite(&silence, MIN(writtenBytes, 2), 1, f);
fseek(f, sampleEnd, SEEK_SET);
}
Modified: trunk/OpenMPT/soundlib/Load_okt.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_okt.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_okt.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -68,7 +68,7 @@
void ReadOKTSamples(FileReader &chunk, vector<bool> &sample7bit, CSoundFile *pSndFile)
//------------------------------------------------------------------------------------
{
- pSndFile->m_nSamples = min((SAMPLEINDEX)(chunk.BytesLeft() / sizeof(OktSample)), MAX_SAMPLES - 1); // typically 36
+ pSndFile->m_nSamples = MIN((SAMPLEINDEX)(chunk.BytesLeft() / sizeof(OktSample)), MAX_SAMPLES - 1); // typically 36
sample7bit.resize(pSndFile->GetNumSamples());
for(SAMPLEINDEX nSmp = 1; nSmp <= pSndFile->GetNumSamples(); nSmp++)
@@ -88,7 +88,7 @@
mptSmp.nC5Speed = 8287;
mptSmp.nGlobalVol = 64;
- mptSmp.nVolume = min(oktSmp.volume, 64) * 4;
+ mptSmp.nVolume = MIN(oktSmp.volume, 64) * 4;
mptSmp.nLength = oktSmp.length & ~1; // round down
// parse loops
if (oktSmp.loopLength > 2 && static_cast<SmpLength>(oktSmp.loopStart) + static_cast<SmpLength>(oktSmp.loopLength) <= mptSmp.nLength)
@@ -176,14 +176,14 @@
if (m->param)
{
m->command = CMD_NOTESLIDEDOWN;
- m->param = 0x10 | min(0x0F, m->param);
+ m->param = 0x10 | MIN(0x0F, m->param);
}
break;
case 30: // U Slide Up (Notes)
if (m->param)
{
m->command = CMD_NOTESLIDEUP;
- m->param = 0x10 | min(0x0F, m->param);
+ m->param = 0x10 | MIN(0x0F, m->param);
}
break;
/* We don't have fine note slide, but this is supposed to happen once
@@ -193,14 +193,14 @@
if (m->param)
{
m->command = CMD_NOTESLIDEDOWN;
- m->param = 0x50 | min(0x0F, m->param);
+ m->param = 0x50 | MIN(0x0F, m->param);
}
break;
case 17: // H Slide Up Once (Notes)
if (m->param)
{
m->command = CMD_NOTESLIDEUP;
- m->param = 0x50 | min(0x0F, m->param);
+ m->param = 0x50 | MIN(0x0F, m->param);
}
break;
@@ -244,10 +244,10 @@
m->param = (m->param & 0x0F) << 4; // Dx0
break;
case 6:
- m->param = 0xF0 | min(m->param & 0x0F, 0x0E); // DFx
+ m->param = 0xF0 | MIN(m->param & 0x0F, 0x0E); // DFx
break;
case 7:
- m->param = (min(m->param & 0x0F, 0x0E) << 4) | 0x0F; // DxF
+ m->param = (MIN(m->param & 0x0F, 0x0E) << 4) | 0x0F; // DxF
break;
default:
// Junk.
@@ -417,7 +417,7 @@
continue;
// weird stuff?
- mptSample.nLength = min(mptSample.nLength, sampleChunks[nFileSmp].GetLength());
+ mptSample.nLength = MIN(mptSample.nLength, sampleChunks[nFileSmp].GetLength());
SampleIO(
SampleIO::_8bit,
Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -596,7 +596,7 @@
SAMPLEINDEX smp = static_cast<SAMPLEINDEX>(sampleHeader.sampleNumber + 1);
if(smp < MAX_SAMPLES)
{
- m_nSamples = max(m_nSamples, smp);
+ m_nSamples = MAX(m_nSamples, smp);
StringFixer::ReadString<StringFixer::nullTerminated>(m_szNames[smp], sampleHeader.sampleName);
sampleHeader.ConvertToMPT(Samples[smp]);
@@ -614,7 +614,7 @@
SAMPLEINDEX smp = static_cast<SAMPLEINDEX>(sampleHeader.sampleNumber + 1);
if(smp < MAX_SAMPLES)
{
- m_nSamples = max(m_nSamples, smp);
+ m_nSamples = MAX(m_nSamples, smp);
StringFixer::ReadString<StringFixer::nullTerminated>(m_szNames[smp], sampleHeader.sampleName);
sampleHeader.ConvertToMPT(Samples[smp]);
@@ -679,7 +679,7 @@
uint8 flags = rowChunk.ReadUint8();
uint8 channel = rowChunk.ReadUint8();
// Point to the correct channel
- ModCommand &m = rowBase[min(m_nChannels - 1, channel)];
+ ModCommand &m = rowBase[MIN(m_nChannels - 1, channel)];
if(flags & noteFlag)
{
@@ -709,7 +709,7 @@
// Volume present
uint8 vol = rowChunk.ReadUint8();
m.volcmd = VOLCMD_VOLUME;
- m.vol = (min(vol, 127) + 1) / 2;
+ m.vol = (MIN(vol, 127) + 1) / 2;
}
if(flags & effectFlag)
@@ -1117,7 +1117,7 @@
|| (fileHeader.formatVersion != 0x10 && fileHeader.formatVersion != 0x01) // why is this sometimes 0x01?
|| fileHeader.patternVersion != 0 // 255ch pattern version not supported (did anyone use this?)
|| (fileHeader.songType & 3) != 0
- || max(fileHeader.numChannelsPlay, fileHeader.numChannelsReal) == 0)
+ || MAX(fileHeader.numChannelsPlay, fileHeader.numChannelsReal) == 0)
{
return false;
}
@@ -1125,7 +1125,7 @@
// Seems to be valid!
m_nType = MOD_TYPE_S3M;
- m_nChannels = min(max(fileHeader.numChannelsPlay, fileHeader.numChannelsReal), MAX_BASECHANNELS);
+ m_nChannels = MIN(MAX(fileHeader.numChannelsPlay, fileHeader.numChannelsReal), MAX_BASECHANNELS);
m_nSamplePreAmp = fileHeader.masterVolume;
if(m_nSamplePreAmp == 255)
{
@@ -1170,7 +1170,7 @@
}
SAMPLEINDEX smp = sampleHeader.sampleNumber;
- m_nSamples = max(m_nSamples, smp);
+ m_nSamples = MAX(m_nSamples, smp);
StringFixer::ReadString<StringFixer::nullTerminated>(m_szNames[smp], sampleHeader.name);
sampleHeader.ConvertToMPT(Samples[smp]);
@@ -1223,7 +1223,7 @@
continue;
}
- ModCommand &m = *Patterns[pat].GetpModCommand(curRow, min(chnFlag & channelMask, m_nChannels - 1));
+ ModCommand &m = *Patterns[pat].GetpModCommand(curRow, MIN(chnFlag & channelMask, m_nChannels - 1));
if(chnFlag & noteFlag)
{
Modified: trunk/OpenMPT/soundlib/Load_ptm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ptm.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_ptm.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -90,7 +90,7 @@
m_nType = MOD_TYPE_PTM;
m_nChannels = pfh.nchannels;
- m_nSamples = min(pfh.nsamples, MAX_SAMPLES - 1);
+ m_nSamples = MIN(pfh.nsamples, MAX_SAMPLES - 1);
dwMemPos = sizeof(PTMFILEHEADER);
nOrders = (pfh.norders < MAX_ORDERS) ? pfh.norders : MAX_ORDERS-1;
Order.ReadFromArray(pfh.orders, nOrders);
Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -298,8 +298,8 @@
if(sampleType == typePCM)
{
mptSmp.nLength = length;
- mptSmp.nLoopStart = min(loopStart, mptSmp.nLength - 1);
- mptSmp.nLoopEnd = min(loopEnd, mptSmp.nLength);
+ mptSmp.nLoopStart = MIN(loopStart, mptSmp.nLength - 1);
+ mptSmp.nLoopEnd = MIN(loopEnd, mptSmp.nLength);
mptSmp.uFlags.set(CHN_LOOP, (flags & smpLoop) != 0);
}
@@ -310,7 +310,7 @@
}
// Volume / Panning
- mptSmp.nVolume = min(defaultVolume, 64) * 4;
+ mptSmp.nVolume = MIN(defaultVolume, 64) * 4;
// C-5 frequency
mptSmp.nC5Speed = c5speed;
@@ -333,9 +333,9 @@
if(mptSmp.pSample != nullptr)
{
sampleType = typePCM;
- length = static_cast<uint32>(min(mptSmp.nLength, uint32_max));
- loopStart = static_cast<uint32>(min(mptSmp.nLoopStart, uint32_max));
- loopEnd = static_cast<uint32>(min(mptSmp.nLoopEnd, uint32_max));
+ length = static_cast<uint32>(MIN(mptSmp.nLength, uint32_max));
+ loopStart = static_cast<uint32>(MIN(mptSmp.nLoopStart, uint32_max));
+ loopEnd = static_cast<uint32>(MIN(mptSmp.nLoopEnd, uint32_max));
smpLength = length;
@@ -353,7 +353,7 @@
sampleType = typeNone;
}
- defaultVolume = static_cast<uint8>(min(mptSmp.nVolume / 4, 64));
+ defaultVolume = static_cast<uint8>(MIN(mptSmp.nVolume / 4, 64));
if(mptSmp.nC5Speed != 0)
{
c5speed = mptSmp.nC5Speed;
@@ -499,7 +499,7 @@
}
// Global Volume
- m_nDefaultGlobalVolume = min(fileHeader.globalVol, 64) * 4;
+ m_nDefaultGlobalVolume = MIN(fileHeader.globalVol, 64) * 4;
// The following check is probably not very reliable, but it fixes a few tunes, e.g.
// DARKNESS.S3M by Purple Motion (ST 3.00) and "Image of Variance" by C.C.Catch (ST 3.01):
if(m_nDefaultGlobalVolume == 0 && fileHeader.cwtv < S3MFileHeader::trkST3_20)
@@ -571,7 +571,7 @@
bool hasAdlibPatches = false;
// Reading sample headers
- m_nSamples = min(fileHeader.smpNum, MAX_SAMPLES - 1);
+ m_nSamples = MIN(fileHeader.smpNum, MAX_SAMPLES - 1);
for(SAMPLEINDEX smp = 0; smp < m_nSamples; smp++)
{
S3MSampleHeader sampleHeader;
@@ -613,7 +613,7 @@
int zxxCountRight = 0, zxxCountLeft = 0;
// Reading patterns
- const PATTERNINDEX readPatterns = min(fileHeader.patNum, MAX_PATTERNS);
+ const PATTERNINDEX readPatterns = MIN(fileHeader.patNum, MAX_PATTERNS);
for(PATTERNINDEX pat = 0; pat < readPatterns; pat++)
{
// A zero parapointer indicates an empty pattern.
@@ -681,7 +681,7 @@
} else
{
m.volcmd = VOLCMD_VOLUME;
- m.vol = min(volume, 64);
+ m.vol = MIN(volume, 64);
}
}
@@ -777,7 +777,7 @@
fileHeader.smpNum = static_cast<uint16>(writeSamples);
// Patterns
- PATTERNINDEX writePatterns = min(Patterns.GetNumPatterns(), 100u);
+ PATTERNINDEX writePatterns = MIN(Patterns.GetNumPatterns(), 100u);
fileHeader.patNum = static_cast<uint16>(writePatterns);
// Flags
@@ -798,7 +798,7 @@
fileHeader.magic = S3MFileHeader::idSCRM;
// Song Variables
- fileHeader.globalVol = static_cast<uint8>(min(m_nDefaultGlobalVolume / 4, 64));
+ fileHeader.globalVol = static_cast<uint8>(MIN(m_nDefaultGlobalVolume / 4, 64));
fileHeader.speed = static_cast<uint8>(Clamp(m_nDefaultSpeed, 1u, 254u));
fileHeader.tempo = static_cast<uint8>(Clamp(m_nDefaultTempo, 33u, 255u));
fileHeader.masterVolume = static_cast<uint8>(Clamp(m_nSamplePreAmp, 16u, 127u) | 0x80);
@@ -931,7 +931,7 @@
const PatternRow rowBase = Patterns[pat].GetRow(row);
- CHANNELINDEX writeChannels = min(32, GetNumChannels());
+ CHANNELINDEX writeChannels = MIN(32, GetNumChannels());
for(CHANNELINDEX chn = 0; chn < writeChannels; chn++)
{
ModCommand &m = rowBase[chn];
@@ -970,7 +970,7 @@
{
command = CMD_NONE;
volcmd = VOLCMD_VOLUME;
- vol = min(param, 64);
+ vol = MIN(param, 64);
}
if(volcmd == VOLCMD_VOLUME)
@@ -1019,7 +1019,7 @@
buffer.insert(buffer.end(), 64, s3mEndOfRow);
}
- size_t length = min(buffer.size(), uint16_max);
+ size_t length = MIN(buffer.size(), uint16_max);
buffer[0] = static_cast<uint8>(length & 0xFF);
buffer[1] = static_cast<uint8>((length >> 8) & 0xFF);
Modified: trunk/OpenMPT/soundlib/Load_ult.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ult.cpp 2013-04-11 22:59:30 UTC (rev 1851)
+++ trunk/OpenMPT/soundlib/Load_ult.cpp 2013-04-12 13:19:24 UTC (rev 1852)
@@ -240,15 +240,15 @@
{
uint32 off = ((param1 << 8) | param2) >> 6;
cmd1 = CMD_NONE;
- param1 = (uint8)min(off, 0xFF);
+ param1 = (uint8)MIN(off, 0xFF);
} else if(cmd1 == CMD_OFFSET)
{
uint32 off = param1 * 4;
- param1 = (uint8)min(off, 0xFF);
+ param1 = (uint8)MIN(off, 0xFF);
} else if(cmd2 == CMD_OFFSET)
{
uint32 off = param2 * 4;
- param...
[truncated message content] |
