Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3839] trunk/OpenMPT
|
From: <man...@us...> - 2014-03-07 12:22:53
|
Revision: 3839
http://sourceforge.net/p/modplug/code/3839
Author: manxorist
Date: 2014-03-07 12:22:43 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
[Ref] Kill win32 TRUE, FALSE and BOOL and replace them with c++ true, false and bool in soundlib/ and sounddsp/ .
Modified Paths:
--------------
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/sounddsp/AGC.cpp
trunk/OpenMPT/sounddsp/DSP.cpp
trunk/OpenMPT/sounddsp/DSP.h
trunk/OpenMPT/sounddsp/EQ.cpp
trunk/OpenMPT/sounddsp/EQ.h
trunk/OpenMPT/soundlib/Dlsbank.cpp
trunk/OpenMPT/soundlib/Dlsbank.h
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_itp.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Sndmix.cpp
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/common/typedefs.h 2014-03-07 12:22:43 UTC (rev 3839)
@@ -406,7 +406,6 @@
// openmpt assumes these type have exact WIN32 semantics
-typedef std::int32_t BOOL;
typedef std::uint8_t BYTE;
typedef std::uint16_t WORD;
typedef std::uint32_t DWORD;
@@ -415,10 +414,6 @@
typedef std::uint32_t UINT;
typedef BYTE * LPBYTE;
-// for BOOL
-#define TRUE (1)
-#define FALSE (0)
-
#endif // !WIN32
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -1456,7 +1456,7 @@
#ifndef NO_EQ
CriticalSection cs;
if(CMainFrame::GetMainFrame()->GetSoundFilePlaying())
- CMainFrame::GetMainFrame()->GetSoundFilePlaying()->SetEQGains( m_pEqPreset->Gains, MAX_EQ_BANDS, m_pEqPreset->Freqs, bReset);
+ CMainFrame::GetMainFrame()->GetSoundFilePlaying()->SetEQGains( m_pEqPreset->Gains, MAX_EQ_BANDS, m_pEqPreset->Freqs, bReset?true:false);
#endif
}
Modified: trunk/OpenMPT/sounddsp/AGC.cpp
===================================================================
--- trunk/OpenMPT/sounddsp/AGC.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/sounddsp/AGC.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -85,7 +85,7 @@
CAGC::CAGC()
//----------
{
- Initialize(TRUE, 44100);
+ Initialize(true, 44100);
}
Modified: trunk/OpenMPT/sounddsp/DSP.cpp
===================================================================
--- trunk/OpenMPT/sounddsp/DSP.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/sounddsp/DSP.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -31,10 +31,10 @@
// DSP Effects internal state
-extern VOID X86_InitMixBuffer(int *pBuffer, UINT nSamples);
+extern void X86_InitMixBuffer(int *pBuffer, UINT nSamples);
-static VOID X86_StereoDCRemoval(int *, UINT count, LONG *nDCRFlt_Y1l, LONG *nDCRFlt_X1l, LONG *nDCRFlt_Y1r, LONG *nDCRFlt_X1r);
-static VOID X86_MonoDCRemoval(int *, UINT count, LONG *nDCRFlt_Y1l, LONG *nDCRFlt_X1l);
+static void X86_StereoDCRemoval(int *, UINT count, LONG *nDCRFlt_Y1l, LONG *nDCRFlt_X1l, LONG *nDCRFlt_Y1r, LONG *nDCRFlt_X1r);
+static void X86_MonoDCRemoval(int *, UINT count, LONG *nDCRFlt_Y1l, LONG *nDCRFlt_X1l);
///////////////////////////////////////////////////////////////////////////////////
//
@@ -44,7 +44,7 @@
#define PI 3.14159265358979323f
static inline float Sgn(float x) { return (x >= 0) ? 1.0f : -1.0f; }
-static VOID ShelfEQ(LONG scale,
+static void ShelfEQ(LONG scale,
LONG *outA1, LONG *outB0, LONG *outB1,
LONG F_c, LONG F_s, float gainDC, float gainFT, float gainPI)
{
@@ -390,7 +390,7 @@
#define DCR_AMOUNT 9
-static VOID X86_StereoDCRemoval(int *pBuffer, UINT nSamples, LONG *nDCRFlt_Y1l, LONG *nDCRFlt_X1l, LONG *nDCRFlt_Y1r, LONG *nDCRFlt_X1r)
+static void X86_StereoDCRemoval(int *pBuffer, UINT nSamples, LONG *nDCRFlt_Y1l, LONG *nDCRFlt_X1l, LONG *nDCRFlt_Y1r, LONG *nDCRFlt_X1r)
{
int y1l=*nDCRFlt_Y1l, x1l=*nDCRFlt_X1l;
int y1r=*nDCRFlt_Y1r, x1r=*nDCRFlt_X1r;
@@ -436,7 +436,7 @@
}
-static VOID X86_MonoDCRemoval(int *pBuffer, UINT nSamples, LONG *nDCRFlt_Y1l, LONG *nDCRFlt_X1l)
+static void X86_MonoDCRemoval(int *pBuffer, UINT nSamples, LONG *nDCRFlt_Y1l, LONG *nDCRFlt_X1l)
{
int y1l=*nDCRFlt_Y1l, x1l=*nDCRFlt_X1l;
_asm {
@@ -476,7 +476,7 @@
// Clean DSP Effects interface
// [XBass level 0(quiet)-100(loud)], [cutoff in Hz 20-100]
-BOOL CDSP::SetXBassParameters(UINT nDepth, UINT nRange)
+bool CDSP::SetXBassParameters(UINT nDepth, UINT nRange)
//-----------------------------------------------------
{
if (nDepth > 100) nDepth = 100;
@@ -487,12 +487,12 @@
if (range > 5) range -= 5; else range = 0;
if (nRange > 16) nRange = 16;
m_Settings.m_nXBassRange = 21 - range; // filter average on 0.5-1.6ms
- return TRUE;
+ return true;
}
// [Surround level 0(quiet)-100(heavy)] [delay in ms, usually 5-50ms]
-BOOL CDSP::SetSurroundParameters(UINT nDepth, UINT nDelay)
+bool CDSP::SetSurroundParameters(UINT nDepth, UINT nDelay)
//--------------------------------------------------------
{
UINT gain = (nDepth * 16) / 100;
@@ -502,7 +502,7 @@
if (nDelay < 4) nDelay = 4;
if (nDelay > 50) nDelay = 50;
m_Settings.m_nProLogicDelay = nDelay;
- return TRUE;
+ return true;
}
Modified: trunk/OpenMPT/sounddsp/DSP.h
===================================================================
--- trunk/OpenMPT/sounddsp/DSP.h 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/sounddsp/DSP.h 2014-03-07 12:22:43 UTC (rev 3839)
@@ -80,9 +80,9 @@
public:
void SetSettings(const CDSPSettings &settings) { m_Settings = settings; }
// [XBass level 0(quiet)-100(loud)], [cutoff in Hz 10-100]
- BOOL SetXBassParameters(UINT nDepth, UINT nRange);
+ bool SetXBassParameters(UINT nDepth, UINT nRange);
// [Surround level 0(quiet)-100(heavy)] [delay in ms, usually 5-40ms]
- BOOL SetSurroundParameters(UINT nDepth, UINT nDelay);
+ bool SetSurroundParameters(UINT nDepth, UINT nDelay);
void Initialize(bool bReset, DWORD MixingFreq, DWORD DSPMask);
void Process(int * MixSoundBuffer, int * MixRearBuffer, int count, UINT nChannels, DWORD DSPMask);
private:
Modified: trunk/OpenMPT/sounddsp/EQ.cpp
===================================================================
--- trunk/OpenMPT/sounddsp/EQ.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/sounddsp/EQ.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -479,7 +479,7 @@
}
-void CEQ::SetEQGains(const UINT *pGains, UINT nGains, const UINT *pFreqs, BOOL bReset, DWORD MixingFreq)
+void CEQ::SetEQGains(const UINT *pGains, UINT nGains, const UINT *pFreqs, bool bReset, DWORD MixingFreq)
//------------------------------------------------------------------------------------------------------
{
for (UINT i=0; i<MAX_EQ_BANDS; i++)
@@ -509,7 +509,7 @@
gEQ[i+MAX_EQ_BANDS].bEnable = false;
}
}
- Initialize(bReset?true:false, MixingFreq);
+ Initialize(bReset, MixingFreq);
}
@@ -520,7 +520,7 @@
rear.Initialize(bReset, MixingFreq);
}
-void CQuadEQ::SetEQGains(const UINT *pGains, UINT nGains, const UINT *pFreqs, BOOL bReset, DWORD MixingFreq)
+void CQuadEQ::SetEQGains(const UINT *pGains, UINT nGains, const UINT *pFreqs, bool bReset, DWORD MixingFreq)
//----------------------------------------------------------------------------------------------------------
{
front.SetEQGains(pGains, nGains, pFreqs, bReset, MixingFreq);
Modified: trunk/OpenMPT/sounddsp/EQ.h
===================================================================
--- trunk/OpenMPT/sounddsp/EQ.h 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/sounddsp/EQ.h 2014-03-07 12:22:43 UTC (rev 3839)
@@ -42,7 +42,7 @@
void Initialize(bool bReset, DWORD MixingFreq);
void ProcessStereo(int *pbuffer, float *MixFloatBuffer, UINT nCount);
void ProcessMono(int *pbuffer, float *MixFloatBuffer, UINT nCount);
- void SetEQGains(const UINT *pGains, UINT nGains, const UINT *pFreqs, BOOL bReset, DWORD MixingFreq);
+ void SetEQGains(const UINT *pGains, UINT nGains, const UINT *pFreqs, bool bReset, DWORD MixingFreq);
};
@@ -57,6 +57,6 @@
public:
void Initialize(bool bReset, DWORD MixingFreq);
void Process(int *frontBuffer, int *rearBuffer, UINT nCount, UINT nChannels);
- void SetEQGains(const UINT *pGains, UINT nGains, const UINT *pFreqs, BOOL bReset, DWORD MixingFreq);
+ void SetEQGains(const UINT *pGains, UINT nGains, const UINT *pFreqs, bool bReset, DWORD MixingFreq);
};
Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -500,13 +500,13 @@
}
-BOOL CDLSBank::IsDLSBank(const mpt::PathString &filename)
+bool CDLSBank::IsDLSBank(const mpt::PathString &filename)
//-------------------------------------------------------
{
RIFFCHUNKID riff;
FILE *f;
- if(filename.empty()) return FALSE;
- if((f = mpt_fopen(filename, "rb")) == NULL) return FALSE;
+ if(filename.empty()) return false;
+ if((f = mpt_fopen(filename, "rb")) == NULL) return false;
MemsetZero(riff);
fread(&riff, sizeof(RIFFCHUNKID), 1, f);
// Check for embedded DLS sections
@@ -544,7 +544,7 @@
///////////////////////////////////////////////////////////////
// Find an instrument based on the given parameters
-DLSINSTRUMENT *CDLSBank::FindInstrument(BOOL bDrum, UINT nBank, DWORD dwProgram, DWORD dwKey, UINT *pInsNo)
+DLSINSTRUMENT *CDLSBank::FindInstrument(bool bDrum, UINT nBank, DWORD dwProgram, DWORD dwKey, UINT *pInsNo)
//---------------------------------------------------------------------------------------------------------
{
if ((!m_pInstruments) || (!m_nInstruments)) return NULL;
@@ -592,11 +592,11 @@
///////////////////////////////////////////////////////////////
// Update DLS instrument definition from an IFF chunk
-BOOL CDLSBank::UpdateInstrumentDefinition(DLSINSTRUMENT *pDlsIns, void *pvchunk, DWORD dwMaxLen)
+bool CDLSBank::UpdateInstrumentDefinition(DLSINSTRUMENT *pDlsIns, void *pvchunk, DWORD dwMaxLen)
//----------------------------------------------------------------------------------------------
{
IFFCHUNK *pchunk = (IFFCHUNK *)pvchunk;
- if ((!pchunk->len) || (pchunk->len+8 > dwMaxLen)) return FALSE;
+ if ((!pchunk->len) || (pchunk->len+8 > dwMaxLen)) return false;
if (pchunk->id == IFFID_LIST)
{
LISTCHUNK *plist = (LISTCHUNK *)pchunk;
@@ -799,18 +799,18 @@
#endif
}
}
- return TRUE;
+ return true;
}
///////////////////////////////////////////////////////////////
// Converts SF2 chunks to DLS
-BOOL CDLSBank::UpdateSF2PresetData(void *pvsf2, void *pvchunk, DWORD dwMaxLen)
+bool CDLSBank::UpdateSF2PresetData(void *pvsf2, void *pvchunk, DWORD dwMaxLen)
//----------------------------------------------------------------------------
{
SF2LOADERINFO *psf2 = (SF2LOADERINFO *)pvsf2;
IFFCHUNK *pchunk = (IFFCHUNK *)pvchunk;
- if ((!pchunk->len) || (pchunk->len+8 > dwMaxLen)) return FALSE;
+ if ((!pchunk->len) || (pchunk->len+8 > dwMaxLen)) return false;
switch(pchunk->id)
{
case IFFID_phdr:
@@ -951,18 +951,18 @@
}
#endif
}
- return TRUE;
+ return true;
}
// Convert all instruments to the DLS format
-BOOL CDLSBank::ConvertSF2ToDLS(void *pvsf2info)
+bool CDLSBank::ConvertSF2ToDLS(void *pvsf2info)
//---------------------------------------------
{
SF2LOADERINFO *psf2;
DLSINSTRUMENT *pDlsIns;
- if ((!m_pInstruments) || (!m_pSamplesEx)) return FALSE;
+ if ((!m_pInstruments) || (!m_pSamplesEx)) return false;
psf2 = (SF2LOADERINFO *)pvsf2info;
pDlsIns = m_pInstruments;
for (UINT nIns=0; nIns<m_nInstruments; nIns++, pDlsIns++)
@@ -1131,14 +1131,14 @@
//Log("\n");
}
}
- return TRUE;
+ return true;
}
///////////////////////////////////////////////////////////////
// Open: opens a DLS bank
-BOOL CDLSBank::Open(const mpt::PathString &filename)
+bool CDLSBank::Open(const mpt::PathString &filename)
//--------------------------------------------------
{
SF2LOADERINFO sf2info;
@@ -1147,17 +1147,17 @@
DWORD dwMemPos, dwMemLength;
UINT nInsDef;
- if(filename.empty()) return FALSE;
+ if(filename.empty()) return false;
m_szFileName = filename;
lpMemFile = NULL;
// Memory-Mapped file
CMappedFile MapFile;
- if (!MapFile.Open(filename)) return FALSE;
+ if (!MapFile.Open(filename)) return false;
dwMemLength = MapFile.GetLength();
if (dwMemLength >= 256) lpMemFile = (const BYTE *)MapFile.Lock();
if (!lpMemFile)
{
- return FALSE;
+ return false;
}
#ifdef DLSBANK_LOG
@@ -1202,7 +1202,7 @@
#ifdef DLSBANK_LOG
Log("Invalid DLS bank!\n");
#endif
- return FALSE;
+ return false;
}
memset(&sf2info, 0, sizeof(sf2info));
m_nType = (priff->id_DLS == IFFID_sfbk) ? SOUNDBANK_TYPE_SF2 : SOUNDBANK_TYPE_DLS;
@@ -1380,7 +1380,7 @@
#ifdef DLSBANK_LOG
Log("DLS bank closed\n");
#endif
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////////////
@@ -1404,22 +1404,22 @@
}
-BOOL CDLSBank::FreeWaveForm(LPBYTE p)
+bool CDLSBank::FreeWaveForm(LPBYTE p)
//-----------------------------------
{
if (p) free(p);
- return TRUE;
+ return true;
}
-BOOL CDLSBank::ExtractWaveForm(UINT nIns, UINT nRgn, LPBYTE *ppWave, DWORD *pLen)
+bool CDLSBank::ExtractWaveForm(UINT nIns, UINT nRgn, LPBYTE *ppWave, DWORD *pLen)
//-------------------------------------------------------------------------------
{
DLSINSTRUMENT *pDlsIns;
DWORD dwOffset;
UINT nWaveLink;
FILE *f;
- BOOL bOk = FALSE;
+ bool bOk = false;
if ((!ppWave) || (!pLen) || (!m_pInstruments) || (nIns >= m_nInstruments)
|| (!m_dwWavePoolOffset) || (!m_pWaveForms))
@@ -1427,7 +1427,7 @@
#ifdef DLSBANK_LOG
Log("ExtractWaveForm(%d) failed: m_nInstruments=%d m_dwWavePoolOffset=%d m_pWaveForms=0x%08X\n", nIns, m_nInstruments, m_dwWavePoolOffset, m_pWaveForms);
#endif
- return FALSE;
+ return false;
}
*ppWave = NULL;
*pLen = 0;
@@ -1437,7 +1437,7 @@
#ifdef DLSBANK_LOG
Log("invalid waveform region: nIns=%d nRgn=%d pSmp->nRegions=%d\n", nIns, nRgn, pSmp->nRegions);
#endif
- return FALSE;
+ return false;
}
nWaveLink = pDlsIns->Regions[nRgn].nWaveLink;
if (nWaveLink >= m_nWaveForms)
@@ -1445,10 +1445,10 @@
#ifdef DLSBANK_LOG
Log("Invalid wavelink id: nWaveLink=%d nWaveForms=%d\n", nWaveLink, m_nWaveForms);
#endif
- return FALSE;
+ return false;
}
dwOffset = m_pWaveForms[nWaveLink] + m_dwWavePoolOffset;
- if((f = mpt_fopen(m_szFileName, "rb")) == NULL) return FALSE;
+ if((f = mpt_fopen(m_szFileName, "rb")) == NULL) return false;
if (fseek(f, dwOffset, SEEK_SET) == 0)
{
if (m_nType & SOUNDBANK_TYPE_SF2)
@@ -1460,7 +1460,7 @@
*pLen = m_pSamplesEx[nWaveLink].dwLen;
*ppWave = (LPBYTE)calloc(1, *pLen + 8);
fread((*ppWave), 1, *pLen, f);
- bOk = TRUE;
+ bOk = true;
}
}
} else
@@ -1476,7 +1476,7 @@
{
memcpy((*ppWave), &chunk, 12);
fread((*ppWave)+12, 1, *pLen-12, f);
- bOk = TRUE;
+ bOk = true;
}
}
}
@@ -1517,20 +1517,20 @@
}
-BOOL CDLSBank::ExtractSample(CSoundFile &sndFile, SAMPLEINDEX nSample, UINT nIns, UINT nRgn, int transpose)
+bool CDLSBank::ExtractSample(CSoundFile &sndFile, SAMPLEINDEX nSample, UINT nIns, UINT nRgn, int transpose)
//---------------------------------------------------------------------------------------------------------
{
DLSINSTRUMENT *pDlsIns;
LPBYTE pWaveForm = NULL;
DWORD dwLen = 0;
- BOOL bOk, bWaveForm;
+ bool bOk, bWaveForm;
- if ((!m_pInstruments) || (nIns >= m_nInstruments)) return FALSE;
+ if ((!m_pInstruments) || (nIns >= m_nInstruments)) return false;
pDlsIns = &m_pInstruments[nIns];
- if (nRgn >= pDlsIns->nRegions) return FALSE;
- if (!ExtractWaveForm(nIns, nRgn, &pWaveForm, &dwLen)) return FALSE;
- if ((!pWaveForm) || (dwLen < 16)) return FALSE;
- bOk = FALSE;
+ if (nRgn >= pDlsIns->nRegions) return false;
+ if (!ExtractWaveForm(nIns, nRgn, &pWaveForm, &dwLen)) return false;
+ if ((!pWaveForm) || (dwLen < 16)) return false;
+ bOk = false;
FileReader wsmpChunk;
if (m_nType & SOUNDBANK_TYPE_SF2)
@@ -1561,7 +1561,7 @@
SampleIO::signedPCM)
.ReadSample(sample, chunk);
}
- bWaveForm = (sample.pSample) ? TRUE : FALSE;
+ bWaveForm = (sample.pSample) ? true : false;
} else
{
FileReader file(pWaveForm, dwLen);
@@ -1654,14 +1654,14 @@
if (pDlsIns->szName[0]) memcpy(sndFile.m_szNames[nSample], pDlsIns->szName, MAX_SAMPLENAME - 1);
sample.Convert(MOD_TYPE_IT, sndFile.GetType());
sample.PrecomputeLoops(sndFile, false);
- bOk = TRUE;
+ bOk = true;
}
FreeWaveForm(pWaveForm);
return bOk;
}
-BOOL CDLSBank::ExtractInstrument(CSoundFile &sndFile, INSTRUMENTINDEX nInstr, UINT nIns, UINT nDrumRgn)
+bool CDLSBank::ExtractInstrument(CSoundFile &sndFile, INSTRUMENTINDEX nInstr, UINT nIns, UINT nDrumRgn)
//-----------------------------------------------------------------------------------------------------
{
BYTE RgnToSmp[DLSMAXREGIONS];
@@ -1670,17 +1670,17 @@
UINT nRgnMin, nRgnMax, nEnv;
SAMPLEINDEX nSample;
- if ((!m_pInstruments) || (nIns >= m_nInstruments)) return FALSE;
+ if ((!m_pInstruments) || (nIns >= m_nInstruments)) return false;
pDlsIns = &m_pInstruments[nIns];
if (pDlsIns->ulBank & F_INSTRUMENT_DRUMS)
{
- if (nDrumRgn >= pDlsIns->nRegions) return FALSE;
+ if (nDrumRgn >= pDlsIns->nRegions) return false;
nRgnMin = nDrumRgn;
nRgnMax = nDrumRgn+1;
nEnv = pDlsIns->Regions[nDrumRgn].uPercEnv;
} else
{
- if (!pDlsIns->nRegions) return FALSE;
+ if (!pDlsIns->nRegions) return false;
nRgnMin = 0;
nRgnMax = pDlsIns->nRegions;
nEnv = pDlsIns->nMelodicEnv;
@@ -1703,7 +1703,7 @@
pIns = new (std::nothrow) ModInstrument();
if(pIns == nullptr)
{
- return FALSE;
+ return false;
}
if (sndFile.Instruments[nInstr])
@@ -1764,12 +1764,12 @@
// Extract Samples
for (UINT nRgn=nRgnMin; nRgn<nRgnMax; nRgn++)
{
- BOOL bDupRgn;
+ bool bDupRgn;
UINT nSmp;
DLSREGION *pRgn = &pDlsIns->Regions[nRgn];
// Elimitate Duplicate Regions
nSmp = 0;
- bDupRgn = FALSE;
+ bDupRgn = false;
for (UINT iDup=nRgnMin; iDup<nRgn; iDup++)
{
DLSREGION *pRgn2 = &pDlsIns->Regions[iDup];
@@ -1779,7 +1779,7 @@
|| ((pRgn2->uKeyMin == pRgn->uKeyMin)
&& (pRgn2->uKeyMax == pRgn->uKeyMax)))
{
- bDupRgn = TRUE;
+ bDupRgn = true;
nSmp = RgnToSmp[iDup];
break;
}
@@ -1951,7 +1951,7 @@
pIns->VolEnv.nNodes = 4;
}
}
- return TRUE;
+ return true;
}
Modified: trunk/OpenMPT/soundlib/Dlsbank.h
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.h 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/soundlib/Dlsbank.h 2014-03-07 12:22:43 UTC (rev 3839)
@@ -129,12 +129,12 @@
CDLSBank();
virtual ~CDLSBank();
void Destroy();
- static BOOL IsDLSBank(const mpt::PathString &filename);
+ static bool IsDLSBank(const mpt::PathString &filename);
static DWORD MakeMelodicCode(UINT bank, UINT instr) { return ((bank << 16) | (instr));}
static DWORD MakeDrumCode(UINT rgn, UINT instr) { return (0x80000000 | (rgn << 16) | (instr));}
public:
- BOOL Open(const mpt::PathString &filename);
+ bool Open(const mpt::PathString &filename);
mpt::PathString GetFileName() const { return m_szFileName; }
UINT GetBankType() const { return m_nType; }
UINT GetBankInfo(SOUNDBANKINFO *pBankInfo=NULL) const { if (pBankInfo) *pBankInfo = m_BankInfo; return m_nType; }
@@ -143,19 +143,19 @@
UINT GetNumInstruments() const { return m_nInstruments; }
UINT GetNumSamples() const { return m_nWaveForms; }
DLSINSTRUMENT *GetInstrument(UINT iIns) { return (m_pInstruments) ? &m_pInstruments[iIns] : NULL; }
- DLSINSTRUMENT *FindInstrument(BOOL bDrum, UINT nBank=0xFF, DWORD dwProgram=0xFF, DWORD dwKey=0xFF, UINT *pInsNo=NULL);
+ DLSINSTRUMENT *FindInstrument(bool bDrum, UINT nBank=0xFF, DWORD dwProgram=0xFF, DWORD dwKey=0xFF, UINT *pInsNo=NULL);
UINT GetRegionFromKey(UINT nIns, UINT nKey);
- BOOL FreeWaveForm(LPBYTE p);
- BOOL ExtractWaveForm(UINT nIns, UINT nRgn, LPBYTE *ppWave, DWORD *pLen);
- BOOL ExtractSample(CSoundFile &sndFile, SAMPLEINDEX nSample, UINT nIns, UINT nRgn, int transpose=0);
- BOOL ExtractInstrument(CSoundFile &sndFile, INSTRUMENTINDEX nInstr, UINT nIns, UINT nDrumRgn);
+ bool FreeWaveForm(LPBYTE p);
+ bool ExtractWaveForm(UINT nIns, UINT nRgn, LPBYTE *ppWave, DWORD *pLen);
+ bool ExtractSample(CSoundFile &sndFile, SAMPLEINDEX nSample, UINT nIns, UINT nRgn, int transpose=0);
+ bool ExtractInstrument(CSoundFile &sndFile, INSTRUMENTINDEX nInstr, UINT nIns, UINT nDrumRgn);
const CHAR *GetRegionName(UINT nIns, UINT nRgn) const;
// Internal Loader Functions
protected:
- BOOL UpdateInstrumentDefinition(DLSINSTRUMENT *pDlsIns, void *pchunk, DWORD dwMaxLen);
- BOOL UpdateSF2PresetData(void *psf2info, void *pchunk, DWORD dwMaxLen);
- BOOL ConvertSF2ToDLS(void *psf2info);
+ bool UpdateInstrumentDefinition(DLSINSTRUMENT *pDlsIns, void *pchunk, DWORD dwMaxLen);
+ bool UpdateSF2PresetData(void *psf2info, void *pchunk, DWORD dwMaxLen);
+ bool ConvertSF2ToDLS(void *psf2info);
public:
// DLS Unit conversion
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -1251,7 +1251,7 @@
// Mix Plugins. Just calculate the size of this extra block for now.
if(!compatibilityExport)
{
- dwExtra += SaveMixPlugins(NULL, TRUE);
+ dwExtra += SaveMixPlugins(NULL, true);
}
// Edit History. Just calculate the size of this extra block for now.
@@ -1321,7 +1321,7 @@
// Writing mix plugins info
if(!compatibilityExport)
{
- SaveMixPlugins(f, FALSE);
+ SaveMixPlugins(f, false);
}
// Writing song message
@@ -1687,7 +1687,7 @@
#ifndef MODPLUG_NO_FILESAVE
-UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate)
+UINT CSoundFile::SaveMixPlugins(FILE *f, bool bUpdate)
//----------------------------------------------------
{
uint32 chinfo[MAX_BASECHANNELS];
Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -397,11 +397,11 @@
// Song mix plugins
// mix plugins data length
- id = SaveMixPlugins(NULL, TRUE);
+ id = SaveMixPlugins(NULL, true);
fwrite(&id, 1, sizeof(id), f);
// mix plugins data
- SaveMixPlugins(f, FALSE);
+ SaveMixPlugins(f, false);
// Song midi config
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -1765,7 +1765,7 @@
}
-BOOL CSoundFile::ProcessEffects()
+bool CSoundFile::ProcessEffects()
//-------------------------------
{
ModChannel *pChn = m_PlayState.Chn;
@@ -1776,7 +1776,7 @@
// ScreamTracker 2 only updates effects on every 16th tick.
if((m_PlayState.m_nTickCount & 0x0F) != 0 && GetType() == MOD_TYPE_STM)
{
- return TRUE;
+ return true;
}
// -> CODE#0010
@@ -2889,7 +2889,7 @@
}
}
- return TRUE;
+ return true;
}
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -704,12 +704,12 @@
#ifdef MODPLUG_TRACKER
-BOOL CSoundFile::Create(FileReader file, ModLoadingFlags loadFlags, CModDoc *pModDoc)
+bool CSoundFile::Create(FileReader file, ModLoadingFlags loadFlags, CModDoc *pModDoc)
//-----------------------------------------------------------------------------------
{
m_pModDoc = pModDoc;
#else
-BOOL CSoundFile::Create(FileReader file, ModLoadingFlags loadFlags)
+bool CSoundFile::Create(FileReader file, ModLoadingFlags loadFlags)
//-----------------------------------------------------------------
{
#endif // MODPLUG_TRACKER
@@ -973,14 +973,14 @@
const ORDERINDEX nMinLength = std::min(CacheSize, GetModSpecifications().ordersMax);
if (Order.GetLength() < nMinLength)
Order.resize(nMinLength);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-BOOL CSoundFile::Destroy()
+bool CSoundFile::Destroy()
//------------------------
{
for(CHANNELINDEX i = 0; i < MAX_CHANNELS; i++)
@@ -1016,7 +1016,7 @@
m_nType = MOD_TYPE_NONE;
m_ContainerType = MOD_CONTAINERTYPE_NONE;
m_nChannels = m_nSamples = m_nInstruments = 0;
- return TRUE;
+ return true;
}
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2014-03-07 12:22:43 UTC (rev 3839)
@@ -546,12 +546,12 @@
// Get parent CModDoc. Can be nullptr if previewing from tree view, and is always nullptr if we're not actually compiling OpenMPT.
CModDoc *GetpModDoc() const { return m_pModDoc; }
- BOOL Create(FileReader file, ModLoadingFlags loadFlags = loadCompleteModule, CModDoc *pModDoc = nullptr);
+ bool Create(FileReader file, ModLoadingFlags loadFlags = loadCompleteModule, CModDoc *pModDoc = nullptr);
#else
- BOOL Create(FileReader file, ModLoadingFlags loadFlags);
+ bool Create(FileReader file, ModLoadingFlags loadFlags);
#endif // MODPLUG_TRACKER
- BOOL Destroy();
+ bool Destroy();
MODTYPE GetType() const { return m_nType; }
bool TypeIsIT_MPT() const { return (m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) != 0; }
bool TypeIsIT_MPT_XM() const { return (m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_XM)) != 0; }
@@ -678,7 +678,7 @@
bool SaveMod(const mpt::PathString &filename) const;
bool SaveIT(const mpt::PathString &filename, bool compatibilityExport = false);
bool SaveITProject(const mpt::PathString &filename); // -> CODE#0023 -> DESC="IT project files (.itp)" -! NEW_FEATURE#0023
- UINT SaveMixPlugins(FILE *f=NULL, BOOL bUpdate=TRUE);
+ UINT SaveMixPlugins(FILE *f=NULL, bool bUpdate=true);
void WriteInstrumentPropertyForAllInstruments(uint32 code, int16 size, FILE* f, UINT nInstruments) const;
void SaveExtendedInstrumentProperties(UINT nInstruments, FILE* f) const;
void SaveExtendedSongProperties(FILE* f) const;
@@ -715,7 +715,7 @@
private:
void CreateStereoMix(int count);
public:
- BOOL FadeSong(UINT msec);
+ bool FadeSong(UINT msec);
private:
void ProcessDSP(std::size_t countChunk);
void ProcessPlugins(UINT nCount);
@@ -734,12 +734,12 @@
void SetDspEffects(DWORD DSPMask);
DWORD GetSampleRate() { return m_MixerSettings.gdwMixingFreq; }
#ifndef NO_EQ
- void SetEQGains(const UINT *pGains, UINT nBands, const UINT *pFreqs=NULL, BOOL bReset=FALSE) { m_EQ.SetEQGains(pGains, nBands, pFreqs, bReset, m_MixerSettings.gdwMixingFreq); } // 0=-12dB, 32=+12dB
+ void SetEQGains(const UINT *pGains, UINT nBands, const UINT *pFreqs=NULL, bool bReset=false) { m_EQ.SetEQGains(pGains, nBands, pFreqs, bReset, m_MixerSettings.gdwMixingFreq); } // 0=-12dB, 32=+12dB
#endif // NO_EQ
public:
- BOOL ReadNote();
- BOOL ProcessRow();
- BOOL ProcessEffects();
+ bool ReadNote();
+ bool ProcessRow();
+ bool ProcessEffects();
CHANNELINDEX GetNNAChannel(CHANNELINDEX nChn) const;
void CheckNNA(CHANNELINDEX nChn, UINT instr, int note, bool forceCut);
void NoteChange(ModChannel *pChn, int note, bool bPorta = false, bool bResetEnv = true, bool bManual = false) const;
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2014-03-07 11:54:51 UTC (rev 3838)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2014-03-07 12:22:43 UTC (rev 3839)
@@ -116,11 +116,11 @@
}
-BOOL CSoundFile::FadeSong(UINT msec)
+bool CSoundFile::FadeSong(UINT msec)
//----------------------------------
{
samplecount_t nsamples = Util::muldiv(msec, m_MixerSettings.gdwMixingFreq, 1000);
- if (nsamples <= 0) return FALSE;
+ if (nsamples <= 0) return false;
if (nsamples > 0x100000) nsamples = 0x100000;
m_PlayState.m_nBufferCount = nsamples;
int32 nRampLength = static_cast<int32>(m_PlayState.m_nBufferCount);
@@ -137,7 +137,7 @@
pramp->nRampLength = nRampLength;
pramp->dwFlags.set(CHN_VOLUMERAMP);
}
- return TRUE;
+ return true;
}
@@ -314,7 +314,7 @@
/////////////////////////////////////////////////////////////////////////////
// Handles navigation/effects
-BOOL CSoundFile::ProcessRow()
+bool CSoundFile::ProcessRow()
//---------------------------
{
while(++m_PlayState.m_nTickCount >= GetNumTicksOnCurrentRow())
@@ -350,7 +350,7 @@
if ((m_PlayState.m_nPattern == Order.GetInvalidPatIndex()) || (m_PlayState.m_nCurrentOrder >= Order.size()))
{
- //if (!m_nRepeatCount) return FALSE;
+ //if (!m_nRepeatCount) return false;
ORDERINDEX nRestartPosOverride = m_nRestartPos;
if(!m_nRestartPos && m_PlayState.m_nCurrentOrder <= Order.size() && m_PlayState.m_nCurrentOrder > 0)
@@ -427,7 +427,7 @@
|| !Patterns.IsValidPat(Order[m_PlayState.m_nCurrentOrder]))
{
visitedSongRows.Initialize(true);
- return FALSE;
+ return false;
}
} else
@@ -446,12 +446,12 @@
m_PlayState.m_nNextOrder = m_PlayState.m_nCurrentOrder;
#ifdef MODPLUG_TRACKER
- if ((m_nMaxOrderPosition) && (m_PlayState.m_nCurrentOrder >= m_nMaxOrderPosition)) return FALSE;
+ if ((m_nMaxOrderPosition) && (m_PlayState.m_nCurrentOrder >= m_nMaxOrderPosition)) return false;
#endif // MODPLUG_TRACKER
}
// Weird stuff?
- if (!Patterns.IsValidPat(m_PlayState.m_nPattern)) return FALSE;
+ if (!Patterns.IsValidPat(m_PlayState.m_nPattern)) return false;
// Should never happen
if (m_PlayState.m_nRow >= Patterns[m_PlayState.m_nPattern].GetNumRows()) m_PlayState.m_nRow = 0;
@@ -486,7 +486,7 @@
{
// This is really the song's end!
visitedSongRows.Initialize(true);
- return FALSE;
+ return false;
} else
{
// Ok, this is really dirty, but we have to update the visited rows vector...
@@ -1647,7 +1647,7 @@
////////////////////////////////////////////////////////////////////////////////////////////
// Handles envelopes & mixer setup
-BOOL CSoundFile::ReadNote()
+bool CSoundFile::ReadNote()
//-------------------------
{
#ifdef MODPLUG_TRACKER
@@ -1661,10 +1661,10 @@
#endif // MODPLUG_TRACKER
{
if(!ProcessRow())
- return FALSE;
+ return false;
}
////////////////////////////////////////////////////////////////////////////////////
- if (!m_PlayState.m_nMusicTempo) return FALSE;
+ if (!m_PlayState.m_nMusicTempo) return false;
m_PlayState.m_nSamplesPerTick = GetTickDuration(m_PlayState.m_nMusicTempo, m_PlayState.m_nMusicSpeed, m_PlayState.m_nCurrentRowsPerBeat);
m_PlayState.m_nBufferCount = m_PlayState.m_nSamplesPerTick;
@@ -2084,7 +2084,7 @@
}
}
}
- return TRUE;
+ return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
