etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compilerscheiße pedantisch uberprufen

This commit is contained in:
James Alan Nguyen 2022-05-09 21:43:03 +10:00
parent da6a6f514c
commit 0e077432fc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/engine/fileOpsIns.cpp
View File

@ -683,7 +683,7 @@ void DivEngine::loadOPLI(SafeReader& reader, std::vector<DivInstrument*>& ret, S
String header = reader.readString(11); String header = reader.readString(11);
if (header == "WOPL3-INST") { if (header == "WOPL3-INST") {
uint16_t version = reader.readS(); reader.readS(); // skip version (presently no difference here)
reader.readC(); // skip isPerc field reader.readC(); // skip isPerc field
ins->type = DIV_INS_OPL; ins->type = DIV_INS_OPL;
@ -907,7 +907,7 @@ void DivEngine::loadBNK(SafeReader& reader, std::vector<DivInstrument*>& ret, St
ins->fm.ops = 2; ins->fm.ops = 2;
uint8_t timbreMode = reader.readC(); uint8_t timbreMode = reader.readC();
uint8_t timbrePercVoice = reader.readC(); reader.readC(); // skip timbre perc voice
if (timbreMode == 1) { if (timbreMode == 1) {
ins->fm.opllPreset = (uint8_t)(1<<4); ins->fm.opllPreset = (uint8_t)(1<<4);
} }
@ -1144,8 +1144,7 @@ void DivEngine::loadGYB(SafeReader& reader, std::vector<DivInstrument*>& ret, St
// Instrument data // Instrument data
for (int i = 0; i < (insMelodyCount+insDrumCount); ++i) { for (int i = 0; i < (insMelodyCount+insDrumCount); ++i) {
bool isDrum = (i >= insMelodyCount); readInstrument(reader, (version == 2));
DivInstrument* newIns = readInstrument(reader, (version == 2));
// Additional data // Additional data
reader.readC(); // skip transpose reader.readC(); // skip transpose
@ -1179,9 +1178,9 @@ void DivEngine::loadGYB(SafeReader& reader, std::vector<DivInstrument*>& ret, St
uint16_t insCount = reader.readS(); uint16_t insCount = reader.readS();
for (int i = 0; i < insCount; ++i) { for (int i = 0; i < insCount; ++i) {
uint16_t patchPos = reader.tell(); reader.tell(); // skip patchPosOffset
uint16_t patchSize = reader.readS(); reader.readS(); // skip patchSize
DivInstrument* newIns = readInstrument(reader, true); readInstrument(reader, true);
// Additional data // Additional data
reader.readC(); // skip transpose reader.readC(); // skip transpose