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

did I just make an instrument loader

This commit is contained in:
tildearrow 2022-02-01 01:21:51 -05:00
parent 227fff021e
commit de931c1d2f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/engine/engine.cpp
View File

@ -760,7 +760,7 @@ const char* DivEngine::getEffectDesc(unsigned char effect, int chan) {
if (warnings.empty()) { \
warnings+=x; \
} else { \
warnings+=("\n" x); \
warnings+=(String("\n")+x); \
}
bool DivEngine::loadDMF(unsigned char* file, size_t len) {
@ -4480,7 +4480,13 @@ bool DivEngine::addInstrumentFromFile(const char *path) {
}
if (mode) { // FM
if (version<10) ins->fm.ops=reader.readC()?2:4;
if (version<10) {
if (version>1) {
ins->fm.ops=reader.readC()?4:2;
} else {
ins->fm.ops=reader.readC()?2:4;
}
}
if (version>1) { // HELP! in which version of the format did we start storing FMS!
ins->fm.fms=reader.readC();
}
@ -4637,6 +4643,12 @@ bool DivEngine::addInstrumentFromFile(const char *path) {
delete[] buf;
return false;
}
if (reader.tell()<reader.size()) {
addWarning("https://github.com/tildearrow/furnace/issues/84");
addWarning("there is more data at the end of the file! what happened here!");
addWarning(fmt::sprintf("exactly %d bytes, if you are curious",reader.size()-reader.tell()));
}
}
isBusy.lock();