Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2415] trunk/OpenMPT
|
From: <man...@us...> - 2013-06-27 14:21:50
|
Revision: 2415
http://sourceforge.net/p/modplug/code/2415
Author: manxorist
Date: 2013-06-27 14:21:41 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
[Fix] libopenmpt compilation broke in r2414 because it was still using vector instead of std::vector in a lot of places which was unnoticed because, in tracker build, 'using std::vector;' is still done in some headers in global namespace. Always use std::vector in soundlib/.
Revision Links:
--------------
http://sourceforge.net/p/modplug/code/2414
Modified Paths:
--------------
trunk/OpenMPT/soundlib/LOAD_AMF.CPP
trunk/OpenMPT/soundlib/LOAD_DMF.CPP
trunk/OpenMPT/soundlib/Load_669.cpp
trunk/OpenMPT/soundlib/Load_ams.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_mdl.cpp
trunk/OpenMPT/soundlib/Load_mod.cpp
trunk/OpenMPT/soundlib/Load_okt.cpp
trunk/OpenMPT/soundlib/Load_psm.cpp
trunk/OpenMPT/soundlib/Load_s3m.cpp
trunk/OpenMPT/soundlib/Load_ult.cpp
trunk/OpenMPT/soundlib/ModSequence.cpp
trunk/OpenMPT/soundlib/RowVisitor.cpp
trunk/OpenMPT/soundlib/SampleFormats.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/XMTools.cpp
trunk/OpenMPT/soundlib/XMTools.h
trunk/OpenMPT/soundlib/load_j2b.cpp
trunk/OpenMPT/soundlib/pattern.cpp
trunk/OpenMPT/test/test.cpp
Modified: trunk/OpenMPT/soundlib/LOAD_AMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_AMF.CPP 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/LOAD_AMF.CPP 2013-06-27 14:21:41 UTC (rev 2415)
@@ -439,7 +439,7 @@
// Setup Order List
Order.resize(fileHeader.numOrders);
- vector<ROWINDEX> patternLength(fileHeader.numOrders, 64);
+ std::vector<ROWINDEX> patternLength(fileHeader.numOrders, 64);
const FileReader::off_t trackStartPos = file.GetPosition() + (fileHeader.version >= 14 ? 2 : 0);
for(ORDERINDEX ord = 0; ord < fileHeader.numOrders; ord++)
@@ -454,7 +454,7 @@
}
// Read Sample Headers
- vector<uint32> samplePos(GetNumSamples(), 0);
+ std::vector<uint32> samplePos(GetNumSamples(), 0);
uint32 maxSamplePos = 0;
for(SAMPLEINDEX smp = 1; smp <= GetNumSamples(); smp++)
@@ -512,16 +512,16 @@
}
// Read Track Mapping Table
- vector<uint16> trackMap;
+ std::vector<uint16> trackMap;
file.ReadVector(trackMap, fileHeader.numTracks);
uint16 trackCount = 0;
- for(vector<uint16>::const_iterator i = trackMap.begin(); i != trackMap.end(); i++)
+ for(std::vector<uint16>::const_iterator i = trackMap.begin(); i != trackMap.end(); i++)
{
trackCount = std::max(trackCount, *i);
}
// Store Tracks Positions
- vector<FileReader> trackData(trackCount);
+ std::vector<FileReader> trackData(trackCount);
for(uint16 i = 0; i < trackCount; i++)
{
// Track size is a 24-Bit value describing the number of byte triplets in this track.
@@ -572,7 +572,7 @@
// Get table with per-channel track assignments
file.Seek(trackStartPos + pat * (GetNumChannels() * 2 + (fileHeader.version >= 14 ? 2 : 0)));
- vector<uint16> tracks;
+ std::vector<uint16> tracks;
file.ReadVector(tracks, GetNumChannels());
for(CHANNELINDEX chn = 0; chn < GetNumChannels(); chn++)
Modified: trunk/OpenMPT/soundlib/LOAD_DMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-06-27 14:21:41 UTC (rev 2415)
@@ -230,7 +230,7 @@
}
};
- vector<ChannelState> channels; // Memory for each channel's state
+ std::vector<ChannelState> channels; // Memory for each channel's state
bool realBPMmode; // true = BPM mode
uint8 beat; // Rows per beat
uint8 tempoTicks; // Tick mode param
@@ -423,7 +423,7 @@
uint8 writeDelay = 0;
// Counters for channel packing (including global track)
- vector<uint8> channelCounter(numChannels + 1, 0);
+ std::vector<uint8> channelCounter(numChannels + 1, 0);
for(ROWINDEX row = 0; row < numRows; row++)
{
@@ -1018,7 +1018,7 @@
chunk.ReadConvertEndianness(patHeader);
m_nChannels = Clamp(patHeader.numTracks, uint8(1), uint8(32)) + 1; // + 1 for global track (used for tempo stuff)
- vector<FileReader> patternChunks;
+ std::vector<FileReader> patternChunks;
patternChunks.reserve(patHeader.numPatterns);
// First, find out where all of our patterns are...
Modified: trunk/OpenMPT/soundlib/Load_669.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_669.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Load_669.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -159,7 +159,7 @@
continue;
}
- vector<uint8> effect(8, 0xFF);
+ std::vector<uint8> effect(8, 0xFF);
for(ROWINDEX row = 0; row < 64; row++)
{
PatternRow m = Patterns[pat].GetRow(row);
Modified: trunk/OpenMPT/soundlib/Load_ams.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ams.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Load_ams.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -405,7 +405,7 @@
SetupMODPanning(true);
madeWithTracker = mpt::String::Format("Extreme's tracker %d.%d", fileHeader.versionHigh, fileHeader.versionLow);
- vector<bool> packSample(fileHeader.numSamps);
+ std::vector<bool> packSample(fileHeader.numSamps);
STATIC_ASSERT(MAX_SAMPLES > 255);
for(SAMPLEINDEX smp = 1; smp <= GetNumSamples(); smp++)
@@ -448,11 +448,11 @@
const uint16 packedLength = file.ReadUint16LE();
if(packedLength)
{
- vector<uint8> textIn, textOut;
+ std::vector<uint8> textIn, textOut;
file.ReadVector(textIn, packedLength);
textOut.reserve(packedLength);
- for(vector<uint8>::iterator c = textIn.begin(); c != textIn.end(); c++)
+ for(std::vector<uint8>::iterator c = textIn.begin(); c != textIn.end(); c++)
{
if(*c & 0x80)
{
@@ -468,7 +468,7 @@
}
// Read Order List
- vector<uint16> orders;
+ std::vector<uint16> orders;
if(file.ReadVector(orders, fileHeader.numOrds))
{
Order.resize(fileHeader.numOrds);
@@ -781,8 +781,8 @@
madeWithTracker = mpt::String::Format("Velvet Studio %d.%d", fileHeader.format >> 4, fileHeader.format & 0x0F);
// Instruments
- vector<SAMPLEINDEX> firstSample; // First sample of instrument
- vector<uint16> sampleSettings; // Shadow sample map... Lo byte = Instrument, Hi byte, lo nibble = Sample index in instrument, Hi byte, hi nibble = Sample pack status
+ std::vector<SAMPLEINDEX> firstSample; // First sample of instrument
+ std::vector<uint16> sampleSettings; // Shadow sample map... Lo byte = Instrument, Hi byte, lo nibble = Sample index in instrument, Hi byte, hi nibble = Sample pack status
enum
{
instrIndexMask = 0xFF, // Shadow instrument
@@ -887,7 +887,7 @@
if(descriptionHeader.packedLen)
{
const size_t textLength = descriptionHeader.packedLen - sizeof(descriptionHeader);
- vector<uint8> textIn, textOut(descriptionHeader.unpackedLen);
+ std::vector<uint8> textIn, textOut(descriptionHeader.unpackedLen);
file.ReadVector(textIn, textLength);
size_t readLen = 0, writeLen = 0;
@@ -912,7 +912,7 @@
}
// Read Order List
- vector<uint16> orders;
+ std::vector<uint16> orders;
if(file.ReadVector(orders, fileHeader.numOrds))
{
Order.resize(fileHeader.numOrds);
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -481,7 +481,7 @@
}
// Reading instrument, sample and pattern offsets
- vector<uint32> insPos, smpPos, patPos;
+ std::vector<uint32> insPos, smpPos, patPos;
file.ReadVector(insPos, fileHeader.insnum);
file.ReadVector(smpPos, fileHeader.smpnum);
file.ReadVector(patPos, fileHeader.patnum);
@@ -717,7 +717,7 @@
FileReader patternData = file.GetChunk(len);
ROWINDEX row = 0;
- vector<uint8> chnMask(GetNumChannels());
+ std::vector<uint8> chnMask(GetNumChannels());
while(row < numRows && patternData.AreBytesLeft())
{
@@ -793,8 +793,8 @@
// Now (after the Insert() call), we can read the pattern name.
CopyPatternName(Patterns[pat], patNames);
- vector<uint8> chnMask(GetNumChannels());
- vector<ModCommand> lastValue(GetNumChannels(), ModCommand::Empty());
+ std::vector<uint8> chnMask(GetNumChannels());
+ std::vector<ModCommand> lastValue(GetNumChannels(), ModCommand::Empty());
ModCommand *m = Patterns[pat];
ROWINDEX row = 0;
@@ -1146,9 +1146,9 @@
itHeader.patnum = std::min(Patterns.GetNumPatterns(), specs.patternsMax);
// Parapointers
- vector<uint32> patpos(itHeader.patnum, 0);
- vector<uint32> smppos(itHeader.smpnum, 0);
- vector<uint32> inspos(itHeader.insnum, 0);
+ std::vector<uint32> patpos(itHeader.patnum, 0);
+ std::vector<uint32> smppos(itHeader.smpnum, 0);
+ std::vector<uint32> inspos(itHeader.insnum, 0);
//VERSION
if(GetType() == MOD_TYPE_MPT)
@@ -1398,8 +1398,8 @@
dwPos += 8;
const CHANNELINDEX maxChannels = MIN(specs.channelsMax, GetNumChannels());
- vector<BYTE> chnmask(maxChannels, 0xFF);
- vector<ModCommand> lastvalue(maxChannels, ModCommand::Empty());
+ std::vector<BYTE> chnmask(maxChannels, 0xFF);
+ std::vector<ModCommand> lastvalue(maxChannels, ModCommand::Empty());
for(ROWINDEX row = 0; row < writeRows; row++)
{
Modified: trunk/OpenMPT/soundlib/Load_mdl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mdl.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Load_mdl.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -301,7 +301,7 @@
BYTE inspanenv[MAX_INSTRUMENTS];
LPCBYTE pvolenv, ppanenv, ppitchenv;
UINT nvolenv, npanenv, npitchenv;
- vector<ROWINDEX> patternLength;
+ std::vector<ROWINDEX> patternLength;
if ((!lpStream) || (dwMemLength < 1024)) return false;
if ((pmsh->id != 0x4C444D44) || ((pmsh->version & 0xF0) > 0x10)) return false;
Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -657,8 +657,8 @@
}
// For detecting PT1x mode
- vector<ModCommand::INSTR> lastInstrument(GetNumChannels(), 0);
- vector<int> instrWithoutNoteCount(GetNumChannels(), 0);
+ std::vector<ModCommand::INSTR> lastInstrument(GetNumChannels(), 0);
+ std::vector<int> instrWithoutNoteCount(GetNumChannels(), 0);
for(ROWINDEX row = 0; row < 64; row++)
{
@@ -1107,8 +1107,8 @@
fwrite(name, 20, 1, f);
}
- vector<SmpLength> sampleLength(32, 0);
- vector<SAMPLEINDEX> sampleSource(32, 0);
+ std::vector<SmpLength> sampleLength(32, 0);
+ std::vector<SAMPLEINDEX> sampleSource(32, 0);
if(GetNumInstruments())
{
@@ -1186,7 +1186,7 @@
fwrite(&modMagic, 4, 1, f);
// Write patterns
- vector<uint8> events;
+ std::vector<uint8> events;
for(PATTERNINDEX pat = 0; pat < writePatterns; pat++)
{
if(!Patterns.IsValidPat(pat))
Modified: trunk/OpenMPT/soundlib/Load_okt.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_okt.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Load_okt.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -71,8 +71,8 @@
#endif
// Parse the sample header block
-void ReadOKTSamples(FileReader &chunk, vector<bool> &sample7bit, CSoundFile *pSndFile)
-//------------------------------------------------------------------------------------
+void ReadOKTSamples(FileReader &chunk, std::vector<bool> &sample7bit, CSoundFile *pSndFile)
+//-----------------------------------------------------------------------------------------
{
pSndFile->m_nSamples = MIN((SAMPLEINDEX)(chunk.BytesLeft() / sizeof(OktSample)), MAX_SAMPLES - 1); // typically 36
sample7bit.resize(pSndFile->GetNumSamples());
@@ -289,9 +289,9 @@
}
// prepare some arrays to store offsets etc.
- vector<FileReader> patternChunks;
- vector<FileReader> sampleChunks;
- vector<bool> sample7bit; // 7-/8-bit sample
+ std::vector<FileReader> patternChunks;
+ std::vector<FileReader> sampleChunks;
+ std::vector<bool> sample7bit; // 7-/8-bit sample
ORDERINDEX nOrders = 0;
InitializeGlobals();
Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -235,8 +235,8 @@
struct PSMSubSong // For internal use (pattern conversion)
{
- vector<uint8> channelPanning, channelVolume;
- vector<bool> channelSurround;
+ std::vector<uint8> channelPanning, channelVolume;
+ std::vector<bool> channelSurround;
uint8 defaultTempo, defaultSpeed;
char songName[10];
ORDERINDEX startOrder, endOrder, restartPos;
@@ -297,12 +297,12 @@
// pattern offset and identifier
PATTERNINDEX numPatterns = 0; // used for setting up the orderlist - final pattern count
- vector<FileReader> patternChunks; // pattern offsets (sorted as they occour in the file)
- vector<uint32> patternIDs; // pattern IDs (sorted as they occour in the file)
- vector<FileReader *> orderOffsets; // combine the upper two vectors to get the offsets for each order item
+ std::vector<FileReader> patternChunks; // pattern offsets (sorted as they occour in the file)
+ std::vector<uint32> patternIDs; // pattern IDs (sorted as they occour in the file)
+ std::vector<FileReader *> orderOffsets; // combine the upper two vectors to get the offsets for each order item
Order.clear();
// subsong setup
- vector<PSMSubSong> subsongs;
+ std::vector<PSMSubSong> subsongs;
bool subsongPanningDiffers = false; // do we have subsongs with different panning positions?
ChunkReader chunkFile(file);
@@ -319,8 +319,8 @@
}
// "PBOD" - Pattern data of a single pattern
- vector<FileReader> pattChunks = chunks.GetAllChunks(PSMChunk::idPBOD);
- for(vector<FileReader>::iterator patternIter = pattChunks.begin(); patternIter != pattChunks.end(); patternIter++)
+ std::vector<FileReader> pattChunks = chunks.GetAllChunks(PSMChunk::idPBOD);
+ for(std::vector<FileReader>::iterator patternIter = pattChunks.begin(); patternIter != pattChunks.end(); patternIter++)
{
ChunkReader chunk(*patternIter);
if(chunk.GetLength() != chunk.ReadUint32LE() // Same value twice
@@ -349,13 +349,13 @@
}
// "SONG" - Subsong information (channel count etc)
- vector<FileReader> songChunks = chunks.GetAllChunks(PSMChunk::idSONG);
+ std::vector<FileReader> songChunks = chunks.GetAllChunks(PSMChunk::idSONG);
if(songChunks.empty())
{
return false;
}
- for(vector<FileReader>::iterator subsongIter = songChunks.begin(); subsongIter != songChunks.end(); subsongIter++)
+ for(std::vector<FileReader>::iterator subsongIter = songChunks.begin(); subsongIter != songChunks.end(); subsongIter++)
{
ChunkReader chunk(*subsongIter);
PSMSongHeader songHeader;
@@ -595,8 +595,8 @@
// DSMP - Samples
if(loadFlags & loadSampleData)
{
- vector<FileReader> sampleChunks = chunks.GetAllChunks(PSMChunk::idDSMP);
- for(vector<FileReader>::iterator sampleIter = sampleChunks.begin(); sampleIter != sampleChunks.end(); sampleIter++)
+ std::vector<FileReader> sampleChunks = chunks.GetAllChunks(PSMChunk::idDSMP);
+ for(std::vector<FileReader>::iterator sampleIter = sampleChunks.begin(); sampleIter != sampleChunks.end(); sampleIter++)
{
FileReader chunk(*sampleIter);
if(!newFormat)
Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -588,14 +588,14 @@
Order.ReadAsByte(file, fileHeader.ordNum);
// Read sample header offsets
- vector<uint16> sampleOffsets(fileHeader.smpNum);
+ std::vector<uint16> sampleOffsets(fileHeader.smpNum);
for(size_t i = 0; i < fileHeader.smpNum; i++)
{
sampleOffsets[i] = file.ReadUint16LE();
}
// Read pattern offsets
- vector<uint16> patternOffsets(fileHeader.patNum);
+ std::vector<uint16> patternOffsets(fileHeader.patNum);
for(size_t i = 0; i < fileHeader.patNum; i++)
{
patternOffsets[i] = file.ReadUint16LE();
@@ -903,7 +903,7 @@
// ...which must be a multiple of 16, because parapointers omit the lowest 4 bits.
sampleHeaderOffset = (sampleHeaderOffset + 15) & ~15;
- vector<uint16> sampleOffsets(writeSamples);
+ std::vector<uint16> sampleOffsets(writeSamples);
for(SAMPLEINDEX smp = 0; smp < writeSamples; smp++)
{
STATIC_ASSERT((sizeof(S3MSampleHeader) % 16) == 0);
@@ -918,7 +918,7 @@
size_t patternPointerOffset = ftell(f);
size_t firstPatternOffset = sampleHeaderOffset + writeSamples * sizeof(S3MSampleHeader);
- vector<uint16> patternOffsets(writePatterns);
+ std::vector<uint16> patternOffsets(writePatterns);
// Need to calculate the real offsets later.
if(writePatterns != 0)
@@ -964,7 +964,7 @@
patternOffsets[pat] = static_cast<uint16>(ftell(f) / 16);
SwapBytesLE(patternOffsets[pat]);
- vector<uint8> buffer;
+ std::vector<uint8> buffer;
buffer.reserve(5 * 1024);
// Reserve space for length bytes
buffer.resize(2, 0);
@@ -1086,7 +1086,7 @@
size_t sampleDataOffset = ftell(f);
// Write samples
- vector<S3MSampleHeader> sampleHeader(writeSamples);
+ std::vector<S3MSampleHeader> sampleHeader(writeSamples);
for(SAMPLEINDEX smp = 0; smp < writeSamples; smp++)
{
Modified: trunk/OpenMPT/soundlib/Load_ult.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ult.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Load_ult.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -368,7 +368,7 @@
curChannel = (curChannel + 1) % numChannels;
}
- vector<bool> isPortaActive;
+ std::vector<bool> isPortaActive;
bool writeT125;
CHANNELINDEX numChannels, curChannel;
};
Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -586,7 +586,7 @@
SetSequence(0);
resize(GetLengthTailTrimmed());
SEQUENCEINDEX removedSequences = 0; // sequence count
- vector <SEQUENCEINDEX> patternsFixed; // pattern fixed by other sequence already?
+ std::vector <SEQUENCEINDEX> patternsFixed; // pattern fixed by other sequence already?
patternsFixed.resize(m_sndFile.Patterns.Size(), SEQUENCEINDEX_INVALID);
// Set up vector
for(ORDERINDEX nOrd = 0; nOrd < GetLengthTailTrimmed(); nOrd++)
Modified: trunk/OpenMPT/soundlib/RowVisitor.cpp
===================================================================
--- trunk/OpenMPT/soundlib/RowVisitor.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/RowVisitor.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -177,7 +177,7 @@
// Unvisit all rows that are in the visited row buffer, until we hit the start row for this pattern loop.
ROWINDEX row = ROWINDEX_INVALID;
- vector<ROWINDEX>::reverse_iterator iter = visitOrder.rbegin();
+ std::vector<ROWINDEX>::reverse_iterator iter = visitOrder.rbegin();
while(iter != visitOrder.rend() && row != startRow)
{
row = *(iter++);
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -186,7 +186,7 @@
return false;
}
- vector<bool> keepSamples(GetNumSamples() + 1, true);
+ std::vector<bool> keepSamples(GetNumSamples() + 1, true);
// Check which samples are used by the instrument we are going to nuke.
std::set<SAMPLEINDEX> referencedSamples = Instruments[nInstr]->GetSamples();
@@ -237,8 +237,8 @@
Instruments[targetInstr] = pIns;
*pIns = *srcSong.Instruments[sourceInstr];
- vector<SAMPLEINDEX> sourceSample; // Sample index in source song
- vector<SAMPLEINDEX> targetSample; // Sample index in target song
+ std::vector<SAMPLEINDEX> sourceSample; // Sample index in source song
+ std::vector<SAMPLEINDEX> targetSample; // Sample index in target song
SAMPLEINDEX targetIndex = 0; // Next index for inserting sample
for(size_t i = 0; i < CountOf(pIns->Keyboard); i++)
@@ -246,7 +246,7 @@
const SAMPLEINDEX sourceIndex = pIns->Keyboard[i];
if(sourceIndex > 0 && sourceIndex <= srcSong.GetNumSamples())
{
- const vector<SAMPLEINDEX>::const_iterator entry = std::find(sourceSample.begin(), sourceSample.end(), sourceIndex);
+ const std::vector<SAMPLEINDEX>::const_iterator entry = std::find(sourceSample.begin(), sourceSample.end(), sourceIndex);
if(entry == sourceSample.end())
{
// Didn't consider this sample yet, so add it to our map.
@@ -987,7 +987,7 @@
fileHeader.ConvertToMPT(*pIns);
// Translate sample map and find available sample slots
- vector<SAMPLEINDEX> sampleMap(fileHeader.numSamples);
+ std::vector<SAMPLEINDEX> sampleMap(fileHeader.numSamples);
SAMPLEINDEX maxSmp = 0;
for(size_t i = 0 + 12; i < 96 + 12; i++)
@@ -1014,7 +1014,7 @@
m_nSamples = maxSmp;
}
- vector<SampleIO> sampleFlags(fileHeader.numSamples);
+ std::vector<SampleIO> sampleFlags(fileHeader.numSamples);
// Read sample headers
for(SAMPLEINDEX i = 0; i < fileHeader.numSamples; i++)
@@ -1080,7 +1080,7 @@
XIInstrumentHeader header;
header.ConvertToXM(*pIns, false);
- const vector<SAMPLEINDEX> samples = header.instrument.GetSampleList(*pIns, false);
+ const std::vector<SAMPLEINDEX> samples = header.instrument.GetSampleList(*pIns, false);
if(samples.size() > 0 && samples[0] <= GetNumSamples())
{
// Copy over auto-vibrato settings of first sample
@@ -1090,7 +1090,7 @@
header.ConvertEndianness();
fwrite(&header, 1, sizeof(XIInstrumentHeader), f);
- vector<SampleIO> sampleFlags(samples.size());
+ std::vector<SampleIO> sampleFlags(samples.size());
// XI Sample Headers
for(SAMPLEINDEX i = 0; i < samples.size(); i++)
@@ -1460,7 +1460,7 @@
{
size_t numMarkers = markerChunk.ReadUint16BE();
- vector<AIFFMarker> markers;
+ std::vector<AIFFMarker> markers;
for(size_t i = 0; i < numMarkers; i++)
{
AIFFMarker marker;
@@ -1485,7 +1485,7 @@
}
// Read markers
- for(vector<AIFFMarker>::iterator iter = markers.begin(); iter != markers.end(); iter++)
+ for(std::vector<AIFFMarker>::iterator iter = markers.begin(); iter != markers.end(); iter++)
{
if(iter->id == instrHeader.sustainLoop.beginLoop)
{
@@ -1609,7 +1609,7 @@
FileReader::off_t extraOffset = file.GetPosition();
// Reading Samples
- vector<SAMPLEINDEX> samplemap(nsamples, 0);
+ std::vector<SAMPLEINDEX> samplemap(nsamples, 0);
for(SAMPLEINDEX i = 0; i < nsamples; i++)
{
smp = GetNextFreeSample(nInstr, smp + 1);
@@ -1657,8 +1657,8 @@
size_t instSize = iti.ConvertToIT(*pIns, false, *this);
// Create sample assignment table
- vector<SAMPLEINDEX> smptable;
- vector<SAMPLEINDEX> smpmap(GetNumSamples(), 0);
+ std::vector<SAMPLEINDEX> smptable;
+ std::vector<SAMPLEINDEX> smpmap(GetNumSamples(), 0);
for(size_t i = 0; i < NOTE_MAX; i++)
{
const SAMPLEINDEX smp = pIns->Keyboard[i];
@@ -1685,8 +1685,8 @@
filePos += smptable.size() * sizeof(ITSample);
// Writing sample headers + data
- vector<SampleIO> sampleFlags;
- for(vector<SAMPLEINDEX>::iterator iter = smptable.begin(); iter != smptable.end(); iter++)
+ std::vector<SampleIO> sampleFlags;
+ for(std::vector<SAMPLEINDEX>::iterator iter = smptable.begin(); iter != smptable.end(); iter++)
{
ITSample itss;
itss.ConvertToIT(Samples[*iter], GetType(), compress, compress);
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -99,7 +99,7 @@
CSoundFile::samplecount_t renderedSamples;
UINT musicSpeed, musicTempo;
LONG glbVol;
- vector<ChnSettings> chnSettings;
+ std::vector<ChnSettings> chnSettings;
protected:
const CSoundFile &sndFile;
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -1499,8 +1499,8 @@
// Detect samples that are referenced by an instrument, but actually not used in a song.
// Only works in instrument mode. Unused samples are marked as false in the vector.
-SAMPLEINDEX CSoundFile::DetectUnusedSamples(vector<bool> &sampleUsed) const
-//-------------------------------------------------------------------------
+SAMPLEINDEX CSoundFile::DetectUnusedSamples(std::vector<bool> &sampleUsed) const
+//------------------------------------------------------------------------------
{
sampleUsed.assign(GetNumSamples() + 1, false);
@@ -1556,8 +1556,8 @@
// Destroy samples where keepSamples index is false. First sample is keepSamples[1]!
-SAMPLEINDEX CSoundFile::RemoveSelectedSamples(const vector<bool> &keepSamples)
-//----------------------------------------------------------------------------
+SAMPLEINDEX CSoundFile::RemoveSelectedSamples(const std::vector<bool> &keepSamples)
+//---------------------------------------------------------------------------------
{
if(keepSamples.empty())
{
Modified: trunk/OpenMPT/soundlib/XMTools.cpp
===================================================================
--- trunk/OpenMPT/soundlib/XMTools.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/XMTools.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -88,12 +88,12 @@
ConvertEnvelopeToXM(mptIns.PanEnv, panPoints, panFlags, panSustain, panLoopStart, panLoopEnd, panEnv);
// Create sample assignment table
- vector<SAMPLEINDEX> sampleList = GetSampleList(mptIns, compatibilityExport);
+ std::vector<SAMPLEINDEX> sampleList = GetSampleList(mptIns, compatibilityExport);
for(size_t i = 0; i < CountOf(sampleMap); i++)
{
if(mptIns.Keyboard[i + 12] > 0)
{
- vector<SAMPLEINDEX>::iterator sample = std::find(sampleList.begin(), sampleList.end(), mptIns.Keyboard[i + 12]);
+ std::vector<SAMPLEINDEX>::iterator sample = std::find(sampleList.begin(), sampleList.end(), mptIns.Keyboard[i + 12]);
if(sample != sampleList.end())
{
// Yep, we want to export this sample.
@@ -115,11 +115,11 @@
// Get a list of samples that should be written to the file.
-vector<SAMPLEINDEX> XMInstrument::GetSampleList(const ModInstrument &mptIns, bool compatibilityExport) const
-//----------------------------------------------------------------------------------------------------------
+std::vector<SAMPLEINDEX> XMInstrument::GetSampleList(const ModInstrument &mptIns, bool compatibilityExport) const
+//---------------------------------------------------------------------------------------------------------------
{
- vector<SAMPLEINDEX> sampleList; // List of samples associated with this instrument
- vector<bool> addedToList; // Which samples did we already add to the sample list?
+ std::vector<SAMPLEINDEX> sampleList; // List of samples associated with this instrument
+ std::vector<bool> addedToList; // Which samples did we already add to the sample list?
uint8 numSamples = 0;
for(size_t i = 0; i < CountOf(sampleMap); i++)
Modified: trunk/OpenMPT/soundlib/XMTools.h
===================================================================
--- trunk/OpenMPT/soundlib/XMTools.h 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/XMTools.h 2013-06-27 14:21:41 UTC (rev 2415)
@@ -100,7 +100,7 @@
void ApplyAutoVibratoToMPT(ModSample &mptSmp) const;
// Get a list of samples that should be written to the file.
- vector<SAMPLEINDEX> GetSampleList(const ModInstrument &mptIns, bool compatibilityExport) const;
+ std::vector<SAMPLEINDEX> GetSampleList(const ModInstrument &mptIns, bool compatibilityExport) const;
};
STATIC_ASSERT(sizeof(XMInstrument) == 230);
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -824,8 +824,8 @@
// "PATT" - Pattern data for one pattern
if(loadFlags & loadPatternData)
{
- vector<FileReader> pattChunks = chunks.GetAllChunks(AMFFRiffChunk::idPATT);
- for(vector<FileReader>::iterator patternIter = pattChunks.begin(); patternIter != pattChunks.end(); patternIter++)
+ std::vector<FileReader> pattChunks = chunks.GetAllChunks(AMFFRiffChunk::idPATT);
+ for(std::vector<FileReader>::iterator patternIter = pattChunks.begin(); patternIter != pattChunks.end(); patternIter++)
{
FileReader chunk(*patternIter);
PATTERNINDEX pat = chunk.ReadUint8();
@@ -837,8 +837,8 @@
if(!isAM)
{
// "INST" - Instrument (only in RIFF AMFF)
- vector<FileReader> instChunks = chunks.GetAllChunks(AMFFRiffChunk::idINST);
- for(vector<FileReader>::iterator instIter = instChunks.begin(); instIter != instChunks.end(); instIter++)
+ std::vector<FileReader> instChunks = chunks.GetAllChunks(AMFFRiffChunk::idINST);
+ for(std::vector<FileReader>::iterator instIter = instChunks.begin(); instIter != instChunks.end(); instIter++)
{
FileReader chunk(*instIter);
AMFFInstrumentHeader instrHeader;
@@ -886,8 +886,8 @@
} else
{
// "RIFF" - Instrument (only in RIFF AM)
- vector<FileReader> instChunks = chunks.GetAllChunks(AMFFRiffChunk::idRIFF);
- for(vector<FileReader>::iterator instIter = instChunks.begin(); instIter != instChunks.end(); instIter++)
+ std::vector<FileReader> instChunks = chunks.GetAllChunks(AMFFRiffChunk::idRIFF);
+ for(std::vector<FileReader>::iterator instIter = instChunks.begin(); instIter != instChunks.end(); instIter++)
{
ChunkReader chunk(*instIter);
if(chunk.ReadUint32LE() != AMFFRiffChunk::idAI__)
@@ -923,10 +923,10 @@
// Read sample sub-chunks (RIFF nesting ftw)
ChunkReader::ChunkList<AMFFRiffChunk> sampleChunkFile = chunk.ReadChunks<AMFFRiffChunk>(2);
- vector<FileReader> sampleChunks = sampleChunkFile.GetAllChunks(AMFFRiffChunk::idRIFF);
+ std::vector<FileReader> sampleChunks = sampleChunkFile.GetAllChunks(AMFFRiffChunk::idRIFF);
ASSERT(sampleChunks.size() == instrHeader.numSamples);
- for(vector<FileReader>::iterator smpIter = sampleChunks.begin(); smpIter != sampleChunks.end(); smpIter++)
+ for(std::vector<FileReader>::iterator smpIter = sampleChunks.begin(); smpIter != sampleChunks.end(); smpIter++)
{
ChunkReader sampleChunk(*smpIter);
Modified: trunk/OpenMPT/soundlib/pattern.cpp
===================================================================
--- trunk/OpenMPT/soundlib/pattern.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/soundlib/pattern.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -533,7 +533,7 @@
const ROWINDEX rows = pat.GetNumRows();
const CHANNELINDEX chns = pat.GetNumChannels();
- vector<ModCommand> lastChnMC(chns);
+ std::vector<ModCommand> lastChnMC(chns);
for(ROWINDEX r = 0; r<rows; r++)
{
@@ -588,7 +588,7 @@
const CHANNELINDEX chns = pat.GetNumChannels();
const ROWINDEX rows = pat.GetNumRows();
- vector<ModCommand> lastChnMC(chns);
+ std::vector<ModCommand> lastChnMC(chns);
ROWINDEX row = 0;
while(row < rows && iStrm.good())
Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp 2013-06-27 13:41:04 UTC (rev 2414)
+++ trunk/OpenMPT/test/test.cpp 2013-06-27 14:21:41 UTC (rev 2415)
@@ -1455,7 +1455,7 @@
GenerateCommands(sndFile.Patterns[2], 0.5, 0.5);
//
- vector<ModCommand> pat[3];
+ std::vector<ModCommand> pat[3];
const size_t numCommands[] = { sndFile.GetNumChannels() * sndFile.Patterns[0].GetNumRows(),
sndFile.GetNumChannels() * sndFile.Patterns[1].GetNumRows(),
sndFile.GetNumChannels() * sndFile.Patterns[2].GetNumRows()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
