Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4532] trunk/OpenMPT/soundlib
|
From: <sag...@us...> - 2014-11-01 21:02:06
|
Revision: 4532
http://sourceforge.net/p/modplug/code/4532
Author: saga-games
Date: 2014-11-01 21:01:50 +0000 (Sat, 01 Nov 2014)
Log Message:
-----------
[Ref] Make CPatternContainer::Insert return true on success instead of failure.
Modified Paths:
--------------
trunk/OpenMPT/soundlib/Load_669.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_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_mdl.cpp
trunk/OpenMPT/soundlib/Load_med.cpp
trunk/OpenMPT/soundlib/Load_mid.cpp
trunk/OpenMPT/soundlib/Load_mod.cpp
trunk/OpenMPT/soundlib/Load_mt2.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_s3m.cpp
trunk/OpenMPT/soundlib/Load_stm.cpp
trunk/OpenMPT/soundlib/Load_ult.cpp
trunk/OpenMPT/soundlib/Load_wav.cpp
trunk/OpenMPT/soundlib/Load_xm.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
trunk/OpenMPT/soundlib/patternContainer.cpp
trunk/OpenMPT/soundlib/patternContainer.h
Modified: trunk/OpenMPT/soundlib/Load_669.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_669.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_669.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -155,7 +155,7 @@
// Reading Patterns
for(PATTERNINDEX pat = 0; pat < fileHeader.patterns; pat++)
{
- if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, 64))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, 64))
{
file.Skip(64 * 8 * 3);
continue;
Modified: trunk/OpenMPT/soundlib/Load_amf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_amf.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_amf.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -149,7 +149,7 @@
// Read Patterns
for(PATTERNINDEX pat = 0; pat < fileHeader.numPatterns; pat++)
{
- if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, 64))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, 64))
{
file.Skip(64 * 4 * 8);
continue;
@@ -568,7 +568,7 @@
// Create the patterns from the list of tracks
for(PATTERNINDEX pat = 0; pat < fileHeader.numOrders; pat++)
{
- if(Patterns.Insert(pat, patternLength[pat]))
+ if(!Patterns.Insert(pat, patternLength[pat]))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_ams.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ams.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_ams.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -442,7 +442,7 @@
char name[11];
ReadAMSString(name, file);
// Create pattern now, so name won't be reset later.
- if(!Patterns.Insert(pat, 64))
+ if(Patterns.Insert(pat, 64))
{
Patterns[pat].SetName(name);
}
@@ -966,7 +966,7 @@
// We don't need to know the number of channels or commands.
patternChunk.Skip(1);
- if(Patterns.Insert(pat, numRows))
+ if(!Patterns.Insert(pat, numRows))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_dbm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_dbm.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_dbm.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -429,7 +429,7 @@
uint32 packedSize = patternChunk.ReadUint32BE();
FileReader chunk = patternChunk.ReadChunk(packedSize);
- if(Patterns.Insert(pat, numRows))
+ if(!Patterns.Insert(pat, numRows))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_digi.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_digi.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_digi.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -158,7 +158,7 @@
patternChunk = file.ReadChunk(4 * 64 * GetNumChannels());
}
- if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, 64))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, 64))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_dsm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_dsm.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_dsm.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -208,7 +208,7 @@
if(!memcmp(chunkHeader.magic, "PATT", 4) && (loadFlags & loadPatternData))
{
// Read pattern
- if(Patterns.Insert(patNum, 64))
+ if(!Patterns.Insert(patNum, 64))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_far.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_far.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_far.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -221,7 +221,7 @@
// Calculate pattern length in rows (every event is 4 bytes, and we have 16 channels)
ROWINDEX numRows = (orderHeader.patternSize[pat] - 2) / (16 * 4);
- if(!(loadFlags & loadPatternData) || !numRows || numRows > MAX_PATTERN_ROWS || Patterns.Insert(pat, numRows))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, numRows))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_gdm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_gdm.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_gdm.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -305,7 +305,7 @@
}
FileReader chunk = file.ReadChunk(patternLength - 2);
- if(!(loadFlags & loadPatternData) || !chunk.IsValid() || Patterns.Insert(pat, 64))
+ if(!(loadFlags & loadPatternData) || !chunk.IsValid() || !Patterns.Insert(pat, 64))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_imf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_imf.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_imf.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -483,7 +483,7 @@
const uint16 length = file.ReadUint16LE(), numRows = file.ReadUint16LE();
FileReader patternChunk = file.ReadChunk(length - 4);
- if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, numRows))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, numRows))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -787,7 +787,7 @@
if(patPos[pat] == 0 || !file.Seek(patPos[pat]))
{
// Empty 64-row pattern
- if(Patterns.Insert(pat, 64))
+ if(!Patterns.Insert(pat, 64))
{
AddToLog(mpt::String::Print("Allocating patterns failed starting from pattern %1", pat));
break;
@@ -803,7 +803,7 @@
if(numRows < GetModSpecifications().patternRowsMin
|| numRows > GetModSpecifications().patternRowsMax
|| !file.Skip(4)
- || Patterns.Insert(pat, numRows))
+ || !Patterns.Insert(pat, numRows))
continue;
FileReader patternData = file.ReadChunk(len);
Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -178,7 +178,7 @@
FileReader patternChunk = file.ReadChunk(numRows * size * GetNumChannels());
// Allocate pattern
- if(!(loadFlags & loadPatternData) || numRows == 0 || numRows > MAX_PATTERN_ROWS || Patterns.Insert(pat, numRows))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, numRows))
{
pattNames.Skip(patNameLen);
continue;
Modified: trunk/OpenMPT/soundlib/Load_mdl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mdl.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_mdl.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -645,7 +645,7 @@
{
for (UINT ipat=0; ipat<npatterns; ipat++)
{
- if(Patterns.Insert(ipat, patternLength[ipat]))
+ if(!Patterns.Insert(ipat, patternLength[ipat]))
{
break;
}
Modified: trunk/OpenMPT/soundlib/Load_med.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_med.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -864,7 +864,7 @@
lines = pmb->lines + 1;
tracks = pmb->numtracks;
if (!tracks) tracks = m_nChannels;
- if(Patterns.Insert(iBlk, lines)) continue;
+ if(!Patterns.Insert(iBlk, lines)) continue;
ModCommand *p = Patterns[iBlk];
const uint8 * s = (const uint8 *)(lpStream + dwPos + 2);
UINT maxlen = tracks*lines*3;
Modified: trunk/OpenMPT/soundlib/Load_mid.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mid.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_mid.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -616,7 +616,7 @@
do
{
// Allocate current pattern if not allocated yet
- if (!Patterns[pat] && Patterns.Insert(pat, importPatternLen))
+ if (!Patterns[pat] && !Patterns.Insert(pat, importPatternLen))
{
break;
}
Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -662,7 +662,7 @@
if((pat % 2u) == 0)
{
// Only create "even" patterns for FLT8 files
- if(!(loadFlags & loadPatternData) || Patterns.Insert(pat / 2, 64))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat / 2, 64))
{
file.Skip(readChannels * 64 * 4);
continue;
@@ -671,7 +671,7 @@
actualPattern /= 2;
} else
{
- if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, 64))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, 64))
{
file.Skip(readChannels * 64 * 4);
continue;
@@ -986,7 +986,7 @@
// Reading patterns
for(PATTERNINDEX pat = 0; pat < numPatterns; pat++)
{
- if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, 64))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, 64))
{
file.Skip(64 * 4 * 4);
continue;
@@ -1203,7 +1203,7 @@
for(PATTERNINDEX pat = 0; pat < numOrders; pat++)
{
Order[pat] = pat;
- if(Patterns.Insert(pat, 64))
+ if(!Patterns.Insert(pat, 64))
continue;
for(CHANNELINDEX chn = 0; chn < 4; chn++)
Modified: trunk/OpenMPT/soundlib/Load_mt2.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mt2.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_mt2.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -487,7 +487,7 @@
LimitMax(numRows, MAX_PATTERN_ROWS);
if(!numRows
|| !(loadFlags & loadPatternData)
- || Patterns.Insert(pat, numRows))
+ || !Patterns.Insert(pat, numRows))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_mtm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mtm.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_mtm.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -152,7 +152,7 @@
for(PATTERNINDEX pat = 0; pat <= fileHeader.lastPattern; pat++)
{
- if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, rowsPerPat))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, rowsPerPat))
{
break;
}
Modified: trunk/OpenMPT/soundlib/Load_okt.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_okt.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_okt.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -124,7 +124,7 @@
ROWINDEX rows = Clamp(static_cast<ROWINDEX>(chunk.ReadUint16BE()), ROWINDEX(1), MAX_PATTERN_ROWS);
- if(sndFile.Patterns.Insert(nPat, rows))
+ if(!sndFile.Patterns.Insert(nPat, rows))
{
return;
}
Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -665,7 +665,7 @@
uint16 numRows = patternChunk.ReadUint16LE();
- if(Patterns.Insert(pat, numRows))
+ if(!Patterns.Insert(pat, numRows))
{
break;
}
@@ -1225,7 +1225,7 @@
// Patterns are padded to 16 Bytes
FileReader patternChunk = file.ReadChunk(((patternHeader.size + 15) & ~15) - sizeof(PSM16PatternHeader));
- if(Patterns.Insert(pat, patternHeader.numRows))
+ if(!Patterns.Insert(pat, patternHeader.numRows))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_ptm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ptm.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_ptm.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -204,7 +204,7 @@
for(PATTERNINDEX pat = 0; pat < fileHeader.numPatterns; pat++)
{
- if(Patterns.Insert(pat, 64)
+ if(!Patterns.Insert(pat, 64)
|| fileHeader.patOffsets[pat] == 0
|| !file.Seek(fileHeader.patOffsets[pat] << 4))
{
Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -425,7 +425,7 @@
for(PATTERNINDEX pat = 0; pat < readPatterns; pat++)
{
// A zero parapointer indicates an empty pattern.
- if(Patterns.Insert(pat, 64) || patternOffsets[pat] == 0 || !file.Seek(patternOffsets[pat] * 16))
+ if(!Patterns.Insert(pat, 64) || patternOffsets[pat] == 0 || !file.Seek(patternOffsets[pat] * 16))
{
continue;
}
Modified: trunk/OpenMPT/soundlib/Load_stm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_stm.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_stm.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -204,7 +204,7 @@
{
STMPatternData patternData;
- if(!(loadFlags & loadPatternData) || Patterns.Insert(pat, 64) || !file.ReadConvertEndianness(patternData))
+ if(!(loadFlags & loadPatternData) || !Patterns.Insert(pat, 64) || !file.ReadConvertEndianness(patternData))
{
file.Skip(sizeof(patternData));
continue;
Modified: trunk/OpenMPT/soundlib/Load_ult.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ult.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_ult.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -452,7 +452,7 @@
for(PATTERNINDEX pat = 0; pat < numPats; pat++)
{
- if(Patterns.Insert(pat, 64))
+ if(!Patterns.Insert(pat, 64))
return false;
}
Modified: trunk/OpenMPT/soundlib/Load_wav.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_wav.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_wav.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -62,7 +62,7 @@
InitializeGlobals();
m_nChannels = std::max(wavFile.GetNumChannels(), uint16(2));
- if(Patterns.Insert(0, 64) || Patterns.Insert(1, 64))
+ if(!Patterns.Insert(0, 64) || !Patterns.Insert(1, 64))
{
return false;
}
Modified: trunk/OpenMPT/soundlib/Load_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -155,7 +155,7 @@
file.Seek(curPos + headerSize);
FileReader patternChunk = file.ReadChunk(packedSize);
- if(sndFile.Patterns.Insert(pat, numRows) || packedSize == 0)
+ if(!sndFile.Patterns.Insert(pat, numRows) || packedSize == 0)
{
continue;
}
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -622,7 +622,7 @@
ROWINDEX numRows = Clamp(static_cast<ROWINDEX>(chunk.ReadUint8()) + 1, ROWINDEX(1), MAX_PATTERN_ROWS);
- if(sndFile.Patterns.Insert(pat, numRows))
+ if(!sndFile.Patterns.Insert(pat, numRows))
return false;
const CHANNELINDEX channels = sndFile.GetNumChannels();
Modified: trunk/OpenMPT/soundlib/patternContainer.cpp
===================================================================
--- trunk/OpenMPT/soundlib/patternContainer.cpp 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/patternContainer.cpp 2014-11-01 21:01:50 UTC (rev 4532)
@@ -66,7 +66,7 @@
PATTERNINDEX i = 0;
for(i = 0; i < m_Patterns.size(); i++)
if(!m_Patterns[i]) break;
- if(Insert(i, rows))
+ if(!Insert(i, rows))
return PATTERNINDEX_INVALID;
else return i;
Modified: trunk/OpenMPT/soundlib/patternContainer.h
===================================================================
--- trunk/OpenMPT/soundlib/patternContainer.h 2014-11-01 20:27:32 UTC (rev 4531)
+++ trunk/OpenMPT/soundlib/patternContainer.h 2014-11-01 21:01:50 UTC (rev 4532)
@@ -49,7 +49,7 @@
void DestroyPatterns();
//Insert (default)pattern to given position. If pattern already exists at that position,
- //ignoring request. Returns true on failure, false otherwise.
+ //ignoring request. Returns true on success, false otherwise.
bool Insert(const PATTERNINDEX index, const ROWINDEX rows);
//Insert pattern to position with the lowest index, and return that index, PATTERNINDEX_INVALID
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
