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

Fix another bug in the RLE decompressor, parsing instruments now

Browse source
This commit is contained in:
techmetx11 2024-04-10 18:37:52 +00:00
parent 9f26257364
commit 9bbd673bfa
No known key found for this signature in database
GPG key ID: 20E0C88A0E7E5AF2
1 changed files with 67 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/engine/fileOps/tfm.cpp
View file

@ -47,10 +47,9 @@ class TFMRLEReader {
tagLenLeft|=(rleTag&0x7F)<<lenShift;
lenShift+=7;
logD("RLE tag: %X, len shift: %d, len left: %d",rleTag,lenShift,tagLenLeft);
} while (!(rleTag&0x80));
// sync back since we've already read one character
tagLenLeft--;
} while (!(rleTag&0x80));
inTag=true;
tagChar=prevChar;
}
@ -133,6 +132,10 @@ public:
curSeek+=2;
return ret;
}
void skip(size_t l) {
while (l--) readC();
}
};
String TFMparseDate(short date) {
@ -225,6 +228,55 @@ bool DivEngine::loadTFM(unsigned char* file, size_t len) {
}
}
DivInstrument* insMaps[256];
// instrument names
logD("parsing instruments");
unsigned char insName[16];
int insCount=0;
for (int i=0; i<255; i++) {
reader.read(insName,16);
if (memcmp(insName,"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF",16)==0) {
logD("instrument unused");
insMaps[i]=NULL;
continue;
}
DivInstrument* ins=new DivInstrument;
ins->type=DIV_INS_FM;
ins->name=String((const char*)insName,strnlen((const char*)insName,16));
ds.ins.push_back(ins);
insCount++;
insMaps[i]=ins;
}
ds.insLen=insCount;
// instrument data
for (int i=0; i<255; i++) {
if (!insMaps[i]) {
reader.skip(42);
continue;
}
insMaps[i]->fm.alg=reader.readC();
insMaps[i]->fm.fb=reader.readC();
for (int j=0; j<4; j++) {
insMaps[i]->fm.op[j].mult=reader.readC();
insMaps[i]->fm.op[j].dt=reader.readC();
insMaps[i]->fm.op[j].tl=reader.readC()^0x7F;
insMaps[i]->fm.op[j].rs=reader.readC();
insMaps[i]->fm.op[j].ar=reader.readC()^0x1F;
insMaps[i]->fm.op[j].dr=reader.readC()^0x1F;
insMaps[i]->fm.op[j].d2r=reader.readC()^0x1F;
insMaps[i]->fm.op[j].rr=reader.readC()^0xF;
insMaps[i]->fm.op[j].sl=reader.readC();
insMaps[i]->fm.op[j].ssgEnv=reader.readC();
}
}
ds.notes=notes;
BUSY_BEGIN_SOFT;
saveLock.lock();