Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4875] trunk/OpenMPT
|
From: <man...@us...> - 2015-03-11 20:28:01
|
Revision: 4875
http://sourceforge.net/p/modplug/code/4875
Author: manxorist
Date: 2015-03-11 20:27:52 +0000 (Wed, 11 Mar 2015)
Log Message:
-----------
[Ref] For the sake of consistency, convert all std integer types to our own ones in soundlib/ and common/. Converting the whole codebase to std::?int??_t would only bloat blame history once again, after the conversion from Win32 types to our own integer types without _t suffix, which happened in the recent past years.
Modified Paths:
--------------
trunk/OpenMPT/common/Logging.cpp
trunk/OpenMPT/soundlib/Fastmix.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/ModChannel.h
trunk/OpenMPT/soundlib/SampleFormats.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/WAVTools.cpp
trunk/OpenMPT/soundlib/WAVTools.h
Modified: trunk/OpenMPT/common/Logging.cpp
===================================================================
--- trunk/OpenMPT/common/Logging.cpp 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/common/Logging.cpp 2015-03-11 20:27:52 UTC (rev 4875)
@@ -45,7 +45,7 @@
// remove eol if already present
message = mpt::String::RTrim(message, MPT_USTRING("\r\n"));
#if defined(MODPLUG_TRACKER)
- static uint64_t s_lastlogtime = 0;
+ static uint64 s_lastlogtime = 0;
uint64 cur = mpt::Date::ANSI::Now();
uint64 diff = cur/10000 - s_lastlogtime;
s_lastlogtime = cur/10000;
Modified: trunk/OpenMPT/soundlib/Fastmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Fastmix.cpp 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/soundlib/Fastmix.cpp 2015-03-11 20:27:52 UTC (rev 4875)
@@ -705,7 +705,7 @@
if(plugin.IsAutoSuspendable() && pState->inputSilenceCount >= m_MixerSettings.gdwMixingFreq * 4)
{
bool isSilent = true;
- for(uint32_t i = 0; i < nCount; i++)
+ for(uint32 i = 0; i < nCount; i++)
{
if(pOutL[i] > FLT_EPSILON || pOutL[i] < -FLT_EPSILON
|| pOutR[i] > FLT_EPSILON || pOutR[i] < -FLT_EPSILON)
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2015-03-11 20:27:52 UTC (rev 4875)
@@ -2090,10 +2090,10 @@
// Rationale: chunks are limited to 65536 bytes, which can easily be reached
// with the amount of samples that OpenMPT supports.
WRITEMODULARHEADER('S','E','U','C', 2 + CountOf(sample.cues) * 4);
- mpt::IO::WriteIntLE<uint16_t>(f, smp);
+ mpt::IO::WriteIntLE<uint16>(f, smp);
for(std::size_t i = 0; i < CountOf(sample.cues); i++)
{
- mpt::IO::WriteIntLE<uint32_t>(f, sample.cues[i]);
+ mpt::IO::WriteIntLE<uint32>(f, sample.cues[i]);
}
}
}
Modified: trunk/OpenMPT/soundlib/ModChannel.h
===================================================================
--- trunk/OpenMPT/soundlib/ModChannel.h 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/soundlib/ModChannel.h 2015-03-11 20:27:52 UTC (rev 4875)
@@ -21,8 +21,8 @@
struct EnvInfo
{
FlagSet<EnvelopeFlags> flags;
- uint32_t nEnvPosition;
- int32_t nEnvValueAtReleaseJump;
+ uint32 nEnvPosition;
+ int32 nEnvValueAtReleaseJump;
void Reset()
{
@@ -34,16 +34,16 @@
// Information used in the mixer (should be kept tight for better caching)
// Byte sizes are for 32-bit builds and 32-bit integer / float mixer
const void *pCurrentSample; // Currently playing sample (nullptr if no sample is playing)
- uint32_t nPos; // Current play position
- uint32_t nPosLo; // 16-bit fractional part of play position
- int32_t nInc; // 16.16 fixed point sample speed relative to mixing frequency (0x10000 = one sample per output sample, 0x20000 = two samples per output sample, etc...)
- int32_t leftVol; // 0...4096 (12 bits, since 16 bits + 12 bits = 28 bits = 0dB in integer mixer, see MIXING_ATTENUATION)
- int32_t rightVol; // Ditto
- int32_t leftRamp; // Ramping delta, 20.12 fixed point (see VOLUMERAMPPRECISION)
- int32_t rightRamp; // Ditto
+ uint32 nPos; // Current play position
+ uint32 nPosLo; // 16-bit fractional part of play position
+ int32 nInc; // 16.16 fixed point sample speed relative to mixing frequency (0x10000 = one sample per output sample, 0x20000 = two samples per output sample, etc...)
+ int32 leftVol; // 0...4096 (12 bits, since 16 bits + 12 bits = 28 bits = 0dB in integer mixer, see MIXING_ATTENUATION)
+ int32 rightVol; // Ditto
+ int32 leftRamp; // Ramping delta, 20.12 fixed point (see VOLUMERAMPPRECISION)
+ int32 rightRamp; // Ditto
// Up to here: 32 bytes
- int32_t rampLeftVol; // Current ramping volume, 20.12 fixed point (see VOLUMERAMPPRECISION)
- int32_t rampRightVol; // Ditto
+ int32 rampLeftVol; // Current ramping volume, 20.12 fixed point (see VOLUMERAMPPRECISION)
+ int32 rampRightVol; // Ditto
mixsample_t nFilter_Y[2][2]; // Filter memory - two history items per sample channel
mixsample_t nFilter_A0, nFilter_B0, nFilter_B1; // Filter coeffs
mixsample_t nFilter_HP;
@@ -54,7 +54,7 @@
SmpLength nLoopEnd;
FlagSet<ChannelFlags> dwFlags;
mixsample_t nROfs, nLOfs;
- uint32_t nRampLength;
+ uint32 nRampLength;
// Up to here: 100 bytes
const ModSample *pModSample; // Currently assigned sample slot (can already be stopped)
@@ -64,52 +64,52 @@
SmpLength proTrackerOffset; // Offset for instrument-less notes in ProTracker mode
SmpLength oldOffset;
FlagSet<ChannelFlags> dwOldFlags; // Flags from previous tick
- int32_t newLeftVol, newRightVol;
- int32_t nRealVolume, nRealPan;
- int32_t nVolume, nPan, nFadeOutVol;
- int32_t nPeriod, nC5Speed, nPortamentoDest;
- int32_t cachedPeriod, glissandoPeriod;
- int32_t nCalcVolume; // Calculated channel volume, 14-Bit (without global volume, pre-amp etc applied) - for MIDI macros
+ int32 newLeftVol, newRightVol;
+ int32 nRealVolume, nRealPan;
+ int32 nVolume, nPan, nFadeOutVol;
+ int32 nPeriod, nC5Speed, nPortamentoDest;
+ int32 cachedPeriod, glissandoPeriod;
+ int32 nCalcVolume; // Calculated channel volume, 14-Bit (without global volume, pre-amp etc applied) - for MIDI macros
EnvInfo VolEnv, PanEnv, PitchEnv; // Envelope playback info
- int32_t nGlobalVol; // Channel volume (CV in ITTECH.TXT)
- int32_t nInsVol; // Sample / Instrument volume (SV * IV in ITTECH.TXT)
- int32_t nFineTune, nTranspose;
- int32_t nPortamentoSlide, nAutoVibDepth;
- uint32_t nAutoVibPos, nVibratoPos, nTremoloPos, nPanbrelloPos;
- int32_t nVolSwing, nPanSwing;
- int32_t nCutSwing, nResSwing;
- int32_t nRestorePanOnNewNote; //If > 0, nPan should be set to nRestorePanOnNewNote - 1 on new note. Used to recover from panswing.
- uint32_t nEFxOffset; // offset memory for Invert Loop (EFx, .MOD only)
- int32_t nRetrigCount, nRetrigParam;
+ int32 nGlobalVol; // Channel volume (CV in ITTECH.TXT)
+ int32 nInsVol; // Sample / Instrument volume (SV * IV in ITTECH.TXT)
+ int32 nFineTune, nTranspose;
+ int32 nPortamentoSlide, nAutoVibDepth;
+ uint32 nAutoVibPos, nVibratoPos, nTremoloPos, nPanbrelloPos;
+ int32 nVolSwing, nPanSwing;
+ int32 nCutSwing, nResSwing;
+ int32 nRestorePanOnNewNote; //If > 0, nPan should be set to nRestorePanOnNewNote - 1 on new note. Used to recover from panswing.
+ uint32 nEFxOffset; // offset memory for Invert Loop (EFx, .MOD only)
+ int32 nRetrigCount, nRetrigParam;
ROWINDEX nPatternLoop;
CHANNELINDEX nMasterChn;
ModCommand rowCommand;
// 8-bit members
- uint8_t resamplingMode;
- uint8_t nRestoreResonanceOnNewNote; // See nRestorePanOnNewNote
- uint8_t nRestoreCutoffOnNewNote; // ditto
- uint8_t nNote, nNNA;
- uint8_t nLastNote; // Last note, ignoring note offs and cuts - for MIDI macros
- uint8_t nArpeggioLastNote, nArpeggioBaseNote; // For plugin arpeggio
- uint8_t nNewNote, nNewIns, nOldIns, nCommand, nArpeggio;
- uint8_t nOldVolumeSlide, nOldFineVolUpDown;
- uint8_t nOldPortaUpDown, nOldFinePortaUpDown, nOldExtraFinePortaUpDown;
- uint8_t nOldPanSlide, nOldChnVolSlide;
- uint8_t nOldGlobalVolSlide;
- uint8_t nVibratoType, nVibratoSpeed, nVibratoDepth;
- uint8_t nTremoloType, nTremoloSpeed, nTremoloDepth;
- uint8_t nPanbrelloType, nPanbrelloSpeed, nPanbrelloDepth;
- int8_t nPanbrelloOffset, nPanbrelloRandomMemory;
- uint8_t nOldCmdEx, nOldVolParam, nOldTempo;
- uint8_t nOldHiOffset;
- uint8_t nCutOff, nResonance;
- uint8_t nTremorCount, nTremorParam;
- uint8_t nPatternLoopCount;
- uint8_t nLeftVU, nRightVU;
- uint8_t nActiveMacro, nFilterMode;
- uint8_t nEFxSpeed, nEFxDelay; // memory for Invert Loop (EFx, .MOD only)
- uint8_t nNoteSlideCounter, nNoteSlideSpeed, nNoteSlideStep; // IMF / PTM Note Slide
- uint8_t lastZxxParam; // Memory for \xx slides
+ uint8 resamplingMode;
+ uint8 nRestoreResonanceOnNewNote; // See nRestorePanOnNewNote
+ uint8 nRestoreCutoffOnNewNote; // ditto
+ uint8 nNote, nNNA;
+ uint8 nLastNote; // Last note, ignoring note offs and cuts - for MIDI macros
+ uint8 nArpeggioLastNote, nArpeggioBaseNote; // For plugin arpeggio
+ uint8 nNewNote, nNewIns, nOldIns, nCommand, nArpeggio;
+ uint8 nOldVolumeSlide, nOldFineVolUpDown;
+ uint8 nOldPortaUpDown, nOldFinePortaUpDown, nOldExtraFinePortaUpDown;
+ uint8 nOldPanSlide, nOldChnVolSlide;
+ uint8 nOldGlobalVolSlide;
+ uint8 nVibratoType, nVibratoSpeed, nVibratoDepth;
+ uint8 nTremoloType, nTremoloSpeed, nTremoloDepth;
+ uint8 nPanbrelloType, nPanbrelloSpeed, nPanbrelloDepth;
+ int8 nPanbrelloOffset, nPanbrelloRandomMemory;
+ uint8 nOldCmdEx, nOldVolParam, nOldTempo;
+ uint8 nOldHiOffset;
+ uint8 nCutOff, nResonance;
+ uint8 nTremorCount, nTremorParam;
+ uint8 nPatternLoopCount;
+ uint8 nLeftVU, nRightVU;
+ uint8 nActiveMacro, nFilterMode;
+ uint8 nEFxSpeed, nEFxDelay; // memory for Invert Loop (EFx, .MOD only)
+ uint8 nNoteSlideCounter, nNoteSlideSpeed, nNoteSlideStep; // IMF / PTM Note Slide
+ uint8 lastZxxParam; // Memory for \xx slides
bool isFirstTick : 1;
//-->Variables used to make user-definable tuning modes work with pattern effects.
@@ -121,15 +121,15 @@
//To tell whether to calculate frequency.
bool m_CalculateFreq : 1;
- int32_t m_PortamentoFineSteps, m_PortamentoTickSlide;
+ int32 m_PortamentoFineSteps, m_PortamentoTickSlide;
- uint32_t m_Freq;
+ uint32 m_Freq;
float m_VibratoDepth;
//<----
//NOTE_PCs memory.
float m_plugParamValueStep, m_plugParamTargetValue;
- uint16_t m_RowPlugParam;
+ uint16 m_RowPlugParam;
PLUGINDEX m_RowPlug;
void ClearRowCmd() { rowCommand = ModCommand::Empty(); }
@@ -172,7 +172,7 @@
void Reset(ResetFlags resetMask, const CSoundFile &sndFile, CHANNELINDEX sourceChannel);
- typedef uint32_t volume_t;
+ typedef uint32 volume_t;
volume_t GetVSTVolume() { return (pModInstrument) ? pModInstrument->nGlobalVol * 4 : nVolume; }
// Check if the channel has a valid MIDI output. This function guarantees that pModInstrument != nullptr.
@@ -193,8 +193,8 @@
struct ModChannelSettings
{
FlagSet<ChannelFlags> dwFlags; // Channel flags
- uint16_t nPan; // Initial pan (0...256)
- uint16_t nVolume; // Initial channel volume (0...64)
+ uint16 nPan; // Initial pan (0...256)
+ uint16 nVolume; // Initial channel volume (0...64)
PLUGINDEX nMixPlugin; // Assigned plugin
char szName[MAX_CHANNELNAME]; // Channel name
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2015-03-11 20:27:52 UTC (rev 4875)
@@ -2279,20 +2279,20 @@
struct
{
RIFFChunk header;
- uint32_t numPoints;
+ uint32 numPoints;
WAVCuePoint cues[CountOf(sample.cues)];
} chunk;
chunk.header.id = RIFFChunk::idcue_;
chunk.header.length = 4 + sizeof(chunk.cues);
- for(uint32_t i = 0; i < CountOf(sample.cues); i++)
+ for(uint32 i = 0; i < CountOf(sample.cues); i++)
{
chunk.cues[i].ConvertToWAV(i, sample.cues[i]);
chunk.cues[i].ConvertEndianness();
}
- const uint32_t length = sizeof(RIFFChunk) + chunk.header.length;
+ const uint32 length = sizeof(RIFFChunk) + chunk.header.length;
chunk.header.ConvertEndianness();
FLAC__metadata_object_application_set_data(metadata[numBlocks], reinterpret_cast<FLAC__byte *>(&chunk), length, true);
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2015-03-11 20:27:52 UTC (rev 4875)
@@ -374,17 +374,17 @@
break;
}
{
- uint32_t tempo = CalculateXParam(memory.state.m_nPattern, memory.state.m_nRow, nChn);
+ uint32 tempo = CalculateXParam(memory.state.m_nPattern, memory.state.m_nRow, nChn);
if ((adjustMode & eAdjust) && (GetType() & (MOD_TYPE_S3M | MOD_TYPE_IT | MOD_TYPE_MPT)))
{
- if (tempo) pChn->nOldTempo = static_cast<uint8_t>(tempo); else tempo = pChn->nOldTempo;
+ if (tempo) pChn->nOldTempo = static_cast<uint8>(tempo); else tempo = pChn->nOldTempo;
}
if (tempo >= 0x20) memory.state.m_nMusicTempo = tempo;
else
{
// Tempo Slide
- uint32_t tempoDiff = (tempo & 0x0F) * (memory.state.m_nMusicSpeed - 1);
+ uint32 tempoDiff = (tempo & 0x0F) * (memory.state.m_nMusicSpeed - 1);
if ((tempo & 0xF0) == 0x10)
{
memory.state.m_nMusicTempo += tempoDiff;
@@ -560,7 +560,7 @@
case CMD_CHANNELVOLSLIDE:
{
if (param) pChn->nOldChnVolSlide = param; else param = pChn->nOldChnVolSlide;
- int32_t volume = pChn->nGlobalVol;
+ int32 volume = pChn->nGlobalVol;
if((param & 0x0F) == 0x0F && (param & 0xF0))
volume += (param >> 4); // Fine Up
else if((param & 0xF0) == 0xF0 && (param & 0x0F))
@@ -1554,7 +1554,7 @@
void CSoundFile::ApplyInstrumentPanning(ModChannel *pChn, const ModInstrument *instr, const ModSample *smp) const
//---------------------------------------------------------------------------------------------------------------
{
- int32_t newPan = int32_min;
+ int32 newPan = int32_min;
// Default instrument panning
if(instr != nullptr && instr->dwFlags[INS_SETPANNING])
newPan = instr->nPan;
@@ -1585,13 +1585,13 @@
if (!pChn->nFadeOutVol) return 0;
// All channels are used: check for lowest volume
CHANNELINDEX result = 0;
- uint32_t vol = 64*65536; // 25%
- uint32_t envpos = int32_max;
+ uint32 vol = 64*65536; // 25%
+ uint32 envpos = int32_max;
const ModChannel *pj = &m_PlayState.Chn[m_nChannels];
for (CHANNELINDEX j=m_nChannels; j<MAX_CHANNELS; j++, pj++)
{
if (!pj->nFadeOutVol) return j;
- uint32_t v = pj->nVolume;
+ uint32 v = pj->nVolume;
if(pj->dwFlags[CHN_NOTEFADE])
v = v * pj->nFadeOutVol;
else
@@ -3002,13 +3002,13 @@
// Calculate full parameter for effects that support parameter extension at the given pattern location.
// maxCommands sets the maximum number of XParam commands to look at for this effect
// isExtended returns if the command is actually using any XParam extensions.
-uint32_t CSoundFile::CalculateXParam(PATTERNINDEX pat, ROWINDEX row, CHANNELINDEX chn, bool *isExtended) const
+uint32 CSoundFile::CalculateXParam(PATTERNINDEX pat, ROWINDEX row, CHANNELINDEX chn, bool *isExtended) const
//------------------------------------------------------------------------------------------------------------
{
if(isExtended != nullptr) *isExtended = false;
ROWINDEX maxCommands = 4;
const ModCommand *m = Patterns[pat].GetpModCommand(row, chn);
- uint32_t val = m->param;
+ uint32 val = m->param;
switch(m->command)
{
@@ -3408,7 +3408,7 @@
if((!m_SongFlags[SONG_ITCOMPATGXX] && IsCompatibleMode(TRK_IMPULSETRACKER)) || GetType() == MOD_TYPE_PLM)
{
if(param == 0) param = pChn->nOldPortaUpDown;
- pChn->nOldPortaUpDown = static_cast<uint8_t>(param);
+ pChn->nOldPortaUpDown = static_cast<uint8>(param);
}
if(GetType() == MOD_TYPE_MPT && pChn->pModInstrument && pChn->pModInstrument->pTuning)
@@ -3428,7 +3428,7 @@
(pChn->nPortamentoDest < 0 && pChn->nPortamentoSlide > 0))
pChn->nPortamentoSlide = -pChn->nPortamentoSlide;
- pChn->m_PortamentoTickSlide = static_cast<int32_t>((m_PlayState.m_nTickCount + 1.0) * pChn->nPortamentoSlide / m_PlayState.m_nMusicSpeed);
+ pChn->m_PortamentoTickSlide = static_cast<int32>((m_PlayState.m_nTickCount + 1.0) * pChn->nPortamentoSlide / m_PlayState.m_nMusicSpeed);
if(pChn->dwFlags[CHN_GLISSANDO])
{
@@ -3821,7 +3821,7 @@
//------------------------------------------------------------------------------
{
ModChannel *pChn = &m_PlayState.Chn[nChn];
- uint8_t command = param & 0xF0;
+ uint8 command = param & 0xF0;
param &= 0x0F;
switch(command)
{
@@ -3894,7 +3894,7 @@
//------------------------------------------------------------------------------
{
ModChannel *pChn = &m_PlayState.Chn[nChn];
- uint8_t command = param & 0xF0;
+ uint8 command = param & 0xF0;
param &= 0x0F;
switch(command)
{
@@ -4038,7 +4038,7 @@
// SAx: Set 64k Offset
case 0xA0: if(m_SongFlags[SONG_FIRSTTICK])
{
- pChn->nOldHiOffset = static_cast<uint8_t>(param);
+ pChn->nOldHiOffset = static_cast<uint8>(param);
if (!IsCompatibleMode(TRK_IMPULSETRACKER) && pChn->rowCommand.IsNote())
{
SmpLength pos = param << 16;
@@ -4068,7 +4068,7 @@
case 0xF0:
if(GetType() != MOD_TYPE_S3M)
{
- pChn->nActiveMacro = static_cast<uint8_t>(param);
+ pChn->nActiveMacro = static_cast<uint8>(param);
}
break;
}
@@ -4747,7 +4747,7 @@
if(m_SongFlags[SONG_LINEARSLIDES] && GetType() != MOD_TYPE_XM)
{
// IT Linear slides
- const int32_t nOldPeriod = pChn->nPeriod;
+ const int32 nOldPeriod = pChn->nPeriod;
if (nFreqSlide < 0)
{
UINT n = (-nFreqSlide) / 4;
@@ -4955,7 +4955,7 @@
if(p->nPatternLoopCount) return ROWINDEX_INVALID;
}
}
- pChn->nPatternLoopCount = static_cast<uint8_t>(param);
+ pChn->nPatternLoopCount = static_cast<uint8>(param);
}
m_PlayState.m_nNextPatStartRow = pChn->nPatternLoop; // Nasty FT2 E60 bug emulation!
return pChn->nPatternLoop;
@@ -4968,10 +4968,10 @@
}
-void CSoundFile::GlobalVolSlide(ModCommand::PARAM param, uint8_t &nOldGlobalVolSlide)
+void CSoundFile::GlobalVolSlide(ModCommand::PARAM param, uint8 &nOldGlobalVolSlide)
//-----------------------------------------------------------------------------------
{
- int32_t nGlbSlide = 0;
+ int32 nGlbSlide = 0;
if (param) nOldGlobalVolSlide = param; else param = nOldGlobalVolSlide;
if((GetType() & (MOD_TYPE_XM | MOD_TYPE_MT2)))
@@ -5394,9 +5394,9 @@
const int tickParam = static_cast<int>((m_PlayState.m_nTickCount + 1.0) * param / m_PlayState.m_nMusicSpeed);
pChn->m_PortamentoFineSteps += (param >= 0) ? tickParam - pChn->nOldFinePortaUpDown : tickParam + pChn->nOldFinePortaUpDown;
if(m_PlayState.m_nTickCount + 1 == m_PlayState.m_nMusicSpeed)
- pChn->nOldFinePortaUpDown = static_cast<int8_t>(std::abs(param));
+ pChn->nOldFinePortaUpDown = static_cast<int8>(std::abs(param));
else
- pChn->nOldFinePortaUpDown = static_cast<int8_t>(std::abs(tickParam));
+ pChn->nOldFinePortaUpDown = static_cast<int8>(std::abs(tickParam));
pChn->m_CalculateFreq = true;
}
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2015-03-11 20:27:52 UTC (rev 4875)
@@ -1810,8 +1810,8 @@
// Get length of a tick in sample, with tick-to-tick tempo correction in modern tempo mode.
// This has to be called exactly once per tick because otherwise the error accumulation
// goes wrong.
-uint32_t CSoundFile::GetTickDuration(uint32_t tempo, uint32_t speed, ROWINDEX rowsPerBeat)
-//----------------------------------------------------------------------------------------
+uint32 CSoundFile::GetTickDuration(uint32 tempo, uint32 speed, ROWINDEX rowsPerBeat)
+//----------------------------------------------------------------------------------
{
UINT retval = 0;
switch(m_nTempoMode)
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2015-03-11 20:27:52 UTC (rev 4875)
@@ -646,7 +646,7 @@
void RecalculateSamplesPerTick();
double GetRowDuration(UINT tempo, UINT speed) const;
- uint32_t GetTickDuration(uint32_t tempo, uint32_t speed, ROWINDEX rowsPerBeat);
+ uint32 GetTickDuration(uint32 tempo, uint32 speed, ROWINDEX rowsPerBeat);
// A repeat count value of -1 means infinite loop
void SetRepeatCount(int n) { m_nRepeatCount = n; }
@@ -781,7 +781,7 @@
void NoteChange(ModChannel *pChn, int note, bool bPorta = false, bool bResetEnv = true, bool bManual = false) const;
void InstrumentChange(ModChannel *pChn, UINT instr, bool bPorta = false, bool bUpdVol = true, bool bResetEnv = true) const;
void ApplyInstrumentPanning(ModChannel *pChn, const ModInstrument *instr, const ModSample *smp) const;
- uint32_t CalculateXParam(PATTERNINDEX pat, ROWINDEX row, CHANNELINDEX chn, bool *isExtended = nullptr) const;
+ uint32 CalculateXParam(PATTERNINDEX pat, ROWINDEX row, CHANNELINDEX chn, bool *isExtended = nullptr) const;
// Channel Effects
void KeyOff(ModChannel *pChn) const;
@@ -850,7 +850,7 @@
void ExtendedChannelEffect(ModChannel *, UINT param);
void InvertLoop(ModChannel* pChn);
ROWINDEX PatternBreak(PlayState &state, CHANNELINDEX chn, uint8 param) const;
- void GlobalVolSlide(ModCommand::PARAM param, uint8_t &nOldGlobalVolSlide);
+ void GlobalVolSlide(ModCommand::PARAM param, uint8 &nOldGlobalVolSlide);
void ProcessMacroOnChannel(CHANNELINDEX nChn);
void ProcessMIDIMacro(CHANNELINDEX nChn, bool isSmooth, char *macro, uint8 param = 0, PLUGINDEX plugin = 0);
Modified: trunk/OpenMPT/soundlib/WAVTools.cpp
===================================================================
--- trunk/OpenMPT/soundlib/WAVTools.cpp 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/soundlib/WAVTools.cpp 2015-03-11 20:27:52 UTC (rev 4875)
@@ -187,9 +187,9 @@
// Read cue points
if(cueChunk.IsValid())
{
- uint32_t numPoints = cueChunk.ReadUint32LE();
+ uint32 numPoints = cueChunk.ReadUint32LE();
LimitMax(numPoints, CountOf(sample.cues));
- for(uint32_t i = 0; i < numPoints; i++)
+ for(uint32 i = 0; i < numPoints; i++)
{
WAVCuePoint cuePoint;
cueChunk.ReadConvertEndianness(cuePoint);
@@ -559,10 +559,10 @@
{
StartChunk(RIFFChunk::idcue_);
{
- const uint32_t numPoints = SwapBytesLE_(CountOf(sample.cues));
+ const uint32 numPoints = SwapBytesLE_(CountOf(sample.cues));
Write(numPoints);
}
- for(uint32_t i = 0; i < CountOf(sample.cues); i++)
+ for(uint32 i = 0; i < CountOf(sample.cues); i++)
{
WAVCuePoint cuePoint;
cuePoint.ConvertToWAV(i, sample.cues[i]);
Modified: trunk/OpenMPT/soundlib/WAVTools.h
===================================================================
--- trunk/OpenMPT/soundlib/WAVTools.h 2015-03-11 16:59:34 UTC (rev 4874)
+++ trunk/OpenMPT/soundlib/WAVTools.h 2015-03-11 20:27:52 UTC (rev 4875)
@@ -327,7 +327,7 @@
}
// Set up sample information
- void ConvertToWAV(uint32_t id_, SmpLength offset_)
+ void ConvertToWAV(uint32 id_, SmpLength offset_)
{
id = id_;
position = offset_;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
