otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

XM import: fix sample loading

Browse source 
it appears the sample headers are contiguous
This commit is contained in:
tildearrow 2024-06-30 18:36:58 -05:00
parent ca84363309
commit ec4131a872
1 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/engine/fileOps/xm.cpp
View file

@ -311,10 +311,19 @@ bool DivEngine::loadXM(unsigned char* file, size_t len) {
} }
// read samples for this instrument // read samples for this instrument
std::vector<DivSample*> toAdd;
for (int j=0; j<sampleCount; j++) { for (int j=0; j<sampleCount; j++) {
DivSample* s=new DivSample; DivSample* s=new DivSample;
unsigned int numSamples=reader.readI(); unsigned int numSamples=reader.readI();
if (numSamples>16777216) {
logE("abnormal sample size! %x",reader.tell());
lastError="bad sample size";
delete s;
delete[] file;
return false;
}
s->loopStart=reader.readI(); s->loopStart=reader.readI();
s->loopEnd=reader.readI()+s->loopStart; s->loopEnd=reader.readI()+s->loopStart;
@ -344,26 +353,43 @@ bool DivEngine::loadXM(unsigned char* file, size_t len) {
reader.readC(); // reserved reader.readC(); // reserved
s->name=reader.readStringLatin1(22); s->name=reader.readStringLatin1(22);
// load sample data
s->depth=(flags&4)?DIV_SAMPLE_DEPTH_16BIT:DIV_SAMPLE_DEPTH_8BIT; s->depth=(flags&4)?DIV_SAMPLE_DEPTH_16BIT:DIV_SAMPLE_DEPTH_8BIT;
s->init(numSamples); s->init(numSamples);
// seek here???
toAdd.push_back(s);
}
for (int j=0; j<sampleCount; j++) {
DivSample* s=toAdd[j];
// load sample data
if (s->depth==DIV_SAMPLE_DEPTH_16BIT) { if (s->depth==DIV_SAMPLE_DEPTH_16BIT) {
short next=0; short next=0;
for (unsigned int i=0; i<numSamples; i++) { for (unsigned int i=0; i<s->samples; i++) {
next+=reader.readS(); next+=reader.readS();
s->data16[i]=next; s->data16[i]=next;
} }
} else { } else {
signed char next=0; signed char next=0;
for (unsigned int i=0; i<numSamples; i++) { for (unsigned int i=0; i<s->samples; i++) {
next+=reader.readC(); next+=reader.readC();
s->data8[i]=next; s->data8[i]=next;
} }
} }
}
ds.sample.push_back(s); for (DivSample* i: toAdd) {
ds.sample.push_back(i);
}
toAdd.clear();
} else {
if (!reader.seek(headerSeek,SEEK_SET)) {
logE("premature end of file!");
lastError="incomplete file";
delete[] file;
return false;
} }
} }