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

fix Namco 163 waves in .ftm import

Browse source 
untested
This commit is contained in:
tildearrow 2024-03-16 11:53:57 -05:00
parent 04f9bc5fa3
commit 92b1c95259
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/engine/fileOps/ftm.cpp
View file

@ -24,7 +24,6 @@
// TODO: // TODO:
// - audit for CVEs // - audit for CVEs
// - Namco 163 waves
// - format code? // - format code?
#include "fileOpsCommon.h" #include "fileOpsCommon.h"
@ -1090,7 +1089,7 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
break; break;
} }
case DIV_INS_N163: { // TODO: add local wavetables and finish this! case DIV_INS_N163: {
unsigned int totalSeqs = reader.readI(); unsigned int totalSeqs = reader.readI();
if (totalSeqs > 5) { if (totalSeqs > 5) {
logE("%d: too many sequences!", insIndex); logE("%d: too many sequences!", insIndex);
@ -1115,6 +1114,7 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
} }
unsigned int wave_count = reader.readI(); unsigned int wave_count = reader.readI();
size_t waveOff = ds.wave.size();
for (unsigned int ii = 0; ii < wave_count; ii++) { for (unsigned int ii = 0; ii < wave_count; ii++) {
DivWavetable* wave = new DivWavetable(); DivWavetable* wave = new DivWavetable();
@ -1126,15 +1126,22 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
wave->data[jj] = val; wave->data[jj] = val;
} }
// TODO: port to global waves if (ds.wave.size()<256) {
//ins->std.local_waves.push_back(wave); ds.wave.push_back(wave);
} else {
delete wave; delete wave;
} }
}
// offset wave macro
if (ins->std.waveMacro.len == 0) // empty wave macro if (ins->std.waveMacro.len == 0) // empty wave macro
{ {
ins->std.waveMacro.len = 1; ins->std.waveMacro.len = 1;
ins->std.waveMacro.val[0] = 0 | (1 << 30); // force local wave number 0 ins->std.waveMacro.val[0] = waveOff;
} else {
for (int p=0; p<ins->std.waveMacro.len; p++) {
ins->std.waveMacro.val[p] += waveOff;
}
} }
break; break;
@ -1475,7 +1482,7 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
logV("tempo %d", tempo); logV("tempo %d", tempo);
if (tempo == 0) { if (tempo == 0) {
s->virtualTempoN = 150.0; // TODO: make it properly s->virtualTempoN = 150.0;
} else { } else {
s->virtualTempoN = tempo; s->virtualTempoN = tempo;
} }