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

#79: .y12 import done

Browse source
This commit is contained in:
James Alan Nguyen 2022-04-24 00:45:19 +10:00
parent b8d9fab745
commit a049e43618
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/engine/fileOpsIns.cpp
View file

@ -650,12 +650,12 @@ void DivEngine::loadY12(SafeReader& reader, std::vector<DivInstrument*>& ret, St
ins->fm.ops = 4;
ins->name = stripPath;
for (int i = 0; i < 4; ++i) {
for (int i : {0,1,2,3}) {
DivInstrumentFM::Operator& insOp = ins->fm.op[i];
uint8_t tmp = reader.readC();
insOp.mult = (tmp & 0xF);
insOp.dt = ((tmp >> 4) & 0x7);
insOp.tl = (reader.readC() & 0xF);
insOp.tl = (reader.readC() & 0x3F);
tmp = reader.readC();
insOp.rs = ((tmp >> 6) & 0x3);
insOp.ar = (tmp & 0x1F);
@ -671,7 +671,7 @@ void DivEngine::loadY12(SafeReader& reader, std::vector<DivInstrument*>& ret, St
}
ins->fm.alg = reader.readC();
ins->fm.fb = reader.readC();
reader.seek(14, SEEK_CUR);
reader.seek(62, SEEK_CUR);
ret.push_back(ins);
} catch (EndOfFileException& e) {
lastError = "premature end of file";