Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3897] trunk/OpenMPT
|
From: <man...@us...> - 2014-03-18 08:56:27
|
Revision: 3897
http://sourceforge.net/p/modplug/code/3897
Author: manxorist
Date: 2014-03-18 08:56:19 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
[Ref] Rename FileReader::GetChunk(len) to FileReader::ReadChunk(len) in order to make naming consistent because it actually advances the stream position. All other read functions also advance the stream position and the other GetChunk overload (GetChunk(pos, len)) does not. Additionally it's just totally confusing for a member named Get*** to mutate the observable object state.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/VstPresets.cpp
trunk/OpenMPT/soundlib/ChunkReader.h
trunk/OpenMPT/soundlib/FileReader.h
trunk/OpenMPT/soundlib/ITCompression.cpp
trunk/OpenMPT/soundlib/Load_amf.cpp
trunk/OpenMPT/soundlib/Load_ams.cpp
trunk/OpenMPT/soundlib/Load_dbm.cpp
trunk/OpenMPT/soundlib/Load_digi.cpp
trunk/OpenMPT/soundlib/Load_dmf.cpp
trunk/OpenMPT/soundlib/Load_dsm.cpp
trunk/OpenMPT/soundlib/Load_far.cpp
trunk/OpenMPT/soundlib/Load_gdm.cpp
trunk/OpenMPT/soundlib/Load_imf.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_itp.cpp
trunk/OpenMPT/soundlib/Load_mtm.cpp
trunk/OpenMPT/soundlib/Load_okt.cpp
trunk/OpenMPT/soundlib/Load_psm.cpp
trunk/OpenMPT/soundlib/Load_ptm.cpp
trunk/OpenMPT/soundlib/Load_umx.cpp
trunk/OpenMPT/soundlib/Load_xm.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
Modified: trunk/OpenMPT/mptrack/VstPresets.cpp
===================================================================
--- trunk/OpenMPT/mptrack/VstPresets.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/mptrack/VstPresets.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -76,7 +76,7 @@
}
} else
{
- FileReader chunk = file.GetChunk(file.ReadUint32BE());
+ FileReader chunk = file.ReadChunk(file.ReadUint32BE());
plugin.Dispatch(effSetChunk, 1, chunk.GetLength(), const_cast<char *>(chunk.GetRawData()), 0);
}
} else if((header.fxMagic == bankMagic || header.fxMagic == chunkBankMagic) && firstChunk)
@@ -101,7 +101,7 @@
plugin.SetCurrentProgram(oldCurrentProgram);
} else
{
- FileReader chunk = file.GetChunk(file.ReadUint32BE());
+ FileReader chunk = file.ReadChunk(file.ReadUint32BE());
plugin.Dispatch(effSetChunk, 0, chunk.GetLength(), const_cast<char *>(chunk.GetRawData()), 0);
}
if(header.version >= 2)
Modified: trunk/OpenMPT/soundlib/ChunkReader.h
===================================================================
--- trunk/OpenMPT/soundlib/ChunkReader.h 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/ChunkReader.h 2014-03-18 08:56:19 UTC (rev 3897)
@@ -113,7 +113,7 @@
}
size_t dataSize = chunkHeader.GetLength();
- ChunkListItem<T> resultItem(chunkHeader, GetChunk(dataSize));
+ ChunkListItem<T> resultItem(chunkHeader, ReadChunk(dataSize));
result.push_back(resultItem);
// Skip padding bytes
Modified: trunk/OpenMPT/soundlib/FileReader.h
===================================================================
--- trunk/OpenMPT/soundlib/FileReader.h 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/FileReader.h 2014-03-18 08:56:19 UTC (rev 3897)
@@ -530,15 +530,15 @@
return FileReader();
}
#ifndef NO_FILEREADER_STD_ISTREAM
- return FileReader(MPT_SHARED_PTR<IFileDataContainer>(new FileDataContainerWindow(data, position, (std::min)(length, DataContainer().GetLength() - position))));
+ return FileReader(MPT_SHARED_PTR<IFileDataContainer>(new FileDataContainerWindow(data, position, std::min(length, DataContainer().GetLength() - position))));
#else
- return FileReader(DataContainer().GetRawData() + position, (std::min)(length, DataContainer().GetLength() - position));
+ return FileReader(DataContainer().GetRawData() + position, std::min(length, DataContainer().GetLength() - position));
#endif
}
// Create a new FileReader object for parsing a sub chunk at the current position with a given length.
// The file cursor is advanced by "length" bytes.
- FileReader GetChunk(off_t length)
+ FileReader ReadChunk(off_t length)
{
off_t position = streamPos;
Skip(length);
Modified: trunk/OpenMPT/soundlib/ITCompression.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ITCompression.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/ITCompression.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -315,7 +315,7 @@
writtenSamples = writePos = 0;
while(writtenSamples < sample.nLength && file.AreBytesLeft())
{
- chunk = file.GetChunk(file.ReadUint16LE());
+ chunk = file.ReadChunk(file.ReadUint16LE());
// Initialise bit reader
dataPos = 0;
Modified: trunk/OpenMPT/soundlib/Load_amf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_amf.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_amf.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -526,7 +526,7 @@
{
// Track size is a 24-Bit value describing the number of byte triplets in this track.
uint32 trackSize = file.ReadUint16LE() | (file.ReadUint8() << 16);
- trackData[i] = file.GetChunk(trackSize * 3);
+ trackData[i] = file.ReadChunk(trackSize * 3);
}
if(loadFlags & loadSampleData)
Modified: trunk/OpenMPT/soundlib/Load_ams.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ams.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_ams.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -486,7 +486,7 @@
for(PATTERNINDEX pat = 0; pat < fileHeader.numPats; pat++)
{
uint32 patLength = file.ReadUint32LE();
- FileReader patternChunk = file.GetChunk(patLength);
+ FileReader patternChunk = file.ReadChunk(patLength);
if(loadFlags & loadPatternData)
{
@@ -954,7 +954,7 @@
for(PATTERNINDEX pat = 0; pat < fileHeader.numPats; pat++)
{
uint32 patLength = file.ReadUint32LE();
- FileReader patternChunk = file.GetChunk(patLength);
+ FileReader patternChunk = file.ReadChunk(patLength);
if(loadFlags & loadPatternData)
{
Modified: trunk/OpenMPT/soundlib/Load_dbm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_dbm.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_dbm.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -425,7 +425,7 @@
{
uint16 numRows = patternChunk.ReadUint16BE();
uint32 packedSize = patternChunk.ReadUint32BE();
- FileReader chunk = patternChunk.GetChunk(packedSize);
+ FileReader chunk = patternChunk.ReadChunk(packedSize);
if(Patterns.Insert(pat, numRows))
{
Modified: trunk/OpenMPT/soundlib/Load_digi.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_digi.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_digi.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -150,10 +150,10 @@
FileReader patternChunk;
if(fileHeader.packEnable)
{
- patternChunk = file.GetChunk(file.ReadUint16BE());
+ patternChunk = file.ReadChunk(file.ReadUint16BE());
} else
{
- patternChunk = file.GetChunk(4 * 64 * GetNumChannels());
+ patternChunk = file.ReadChunk(4 * 64 * GetNumChannels());
}
if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, 64))
Modified: trunk/OpenMPT/soundlib/Load_dmf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_dmf.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_dmf.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -1018,7 +1018,7 @@
DMFPatternHeader header;
chunk.ReadConvertEndianness(header);
chunk.SkipBack(sizeof(header));
- patternChunks.push_back(chunk.GetChunk(sizeof(header) + header.patternLength));
+ patternChunks.push_back(chunk.ReadChunk(sizeof(header) + header.patternLength));
}
// Now go through the order list and load them.
@@ -1078,7 +1078,7 @@
chunk.Skip(sizeof(DMFSampleHeaderTail));
// Now read the sample data from the data chunk
- FileReader sampleData = sampleDataChunk.GetChunk(sampleDataChunk.ReadUint32LE());
+ FileReader sampleData = sampleDataChunk.ReadChunk(sampleDataChunk.ReadUint32LE());
if(sampleData.IsValid() && (loadFlags & loadSampleData))
{
SampleIO(
Modified: trunk/OpenMPT/soundlib/Load_dsm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_dsm.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_dsm.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -201,7 +201,7 @@
PATTERNINDEX patNum = 0;
while(file.ReadConvertEndianness(chunkHeader))
{
- FileReader chunk = file.GetChunk(chunkHeader.size);
+ FileReader chunk = file.ReadChunk(chunkHeader.size);
if(!memcmp(chunkHeader.magic, "PATT", 4) && (loadFlags & loadPatternData))
{
Modified: trunk/OpenMPT/soundlib/Load_far.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_far.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_far.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -214,7 +214,7 @@
continue;
}
- FileReader patternChunk = file.GetChunk(orderHeader.patternSize[pat]);
+ FileReader patternChunk = file.ReadChunk(orderHeader.patternSize[pat]);
// Calculate pattern length in rows (every event is 4 bytes, and we have 16 channels)
ROWINDEX numRows = (orderHeader.patternSize[pat] - 2) / (16 * 4);
Modified: trunk/OpenMPT/soundlib/Load_gdm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_gdm.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_gdm.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -298,7 +298,7 @@
// Huh, no pattern data present?
continue;
}
- FileReader chunk = file.GetChunk(patternLength - 2);
+ FileReader chunk = file.ReadChunk(patternLength - 2);
if(!(loadFlags & loadPatternData) || !chunk.IsValid() || Patterns.Insert(pat, 64))
{
Modified: trunk/OpenMPT/soundlib/Load_imf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_imf.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_imf.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -477,7 +477,7 @@
for(PATTERNINDEX pat = 0; pat < fileHeader.patNum; pat++)
{
const uint16 length = file.ReadUint16LE(), numRows = file.ReadUint16LE();
- FileReader patternChunk = file.GetChunk(length - 4);
+ FileReader patternChunk = file.ReadChunk(length - 4);
if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, numRows))
{
@@ -606,7 +606,7 @@
if(sampleHeader.length)
{
- FileReader sampleChunk = file.GetChunk(sampleHeader.length);
+ FileReader sampleChunk = file.ReadChunk(sampleHeader.length);
if(loadFlags & loadSampleData)
{
SampleIO(
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -578,14 +578,14 @@
FileReader patNames;
if(file.ReadMagic("PNAM"))
{
- patNames = file.GetChunk(file.ReadUint32LE());
+ patNames = file.ReadChunk(file.ReadUint32LE());
}
m_nChannels = GetModSpecifications().channelsMin;
// Read channel names: "CNAM"
if(file.ReadMagic("CNAM"))
{
- FileReader chnNames = file.GetChunk(file.ReadUint32LE());
+ FileReader chnNames = file.ReadChunk(file.ReadUint32LE());
const CHANNELINDEX readChns = std::min(MAX_BASECHANNELS, static_cast<CHANNELINDEX>(chnNames.GetLength() / MAX_CHANNELNAME));
m_nChannels = readChns;
@@ -695,7 +695,7 @@
|| !file.Skip(4))
continue;
- FileReader patternData = file.GetChunk(len);
+ FileReader patternData = file.ReadChunk(len);
ROWINDEX row = 0;
std::vector<uint8> chnMask(GetNumChannels());
@@ -785,7 +785,7 @@
|| Patterns.Insert(pat, numRows))
continue;
- FileReader patternData = file.GetChunk(len);
+ FileReader patternData = file.ReadChunk(len);
// Now (after the Insert() call), we can read the pattern name.
CopyPatternName(Patterns[pat], patNames);
@@ -1796,7 +1796,7 @@
file.SkipBack(8);
return;
}
- FileReader chunk = file.GetChunk(chunkSize);
+ FileReader chunk = file.ReadChunk(chunkSize);
// Channel FX
if(!memcmp(code, "CHFX", 4))
@@ -1823,7 +1823,7 @@
//data for VST setchunk? size lies just after standard plugin data.
const uint32 pluginDataChunkSize = chunk.ReadUint32LE();
- FileReader pluginDataChunk = chunk.GetChunk(pluginDataChunkSize);
+ FileReader pluginDataChunk = chunk.ReadChunk(pluginDataChunkSize);
if(pluginDataChunk.IsValid())
{
@@ -1837,7 +1837,7 @@
}
//rewbs.modularPlugData
- FileReader modularData = chunk.GetChunk(chunk.ReadUint32LE());
+ FileReader modularData = chunk.ReadChunk(chunk.ReadUint32LE());
//if dwMPTExtra is positive and there are dwMPTExtra bytes left in nPluginSize, we have some more data!
if(modularData.IsValid())
@@ -2156,7 +2156,7 @@
break;
}
- FileReader chunk = file.GetChunk(size);
+ FileReader chunk = file.ReadChunk(size);
switch (code) // interpret field code
{
@@ -2284,7 +2284,7 @@
return 0;
}
//...the next piece of data must be the total size of the modular data
- FileReader modularData = file.GetChunk(file.ReadUint32LE());
+ FileReader modularData = file.ReadChunk(file.ReadUint32LE());
// Handle chunks
while(modularData.AreBytesLeft())
Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -119,7 +119,7 @@
// Song mix plugins
{
- FileReader plugChunk = file.GetChunk(file.ReadUint32LE());
+ FileReader plugChunk = file.ReadChunk(file.ReadUint32LE());
LoadMixPlugins(plugChunk);
}
@@ -172,7 +172,7 @@
const PATTERNINDEX numPats = static_cast<PATTERNINDEX>(file.ReadUint32LE());
const PATTERNINDEX numNamedPats = static_cast<PATTERNINDEX>(file.ReadUint32LE());
size_t patNameLen = file.ReadUint32LE(); // Size of each pattern name
- FileReader pattNames = file.GetChunk(numNamedPats * patNameLen);
+ FileReader pattNames = file.ReadChunk(numNamedPats * patNameLen);
// modcommand data length
@@ -186,7 +186,7 @@
{
// Patterns[npat].GetNumRows()
const ROWINDEX numRows = file.ReadUint32LE();
- FileReader patternChunk = file.GetChunk(numRows * size * GetNumChannels());
+ FileReader patternChunk = file.ReadChunk(numRows * size * GetNumChannels());
// Allocate pattern
if(!(loadFlags & loadPatternData) || numRows == 0 || numRows > MAX_PATTERN_ROWS || Patterns.Insert(pat, numRows))
Modified: trunk/OpenMPT/soundlib/Load_mtm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mtm.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_mtm.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -147,7 +147,7 @@
// Reading Patterns
const ROWINDEX rowsPerPat = std::min(ROWINDEX(fileHeader.beatsPerTrack), MAX_PATTERN_ROWS);
- FileReader tracks = file.GetChunk(192 * fileHeader.numTracks);
+ FileReader tracks = file.ReadChunk(192 * fileHeader.numTracks);
for(PATTERNINDEX pat = 0; pat <= fileHeader.lastPattern; pat++)
{
Modified: trunk/OpenMPT/soundlib/Load_okt.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_okt.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_okt.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -307,7 +307,7 @@
break;
}
- FileReader chunk = file.GetChunk(iffHead.chunksize);
+ FileReader chunk = file.ReadChunk(iffHead.chunksize);
if(!chunk.IsValid())
{
break;
Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -329,7 +329,7 @@
}
patternIDs.push_back(ConvertStrTo<uint32>(&patternID[newFormat ? 0 : 1]));
// We're going to read the rest of the pattern data later.
- patternChunks.push_back(chunk.GetChunk(chunk.BytesLeft()));
+ patternChunks.push_back(chunk.ReadChunk(chunk.BytesLeft()));
// Convert later as we have to know how many channels there are.
}
@@ -686,7 +686,7 @@
continue;
}
- FileReader rowChunk = patternChunk.GetChunk(rowSize - 2);
+ FileReader rowChunk = patternChunk.ReadChunk(rowSize - 2);
while(rowChunk.AreBytesLeft())
{
@@ -1179,7 +1179,7 @@
// Read samples
if(fileHeader.smpOffset > 4 && file.Seek(fileHeader.smpOffset - 4) && file.ReadUint32LE() == PSM16FileHeader::idPSAH)
{
- FileReader sampleChunk = file.GetChunk(file.BytesLeft());
+ FileReader sampleChunk = file.ReadChunk(file.BytesLeft());
for(SAMPLEINDEX fileSample = 0; fileSample < fileHeader.numSamples; fileSample++)
{
@@ -1221,7 +1221,7 @@
}
// Patterns are padded to 16 Bytes
- FileReader patternChunk = file.GetChunk(((patternHeader.size + 15) & ~15) - sizeof(PSM16PatternHeader));
+ FileReader patternChunk = file.ReadChunk(((patternHeader.size + 15) & ~15) - sizeof(PSM16PatternHeader));
if(Patterns.Insert(pat, patternHeader.numRows))
{
Modified: trunk/OpenMPT/soundlib/Load_ptm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ptm.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_ptm.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -178,7 +178,7 @@
}
// Reading samples
- FileReader sampleHeaderChunk = file.GetChunk(fileHeader.numSamples * sizeof(PTMSampleHeader));
+ FileReader sampleHeaderChunk = file.ReadChunk(fileHeader.numSamples * sizeof(PTMSampleHeader));
for(SAMPLEINDEX smp = 0; smp < m_nSamples; smp++)
{
PTMSampleHeader sampleHeader;
Modified: trunk/OpenMPT/soundlib/Load_umx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_umx.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_umx.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -303,7 +303,7 @@
}
int32 size = ReadUMXIndex(chunk);
- FileReader fileChunk = chunk.GetChunk(size);
+ FileReader fileChunk = chunk.ReadChunk(size);
if(isMusic)
{
Modified: trunk/OpenMPT/soundlib/Load_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -147,7 +147,7 @@
}
file.Seek(curPos + headerSize);
- FileReader patternChunk = file.GetChunk(packedSize);
+ FileReader patternChunk = file.ReadChunk(packedSize);
if(sndFile.Patterns.Insert(pat, numRows) || packedSize == 0)
{
@@ -476,7 +476,7 @@
{
// Sample 15 in dirtysex.xm by J/M/T/M is a 16-bit sample with an odd size of 0x18B according to the header, while the real sample size would be 0x18A.
// Always read as many bytes as specified in the header, even if the sample reader would probably read less bytes.
- FileReader sampleChunk = file.GetChunk(sampleSize[sample]);
+ FileReader sampleChunk = file.ReadChunk(sampleSize[sample]);
if(sample < sampleSlots.size())
{
sampleFlags[sample].ReadSample(Samples[sampleSlots[sample]], sampleChunk);
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2014-03-18 01:54:33 UTC (rev 3896)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2014-03-18 08:56:19 UTC (rev 3897)
@@ -833,7 +833,7 @@
FileReader chunk(*patternIter);
PATTERNINDEX pat = chunk.ReadUint8();
size_t patternSize = chunk.ReadUint32LE();
- ConvertAMPattern(chunk.GetChunk(patternSize), pat, isAM, *this);
+ ConvertAMPattern(chunk.ReadChunk(patternSize), pat, isAM, *this);
}
}
@@ -953,7 +953,7 @@
break;
}
- FileReader sampleFileChunk = sampleChunk.GetChunk(sampleHeaderChunk.length);
+ FileReader sampleFileChunk = sampleChunk.ReadChunk(sampleHeaderChunk.length);
AMSampleHeader sampleHeader;
if(!sampleFileChunk.ReadConvertEndianness(sampleHeader))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
