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

#79: OPM complete for now

Browse source
This commit is contained in:
James Alan Nguyen 2022-04-23 21:48:18 +10:00
parent 3550ad512a
commit 8ad827478c
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/engine/fileOpsIns.cpp
View file

@ -839,18 +839,23 @@ void DivEngine::loadOPM(SafeReader& reader, std::vector<DivInstrument*>& ret, St
patchNameRead = lfoRead = characteristicRead = m1Read = c1Read = m2Read = c2Read = false; patchNameRead = lfoRead = characteristicRead = m1Read = c1Read = m2Read = c2Read = false;
newPatch = nullptr; newPatch = nullptr;
}; };
auto readOpmOperator = [](SafeReader& reader, DivInstrumentFM::Operator& op) { auto readIntStrWithinRange = [](String& input, int limitLow, int limitHigh) {
op.ar = atoi(reader.readString_Token().c_str()); int x = atoi(input.c_str());
op.dr = atoi(reader.readString_Token().c_str()); return (x>limitHigh) ? limitHigh :
op.d2r = atoi(reader.readString_Token().c_str()); (x<limitLow) ? limitLow : x;
op.rr = atoi(reader.readString_Token().c_str()); };
op.sl = atoi(reader.readString_Token().c_str()); auto readOpmOperator = [readIntStrWithinRange](SafeReader& reader, DivInstrumentFM::Operator& op) {
op.tl = atoi(reader.readString_Token().c_str()); op.ar = readIntStrWithinRange(reader.readString_Token(), 0, 31);
op.ksl = atoi(reader.readString_Token().c_str()); op.dr = readIntStrWithinRange(reader.readString_Token(), 0, 31);
op.mult = atoi(reader.readString_Token().c_str()); op.d2r = readIntStrWithinRange(reader.readString_Token(), 0, 31);
op.dt = atoi(reader.readString_Token().c_str()); op.rr = readIntStrWithinRange(reader.readString_Token(), 0, 31);
op.dt2 = atoi(reader.readString_Token().c_str()); op.sl = readIntStrWithinRange(reader.readString_Token(), 0, 15);
op.ssgEnv = atoi(reader.readString_Token().c_str()); op.tl = readIntStrWithinRange(reader.readString_Token(), 0, 127);
op.rs = readIntStrWithinRange(reader.readString_Token(), 0, 3);;
op.mult = readIntStrWithinRange(reader.readString_Token(), 0, 15);
op.dt = readIntStrWithinRange(reader.readString_Token(), -3, 4);
op.dt2 = readIntStrWithinRange(reader.readString_Token(), 0, 3);
op.am = readIntStrWithinRange(reader.readString_Token(), 0, 1);
}; };
try { try {
@ -875,22 +880,24 @@ void DivEngine::loadOPM(SafeReader& reader, std::vector<DivInstrument*>& ret, St
newPatch->fm.ops = 4; newPatch->fm.ops = 4;
} }
// Read each line for their respective params. They may not be written in the same order but they // Read each line for their respective params. They may not be written in the same LINE order but they
// must absolutely be properly grouped per patch! Line prefixes must be separated by a space! // must absolutely be properly grouped per patch! Line prefixes must be separated by a space!
// Patch number + name
// "@:123 Name of patch"
if (token.length() >= 2) { if (token.length() >= 2) {
if (token[0] == '@') { if (token[0] == '@') {
// @:123 Name of patch
// Note: Fallback to bank filename and current patch number in _file_ order (not @n order)
newPatch->name = reader.readString_Line(); newPatch->name = reader.readString_Line();
newPatch->name = newPatch->name.length() > 0 ? newPatch->name : fmt::format("{0}[{1}]", stripPath, readCount);
patchNameRead = true; patchNameRead = true;
} else if (token.compare(0,3,"CH:") == 0) { } else if (token.compare(0,3,"CH:") == 0) {
// CH: PAN FL CON AMS PMS SLOT NE // CH: PAN FL CON AMS PMS SLOT NE
reader.readString_Token(); // skip PAN reader.readString_Token(); // skip PAN
newPatch->fm.fb = atoi(reader.readString_Token().c_str()); newPatch->fm.fb = readIntStrWithinRange(reader.readString_Token(), 0, 7);
newPatch->fm.alg = atoi(reader.readString_Token().c_str()); newPatch->fm.alg = readIntStrWithinRange(reader.readString_Token(), 0, 7);
newPatch->fm.ams = atoi(reader.readString_Token().c_str()); newPatch->fm.ams = readIntStrWithinRange(reader.readString_Token(), 0, 4);
newPatch->fm.ams2 = atoi(reader.readString_Token().c_str()); newPatch->fm.fms = readIntStrWithinRange(reader.readString_Token(), 0, 7);
reader.readString_Token(); // skip SLOT reader.readString_Token(); // skip SLOT
reader.readString_Token(); // skip NE reader.readString_Token(); // skip NE
characteristicRead = true; characteristicRead = true;
@ -912,7 +919,7 @@ void DivEngine::loadOPM(SafeReader& reader, std::vector<DivInstrument*>& ret, St
m2Read = true; m2Read = true;
} else if (token.compare(0,4,"LFO:") == 0) { } else if (token.compare(0,4,"LFO:") == 0) {
// LFO: LFRQ AMD PMD WF NFRQ // LFO: LFRQ AMD PMD WF NFRQ
// Furnace patches do not store this as these are chip-global. // Furnace patches do not store these as these are chip-global.
reader.readString_Line(); reader.readString_Line();
lfoRead = true; lfoRead = true;
} else { } else {