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

macro name refactor

Browse source
This commit is contained in:
tildearrow 2023-10-05 23:51:34 -05:00
parent 2f9320ca7a
commit 687fbf5436
5 changed files with 243 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

84
src/engine/instrument.cpp
View file

@ -291,7 +291,7 @@ void DivInstrument::writeFeatureFM(SafeWriter* w, bool fui) {
FEATURE_END;
}
void DivInstrument::writeMacro(SafeWriter* w, const DivInstrumentMacro& m, unsigned char macroCode) {
void DivInstrument::writeMacro(SafeWriter* w, const DivInstrumentMacro& m) {
if (!m.len) return;
// determine word size
@ -314,7 +314,7 @@ void DivInstrument::writeMacro(SafeWriter* w, const DivInstrumentMacro& m, unsig
wordSize=192; // 32-bit signed
}
w->writeC(macroCode);
w->writeC(m.macroType&31);
w->writeC(m.len);
w->writeC(m.loop);
w->writeC(m.rel);
@ -355,26 +355,26 @@ void DivInstrument::writeFeatureMA(SafeWriter* w) {
w->writeS(8);
// write macros
writeMacro(w,std.volMacro,0);
writeMacro(w,std.arpMacro,1);
writeMacro(w,std.dutyMacro,2);
writeMacro(w,std.waveMacro,3);
writeMacro(w,std.pitchMacro,4);
writeMacro(w,std.ex1Macro,5);
writeMacro(w,std.ex2Macro,6);
writeMacro(w,std.ex3Macro,7);
writeMacro(w,std.algMacro,8);
writeMacro(w,std.fbMacro,9);
writeMacro(w,std.fmsMacro,10);
writeMacro(w,std.amsMacro,11);
writeMacro(w,std.panLMacro,12);
writeMacro(w,std.panRMacro,13);
writeMacro(w,std.phaseResetMacro,14);
writeMacro(w,std.ex4Macro,15);
writeMacro(w,std.ex5Macro,16);
writeMacro(w,std.ex6Macro,17);
writeMacro(w,std.ex7Macro,18);
writeMacro(w,std.ex8Macro,19);
writeMacro(w,std.volMacro);
writeMacro(w,std.arpMacro);
writeMacro(w,std.dutyMacro);
writeMacro(w,std.waveMacro);
writeMacro(w,std.pitchMacro);
writeMacro(w,std.ex1Macro);
writeMacro(w,std.ex2Macro);
writeMacro(w,std.ex3Macro);
writeMacro(w,std.algMacro);
writeMacro(w,std.fbMacro);
writeMacro(w,std.fmsMacro);
writeMacro(w,std.amsMacro);
writeMacro(w,std.panLMacro);
writeMacro(w,std.panRMacro);
writeMacro(w,std.phaseResetMacro);
writeMacro(w,std.ex4Macro);
writeMacro(w,std.ex5Macro);
writeMacro(w,std.ex6Macro);
writeMacro(w,std.ex7Macro);
writeMacro(w,std.ex8Macro);
// "stop reading" code
w->writeC(-1);
@ -471,26 +471,26 @@ void DivInstrument::writeFeatureOx(SafeWriter* w, int ope) {
// write macros
const DivInstrumentSTD::OpMacro& o=std.opMacros[ope];
writeMacro(w,o.amMacro,0);
writeMacro(w,o.arMacro,1);
writeMacro(w,o.drMacro,2);
writeMacro(w,o.multMacro,3);
writeMacro(w,o.rrMacro,4);
writeMacro(w,o.slMacro,5);
writeMacro(w,o.tlMacro,6);
writeMacro(w,o.dt2Macro,7);
writeMacro(w,o.rsMacro,8);
writeMacro(w,o.dtMacro,9);
writeMacro(w,o.d2rMacro,10);
writeMacro(w,o.ssgMacro,11);
writeMacro(w,o.damMacro,12);
writeMacro(w,o.dvbMacro,13);
writeMacro(w,o.egtMacro,14);
writeMacro(w,o.kslMacro,15);
writeMacro(w,o.susMacro,16);
writeMacro(w,o.vibMacro,17);
writeMacro(w,o.wsMacro,18);
writeMacro(w,o.ksrMacro,19);
writeMacro(w,o.amMacro);
writeMacro(w,o.arMacro);
writeMacro(w,o.drMacro);
writeMacro(w,o.multMacro);
writeMacro(w,o.rrMacro);
writeMacro(w,o.slMacro);
writeMacro(w,o.tlMacro);
writeMacro(w,o.dt2Macro);
writeMacro(w,o.rsMacro);
writeMacro(w,o.dtMacro);
writeMacro(w,o.d2rMacro);
writeMacro(w,o.ssgMacro);
writeMacro(w,o.damMacro);
writeMacro(w,o.dvbMacro);
writeMacro(w,o.egtMacro);
writeMacro(w,o.kslMacro);
writeMacro(w,o.susMacro);
writeMacro(w,o.vibMacro);
writeMacro(w,o.wsMacro);
writeMacro(w,o.ksrMacro);
// "stop reading" code
w->writeC(-1);