GYBv1/2 working
This commit is contained in:
parent
b9e51ab97f
commit
66b0589959
|
@ -1214,6 +1214,10 @@ void DivEngine::loadGYB(SafeReader& reader, std::vector<DivInstrument*>& ret, St
|
||||||
insMelodyCount = reader.readC();
|
insMelodyCount = reader.readC();
|
||||||
insDrumCount = reader.readC();
|
insDrumCount = reader.readC();
|
||||||
|
|
||||||
|
if (insMelodyCount > 128 || insDrumCount > 128) {
|
||||||
|
throw std::invalid_argument(fmt::sprintf("GYBv1/2 patch count is out of bounds."));
|
||||||
|
}
|
||||||
|
|
||||||
if (!reader.seek(0x100, SEEK_CUR)) { // skip MIDI instrument mapping
|
if (!reader.seek(0x100, SEEK_CUR)) { // skip MIDI instrument mapping
|
||||||
throw EndOfFileException(&reader, reader.tell() + 0x100);
|
throw EndOfFileException(&reader, reader.tell() + 0x100);
|
||||||
}
|
}
|
||||||
|
@ -1224,27 +1228,24 @@ 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) {
|
||||||
// Note: melody and drum patches are interleaved...
|
// TODO determine if a patch is 'empty' -> ignore and move on
|
||||||
|
bool isDrum = (i >= insMelodyCount);
|
||||||
DivInstrument* newIns = readInstrument(reader, (version==2));
|
DivInstrument* newIns = readInstrument(reader, (version==2));
|
||||||
reader.readC(); // skip transpose
|
reader.readC(); // skip transpose
|
||||||
if (version == 2) {
|
if (version == 2) {
|
||||||
reader.readC(); // skip padding
|
reader.readC(); // skip padding
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint8_t nameLen = reader.readC();
|
||||||
|
String insName = (nameLen > 0) ? reader.readString(nameLen) : fmt::sprintf("%s [%d]", stripPath, readCount);
|
||||||
|
|
||||||
|
newIns->name = insName;
|
||||||
insList.push_back(newIns);
|
insList.push_back(newIns);
|
||||||
++readCount;
|
++readCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Instrument name
|
// Map to note assignment currently not supported.
|
||||||
for (int i = 0; i < (insMelodyCount+insDrumCount); ++i) {
|
|
||||||
uint8_t nameLen = reader.readC();
|
|
||||||
String insName = (nameLen > 0) ? reader.readString(nameLen) : fmt::sprintf("%s [%d]", stripPath, readCount);
|
|
||||||
|
|
||||||
// TODO determine if a patch is 'empty' -> ignore and move on
|
|
||||||
if (insList[i] == NULL) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
insList[i]->name = insName;
|
|
||||||
}
|
|
||||||
} else { // GYBv3+
|
} else { // GYBv3+
|
||||||
reader.readC(); // skip LFO speed (chip-global)
|
reader.readC(); // skip LFO speed (chip-global)
|
||||||
uint32_t fileSize = reader.readI();
|
uint32_t fileSize = reader.readI();
|
||||||
|
@ -1291,6 +1292,12 @@ void DivEngine::loadGYB(SafeReader& reader, std::vector<DivInstrument*>& ret, St
|
||||||
delete insList[i];
|
delete insList[i];
|
||||||
}
|
}
|
||||||
is_failed = true;
|
is_failed = true;
|
||||||
|
|
||||||
|
} catch (std::invalid_argument& e) {
|
||||||
|
lastError = fmt::sprintf("Invalid value found in patch file. %s", e.what());
|
||||||
|
logE("Invalid value found in patch file.");
|
||||||
|
logE(e.what());
|
||||||
|
is_failed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_failed) {
|
if (!is_failed) {
|
||||||
|
|
Loading…
Reference in New Issue