Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3900] trunk/OpenMPT
|
From: <man...@us...> - 2014-03-18 10:17:48
|
Revision: 3900
http://sourceforge.net/p/modplug/code/3900
Author: manxorist
Date: 2014-03-18 10:17:40 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
[Ref] Replace all CLAMP with Clamp and kill CLAMP.
Modified Paths:
--------------
trunk/OpenMPT/common/misc_util.h
trunk/OpenMPT/mptrack/Ctrl_gen.cpp
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/EffectInfo.cpp
trunk/OpenMPT/mptrack/MPTHacks.cpp
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/ScaleEnvPointsDlg.cpp
trunk/OpenMPT/sounddev/SoundDevice.h
Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h 2014-03-18 09:53:02 UTC (rev 3899)
+++ trunk/OpenMPT/common/misc_util.h 2014-03-18 10:17:40 UTC (rev 3900)
@@ -296,12 +296,6 @@
}
-// Like Limit, but returns value
-#ifndef CLAMP
-#define CLAMP(number, low, high) MIN(high, MAX(low, number))
-#endif
-
-
// Greatest Common Divisor.
template <class T>
T gcd(T a, T b)
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2014-03-18 09:53:02 UTC (rev 3899)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2014-03-18 10:17:40 UTC (rev 3900)
@@ -388,7 +388,7 @@
if (s[0])
{
UINT n = atoi(s);
- n = CLAMP(n, m_sndFile.GetModSpecifications().tempoMin, m_sndFile.GetModSpecifications().tempoMax);
+ n = Clamp(n, m_sndFile.GetModSpecifications().tempoMin, m_sndFile.GetModSpecifications().tempoMax);
if (n != m_sndFile.m_nDefaultTempo)
{
m_bEditsLocked=true;
@@ -415,7 +415,7 @@
if (s[0])
{
UINT n = atoi(s);
- n = CLAMP(n, m_sndFile.GetModSpecifications().speedMin, m_sndFile.GetModSpecifications().speedMax);
+ n = Clamp(n, m_sndFile.GetModSpecifications().speedMin, m_sndFile.GetModSpecifications().speedMax);
if (n != m_sndFile.m_nDefaultSpeed)
{
m_bEditsLocked=true;
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2014-03-18 09:53:02 UTC (rev 3899)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2014-03-18 10:17:40 UTC (rev 3900)
@@ -473,7 +473,7 @@
int n = pIns->NoteMap[i];
if ((n > NOTE_MIN && nAmount < 0) || (n < NOTE_MAX && nAmount > 0))
{
- n = CLAMP(n + nAmount, NOTE_MIN, NOTE_MAX);
+ n = Clamp(n + nAmount, NOTE_MIN, NOTE_MAX);
pIns->NoteMap[i] = (BYTE)n;
bModified = true;
}
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2014-03-18 09:53:02 UTC (rev 3899)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2014-03-18 10:17:40 UTC (rev 3900)
@@ -3022,12 +3022,12 @@
// MOD finetune range -8 to 7 translates to -128 to 112
if(m_sndFile.GetType() & MOD_TYPE_MOD)
{
- ftune = CLAMP((ftune >> 4) + pos, -8, 7);
+ ftune = Clamp((ftune >> 4) + pos, -8, 7);
sample.nFineTune = MOD2XMFineTune((signed char)ftune);
}
else
{
- ftune = CLAMP(ftune + pos, -128, 127);
+ ftune = Clamp(ftune + pos, -128, 127);
sample.nFineTune = (signed char)ftune;
}
SetDlgItemInt(IDC_EDIT5, ftune, TRUE);
Modified: trunk/OpenMPT/mptrack/EffectInfo.cpp
===================================================================
--- trunk/OpenMPT/mptrack/EffectInfo.cpp 2014-03-18 09:53:02 UTC (rev 3899)
+++ trunk/OpenMPT/mptrack/EffectInfo.cpp 2014-03-18 10:17:40 UTC (rev 3900)
@@ -402,7 +402,7 @@
case CMD_PANNING8:
if(sndFile.GetType() == MOD_TYPE_S3M)
{
- pos = CLAMP(param, 0, 0x80);
+ pos = Clamp(param, 0u, 0x80u);
if(param == 0xA4)
pos = 0x81;
}
Modified: trunk/OpenMPT/mptrack/MPTHacks.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MPTHacks.cpp 2014-03-18 09:53:02 UTC (rev 3899)
+++ trunk/OpenMPT/mptrack/MPTHacks.cpp 2014-03-18 10:17:40 UTC (rev 3900)
@@ -368,7 +368,7 @@
AddToLog(mpt::String::Format("Found incompatible default tempo (must be between %d and %d)", originalSpecs->tempoMin, originalSpecs->tempoMax));
foundHacks = true;
if(autofix)
- m_SndFile.m_nDefaultTempo = CLAMP(m_SndFile.m_nDefaultTempo, originalSpecs->tempoMin, originalSpecs->tempoMax);
+ m_SndFile.m_nDefaultTempo = Clamp(m_SndFile.m_nDefaultTempo, originalSpecs->tempoMin, originalSpecs->tempoMax);
}
// Check for invalid default speed
@@ -377,7 +377,7 @@
AddToLog(mpt::String::Format("Found incompatible default speed (must be between %d and %d)", originalSpecs->speedMin, originalSpecs->speedMax));
foundHacks = true;
if(autofix)
- m_SndFile.m_nDefaultSpeed = CLAMP(m_SndFile.m_nDefaultSpeed, originalSpecs->speedMin, originalSpecs->speedMax);
+ m_SndFile.m_nDefaultSpeed = Clamp(m_SndFile.m_nDefaultSpeed, originalSpecs->speedMin, originalSpecs->speedMax);
}
// Check for invalid rows per beat / measure values
@@ -387,8 +387,8 @@
foundHacks = true;
if(autofix)
{
- m_SndFile.m_nDefaultRowsPerBeat = CLAMP(m_SndFile.m_nDefaultRowsPerBeat, 1, (originalSpecs->patternRowsMax - 1));
- m_SndFile.m_nDefaultRowsPerMeasure = CLAMP(m_SndFile.m_nDefaultRowsPerMeasure, m_SndFile.m_nDefaultRowsPerBeat, (originalSpecs->patternRowsMax - 1));
+ m_SndFile.m_nDefaultRowsPerBeat = Clamp(m_SndFile.m_nDefaultRowsPerBeat, 1u, (originalSpecs->patternRowsMax - 1));
+ m_SndFile.m_nDefaultRowsPerMeasure = Clamp(m_SndFile.m_nDefaultRowsPerMeasure, m_SndFile.m_nDefaultRowsPerBeat, (originalSpecs->patternRowsMax - 1));
}
}
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-03-18 09:53:02 UTC (rev 3899)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-03-18 10:17:40 UTC (rev 3900)
@@ -651,7 +651,7 @@
m_CbnLatencyMS.GetWindowText(s, sizeof(s));
m_Settings.LatencyMS = atoi(s);
//Check given value.
- m_Settings.LatencyMS = CLAMP(m_Settings.LatencyMS, SNDDEV_MINLATENCY_MS, SNDDEV_MAXLATENCY_MS);
+ m_Settings.LatencyMS = Clamp(m_Settings.LatencyMS, SNDDEV_MINLATENCY_MS, SNDDEV_MAXLATENCY_MS);
wsprintf(s, "%d ms", m_Settings.LatencyMS);
m_CbnLatencyMS.SetWindowText(s);
}
@@ -661,7 +661,7 @@
m_CbnUpdateIntervalMS.GetWindowText(s, sizeof(s));
m_Settings.UpdateIntervalMS = atoi(s);
//Check given value.
- m_Settings.UpdateIntervalMS = CLAMP(m_Settings.UpdateIntervalMS, SNDDEV_MINUPDATEINTERVAL_MS, SNDDEV_MAXUPDATEINTERVAL_MS);
+ m_Settings.UpdateIntervalMS = Clamp(m_Settings.UpdateIntervalMS, SNDDEV_MINUPDATEINTERVAL_MS, SNDDEV_MAXUPDATEINTERVAL_MS);
wsprintf(s, "%d ms", m_Settings.UpdateIntervalMS);
m_CbnUpdateIntervalMS.SetWindowText(s);
}
Modified: trunk/OpenMPT/mptrack/ScaleEnvPointsDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ScaleEnvPointsDlg.cpp 2014-03-18 09:53:02 UTC (rev 3899)
+++ trunk/OpenMPT/mptrack/ScaleEnvPointsDlg.cpp 2014-03-18 10:17:40 UTC (rev 3900)
@@ -59,7 +59,7 @@
{
for(uint32 i = 0; i < m_Env.nNodes; i++)
{
- m_Env.Values[i] = CLAMP(static_cast<BYTE>((m_fFactorY * ((int)m_Env.Values[i] - m_nCenter)) + m_nCenter), ENVELOPE_MIN, ENVELOPE_MAX);
+ m_Env.Values[i] = Clamp(static_cast<uint8>((m_fFactorY * ((int)m_Env.Values[i] - m_nCenter)) + m_nCenter), uint8(ENVELOPE_MIN), uint8(ENVELOPE_MAX));
}
}
Modified: trunk/OpenMPT/sounddev/SoundDevice.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.h 2014-03-18 09:53:02 UTC (rev 3899)
+++ trunk/OpenMPT/sounddev/SoundDevice.h 2014-03-18 10:17:40 UTC (rev 3900)
@@ -159,10 +159,10 @@
#define SNDDEV_MAXBUFFERS 256
#define SNDDEV_MAXBUFFERSIZE (1024*1024)
-#define SNDDEV_MINLATENCY_MS 1
-#define SNDDEV_MAXLATENCY_MS 500
-#define SNDDEV_MINUPDATEINTERVAL_MS 1
-#define SNDDEV_MAXUPDATEINTERVAL_MS 200
+#define SNDDEV_MINLATENCY_MS 1u
+#define SNDDEV_MAXLATENCY_MS 500u
+#define SNDDEV_MINUPDATEINTERVAL_MS 1u
+#define SNDDEV_MAXUPDATEINTERVAL_MS 200u
struct SoundChannelMapping
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
