From 9da46ee8ba0850d6e0671e91b15409a9fe3e5da9 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 17 Dec 2022 00:09:56 -0500 Subject: [PATCH] implement macro masking --- papers/doc/3-pattern/effects.md | 72 ++++++ src/engine/dispatch.h | 3 + src/engine/engine.cpp | 6 + src/engine/macroInt.cpp | 66 ++++++ src/engine/macroInt.h | 8 +- src/engine/platform/amiga.cpp | 6 + src/engine/platform/arcade.cpp | 6 + src/engine/platform/ay.cpp | 6 + src/engine/platform/ay8930.cpp | 6 + src/engine/platform/bubsyswsg.cpp | 6 + src/engine/platform/c64.cpp | 6 + src/engine/platform/fds.cpp | 6 + src/engine/platform/ga20.cpp | 6 + src/engine/platform/gb.cpp | 6 + src/engine/platform/genesis.cpp | 6 + src/engine/platform/genesisext.cpp | 6 + src/engine/platform/k007232.cpp | 6 + src/engine/platform/lynx.cpp | 6 + src/engine/platform/mmc5.cpp | 6 + src/engine/platform/msm5232.cpp | 6 + src/engine/platform/msm6258.cpp | 6 + src/engine/platform/msm6295.cpp | 6 + src/engine/platform/n163.cpp | 6 + src/engine/platform/namcowsg.cpp | 6 + src/engine/platform/nes.cpp | 6 + src/engine/platform/opl.cpp | 6 + src/engine/platform/opll.cpp | 6 + src/engine/platform/pce.cpp | 6 + src/engine/platform/pcmdac.cpp | 340 +++++++++++++++-------------- src/engine/platform/pcmdac.h | 2 +- src/engine/platform/pcspkr.cpp | 6 + src/engine/platform/pet.cpp | 192 ++++++++-------- src/engine/platform/pet.h | 2 +- src/engine/platform/pokemini.cpp | 6 + src/engine/platform/pong.cpp | 6 + src/engine/platform/qsound.cpp | 6 + src/engine/platform/rf5c68.cpp | 6 + src/engine/platform/saa.cpp | 6 + src/engine/platform/scc.cpp | 6 + src/engine/platform/segapcm.cpp | 6 + src/engine/platform/sms.cpp | 6 + src/engine/platform/snes.cpp | 6 + src/engine/platform/su.cpp | 6 + src/engine/platform/swan.cpp | 6 + src/engine/platform/t6w28.cpp | 6 + src/engine/platform/tia.cpp | 6 + src/engine/platform/tx81z.cpp | 6 + src/engine/platform/vb.cpp | 6 + src/engine/platform/vera.cpp | 6 + src/engine/platform/vic20.cpp | 6 + src/engine/platform/vrc6.cpp | 6 + src/engine/platform/x1_010.cpp | 6 + src/engine/platform/ym2203.cpp | 6 + src/engine/platform/ym2203ext.cpp | 6 + src/engine/platform/ym2608.cpp | 6 + src/engine/platform/ym2608ext.cpp | 6 + src/engine/platform/ym2610.cpp | 6 + src/engine/platform/ym2610b.cpp | 6 + src/engine/platform/ym2610bext.cpp | 6 + src/engine/platform/ym2610ext.cpp | 6 + src/engine/platform/ymz280b.cpp | 6 + src/engine/platform/zxbeeper.cpp | 6 + src/engine/playback.cpp | 15 +- src/gui/guiConst.cpp | 4 +- 64 files changed, 760 insertions(+), 268 deletions(-) diff --git a/papers/doc/3-pattern/effects.md b/papers/doc/3-pattern/effects.md index 1fa4755bb..9965d22c4 100644 --- a/papers/doc/3-pattern/effects.md +++ b/papers/doc/3-pattern/effects.md @@ -65,6 +65,9 @@ however, effects are continuous, which means you only need to type it once and t - `F2xx`: single tick slide down. - `F3xx`: fine volume slide up (64x slower than `0Axy`). - `F4xx`: fine volume slide down (64x slower than `0Axy`). +- `F5xx`: disable macro. + - see macro table at the end of this document for possible values. +- `F6xx`: enable macro. - `F8xx`: single tick volume slide up. - `F9xx`: single tick volume slide down. - `FAxy`: fast volume slide (4x faster than `0Axy`). @@ -73,3 +76,72 @@ however, effects are continuous, which means you only need to type it once and t - `FFxx`: end of song/stop playback. additionally each chip has its own effects. [click here for more details](../7-systems/README.md). + +## macro table + +ID | macro +---|----------------------------- +00 | volume +01 | arpeggio +02 | duty/noise +03 | waveform +04 | pitch +05 | extra 1 +06 | extra 2 +07 | extra 3 +08 | extra A (ALG) +09 | extra B (FM) +0A | extra C (FMS) +0B | extra D (AMS) +0C | panning left +0D | panning right +0E | phase reset +0F | extra 4 +10 | extra 5 +11 | extra 6 +12 | extra 7 +13 | extra 8 +---|----------------------------- +20 | **operator 1 macros** - AM +21 | AR +22 | DR +23 | MULT +24 | RR +25 | SL +26 | TL +27 | DT2 +28 | RS +29 | DT +2A | D2R +2B | SSG-EG +2C | DAM +2D | DVB +2E | EGT +2F | KSL +30 | SUS +31 | VIB +32 | WS +33 | KSR +---|----------------------------- +40 | operator 2 macros +60 | operator 2 macros +80 | operator 2 macros + +the interpretation of duty, wave and extra macros depends on chip/instrument type: + +ex | FM | OPM | OPZ | OPLL | AY-3-8910 | AY8930 | Lynx | C64 | SAA1099 | X1-010 | Namco 163 | FDS | Sound Unit | ES5506 | MSM6258 | QSound | SNES | MSM5232 | +---|--------|-----------|-----------|-------|------------|------------|----------|------------|----------|------------|------------|-----------|------------|-----------|----------|--------------|-----------|-----------| + D | NoiseF | NoiseFreq | | | NoiseFreq | NoiseFreq | Duty/Int | Duty | | | Wave Pos | | Duty | Filt Mode | FreqDiv | Echo Level | NoiseFreq | GroupCtrl | + W | | LFO Shape | LFO Shape | Patch | Waveform | Waveform | | Waveform | Waveform | Waveform | Waveform | Waveform | Waveform | | | | Waveform | | + 1 | | AMD | AMD | | | Duty | | FilterMode | Envelope | EnvMode | WaveLen | Mod Depth | Cutoff | Filter K1 | ClockDiv | EchoFeedback | Special | GroupAtk | + 2 | | PMD | PMD | | Envelope | Envelope | | Resonance | | Envelope | WaveUpdate | Mod Speed | Resonance | Filter K2 | | Echo Length | Gain | GroupDec | + 3 | | LFO Speed | LFO Speed | | AutoEnvNum | AutoEnvNum | | Special | | AutoEnvNum | WaveLoad W | | Control | Env Count | | | | Noise | + A | ALG | ALG | ALG | | AutoEnvDen | AutoEnvDen | | | | AutoEnvDen | WaveLoad P | | | Control | | | | | + B | FB | FB | FB | | | Noise AND | | | | | WaveLoad L | | | | | | | | + C | FMS | FMS | FMS | | | Noise OR | | | | | WaveLoad T | | | | | | | | + D | AMS | AMS | AMS | | | | | | | | | | | | | | | | + 4 | OpMask | OpMask | | | | | | Test/Gate | | | | | PResetTime | EnvRampL | | | | | + 5 | | | AMD2 | | | | | | | | | | | EnvRampR | | | | | + 6 | | | PMD2 | | | | | | | | | | | EnvRampK1 | | | | | + 7 | | | LFO2Speed | | | | | | | | | | | EnvRampK2 | | | | | + 8 | | | LFO2Shape | | | | | | | | | | | Env Mode | | | | | \ No newline at end of file diff --git a/src/engine/dispatch.h b/src/engine/dispatch.h index 6a13689c2..59b696758 100644 --- a/src/engine/dispatch.h +++ b/src/engine/dispatch.h @@ -210,6 +210,9 @@ enum DivDispatchCmds { DIV_CMD_NES_LENGTH, DIV_CMD_NES_COUNT_MODE, + DIV_CMD_MACRO_OFF, // (which) + DIV_CMD_MACRO_ON, // (which) + DIV_ALWAYS_SET_VOLUME, // () -> alwaysSetVol DIV_CMD_MAX diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 8e684ddaf..7e6099466 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -113,6 +113,10 @@ const char* DivEngine::getEffectDesc(unsigned char effect, int chan, bool notNul return "F3xx: Fine volume slide up"; case 0xf4: return "F4xx: Fine volume slide down"; + case 0xf5: + return "F5xx: Disable macro (see manual)"; + case 0xf6: + return "F6xx: Enable macro (see manual)"; case 0xf8: return "F8xx: Single tick volume slide up"; case 0xf9: @@ -405,6 +409,8 @@ void writePackedCommandValues(SafeWriter* w, const DivCommand& c) { case DIV_CMD_AMIGA_FILTER: case DIV_CMD_AMIGA_AM: case DIV_CMD_AMIGA_PM: + case DIV_CMD_MACRO_OFF: + case DIV_CMD_MACRO_ON: w->writeC(1); // length w->writeC(c.value); break; diff --git a/src/engine/macroInt.cpp b/src/engine/macroInt.cpp index 9e619cb83..ff24ae57a 100644 --- a/src/engine/macroInt.cpp +++ b/src/engine/macroInt.cpp @@ -50,6 +50,10 @@ void DivMacroStruct::doMacro(DivInstrumentMacro& source, bool released, bool tic had=false; return; } + if (masked) { + had=false; + return; + } if (delay>0) { delay--; had=false; @@ -173,6 +177,66 @@ void DivMacroInt::next() { } } +#define CONSIDER(x,y) \ + case y: \ + x.masked=enabled; \ + break; + +#define CONSIDER_OP(oi,o) \ + CONSIDER(op[oi].am,0+o) \ + CONSIDER(op[oi].ar,1+o) \ + CONSIDER(op[oi].dr,2+o) \ + CONSIDER(op[oi].mult,3+o) \ + CONSIDER(op[oi].rr,4+o) \ + CONSIDER(op[oi].sl,5+o) \ + CONSIDER(op[oi].tl,6+o) \ + CONSIDER(op[oi].dt2,7+o) \ + CONSIDER(op[oi].rs,8+o) \ + CONSIDER(op[oi].dt,9+o) \ + CONSIDER(op[oi].d2r,10+o) \ + CONSIDER(op[oi].ssg,11+o) \ + CONSIDER(op[oi].dam,12+o) \ + CONSIDER(op[oi].dvb,13+o) \ + CONSIDER(op[oi].egt,14+o) \ + CONSIDER(op[oi].ksl,15+o) \ + CONSIDER(op[oi].sus,16+o) \ + CONSIDER(op[oi].vib,17+o) \ + CONSIDER(op[oi].ws,18+o) \ + CONSIDER(op[oi].ksr,19+o) + +void DivMacroInt::mask(unsigned char id, bool enabled) { + switch (id) { + CONSIDER(vol,0) + CONSIDER(arp,1) + CONSIDER(duty,2) + CONSIDER(wave,3) + CONSIDER(pitch,4) + CONSIDER(ex1,5) + CONSIDER(ex2,6) + CONSIDER(ex3,7) + CONSIDER(alg,8) + CONSIDER(fb,9) + CONSIDER(fms,10) + CONSIDER(ams,11) + CONSIDER(panL,12) + CONSIDER(panR,13) + CONSIDER(phaseReset,14) + CONSIDER(ex4,15) + CONSIDER(ex5,16) + CONSIDER(ex6,17) + CONSIDER(ex7,18) + CONSIDER(ex8,19) + + CONSIDER_OP(0,0x20) + CONSIDER_OP(2,0x40) + CONSIDER_OP(1,0x60) + CONSIDER_OP(3,0x80) + } +} + +#undef CONSIDER_OP +#undef CONSIDER + void DivMacroInt::release() { released=true; } @@ -458,3 +522,5 @@ DivMacroStruct* DivMacroInt::structByName(const String& name) { return NULL; } + +#undef CONSIDER \ No newline at end of file diff --git a/src/engine/macroInt.h b/src/engine/macroInt.h index ac829a575..49a4edfcb 100644 --- a/src/engine/macroInt.h +++ b/src/engine/macroInt.h @@ -27,7 +27,7 @@ class DivEngine; struct DivMacroStruct { int pos, lastPos, lfoPos, delay; int val; - bool has, had, actualHad, finished, will, linger, began; + bool has, had, actualHad, finished, will, linger, began, masked; unsigned int mode, type; void doMacro(DivInstrumentMacro& source, bool released, bool tick); void init() { @@ -52,6 +52,7 @@ struct DivMacroStruct { will(false), linger(false), began(true), + masked(false), mode(0), type(0) {} }; @@ -105,6 +106,11 @@ class DivMacroInt { // state bool hasRelease; + /** + * set mask on macro. + */ + void mask(unsigned char id, bool enabled); + /** * trigger macro release. */ diff --git a/src/engine/platform/amiga.cpp b/src/engine/platform/amiga.cpp index 85e0e8551..1f102adcb 100644 --- a/src/engine/platform/amiga.cpp +++ b/src/engine/platform/amiga.cpp @@ -349,6 +349,12 @@ int DivPlatformAmiga::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 64; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/arcade.cpp b/src/engine/platform/arcade.cpp index b782e2658..b5ddebffd 100644 --- a/src/engine/platform/arcade.cpp +++ b/src/engine/platform/arcade.cpp @@ -726,6 +726,12 @@ int DivPlatformArcade::dispatch(DivCommand c) { } break; } + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ay.cpp b/src/engine/platform/ay.cpp index b10cdfd8b..b7a8dddc3 100644 --- a/src/engine/platform/ay.cpp +++ b/src/engine/platform/ay.cpp @@ -635,6 +635,12 @@ int DivPlatformAY8910::dispatch(DivCommand c) { sampleBank=parent->song.sample.size()/12; } break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ay8930.cpp b/src/engine/platform/ay8930.cpp index 2ec70048f..a166c8f2e 100644 --- a/src/engine/platform/ay8930.cpp +++ b/src/engine/platform/ay8930.cpp @@ -635,6 +635,12 @@ int DivPlatformAY8930::dispatch(DivCommand c) { sampleBank=parent->song.sample.size()/12; } break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/bubsyswsg.cpp b/src/engine/platform/bubsyswsg.cpp index a43b8b1de..c122986ca 100644 --- a/src/engine/platform/bubsyswsg.cpp +++ b/src/engine/platform/bubsyswsg.cpp @@ -238,6 +238,12 @@ int DivPlatformBubSysWSG::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/c64.cpp b/src/engine/platform/c64.cpp index 4992fb249..0397b60fd 100644 --- a/src/engine/platform/c64.cpp +++ b/src/engine/platform/c64.cpp @@ -416,6 +416,12 @@ int DivPlatformC64::dispatch(DivCommand c) { break; } break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/fds.cpp b/src/engine/platform/fds.cpp index ab4c228a6..dc7ab740f 100644 --- a/src/engine/platform/fds.cpp +++ b/src/engine/platform/fds.cpp @@ -379,6 +379,12 @@ int DivPlatformFDS::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 32; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/ga20.cpp b/src/engine/platform/ga20.cpp index e49d181f7..0251292cd 100644 --- a/src/engine/platform/ga20.cpp +++ b/src/engine/platform/ga20.cpp @@ -301,6 +301,12 @@ int DivPlatformGA20::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 255; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/gb.cpp b/src/engine/platform/gb.cpp index 0bdd24349..bf045aae1 100644 --- a/src/engine/platform/gb.cpp +++ b/src/engine/platform/gb.cpp @@ -529,6 +529,12 @@ int DivPlatformGB::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/genesis.cpp b/src/engine/platform/genesis.cpp index 9dd3699c7..e85db0b12 100644 --- a/src/engine/platform/genesis.cpp +++ b/src/engine/platform/genesis.cpp @@ -1057,6 +1057,12 @@ int DivPlatformGenesis::dispatch(DivCommand c) { if (c.chan>=6) break; chan[c.chan].hardReset=c.value; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/genesisext.cpp b/src/engine/platform/genesisext.cpp index 5395b32c1..30b5c9bd6 100644 --- a/src/engine/platform/genesisext.cpp +++ b/src/engine/platform/genesisext.cpp @@ -387,6 +387,12 @@ int DivPlatformGenesisExt::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 127; break; + case DIV_CMD_MACRO_OFF: + opChan[ch].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + opChan[ch].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/k007232.cpp b/src/engine/platform/k007232.cpp index be53c01e9..4cc4db165 100644 --- a/src/engine/platform/k007232.cpp +++ b/src/engine/platform/k007232.cpp @@ -379,6 +379,12 @@ int DivPlatformK007232::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/lynx.cpp b/src/engine/platform/lynx.cpp index e6704b64a..f5743d671 100644 --- a/src/engine/platform/lynx.cpp +++ b/src/engine/platform/lynx.cpp @@ -371,6 +371,12 @@ int DivPlatformLynx::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 127; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/mmc5.cpp b/src/engine/platform/mmc5.cpp index 9feaabfcd..ca541393e 100644 --- a/src/engine/platform/mmc5.cpp +++ b/src/engine/platform/mmc5.cpp @@ -316,6 +316,12 @@ int DivPlatformMMC5::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/msm5232.cpp b/src/engine/platform/msm5232.cpp index a9a70092d..4a1c02396 100644 --- a/src/engine/platform/msm5232.cpp +++ b/src/engine/platform/msm5232.cpp @@ -274,6 +274,12 @@ int DivPlatformMSM5232::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 127; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/msm6258.cpp b/src/engine/platform/msm6258.cpp index 1c594982a..04ed970ae 100644 --- a/src/engine/platform/msm6258.cpp +++ b/src/engine/platform/msm6258.cpp @@ -241,6 +241,12 @@ int DivPlatformMSM6258::dispatch(DivCommand c) { case DIV_CMD_LEGATO: { break; } + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/msm6295.cpp b/src/engine/platform/msm6295.cpp index 33321bb6a..f1f61122c 100644 --- a/src/engine/platform/msm6295.cpp +++ b/src/engine/platform/msm6295.cpp @@ -221,6 +221,12 @@ int DivPlatformMSM6295::dispatch(DivCommand c) { case DIV_CMD_LEGATO: { break; } + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/n163.cpp b/src/engine/platform/n163.cpp index 50da45f06..1610e7fbe 100644 --- a/src/engine/platform/n163.cpp +++ b/src/engine/platform/n163.cpp @@ -514,6 +514,12 @@ int DivPlatformN163::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/namcowsg.cpp b/src/engine/platform/namcowsg.cpp index f9e8c6eaf..ee63f2cdd 100644 --- a/src/engine/platform/namcowsg.cpp +++ b/src/engine/platform/namcowsg.cpp @@ -427,6 +427,12 @@ int DivPlatformNamcoWSG::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/nes.cpp b/src/engine/platform/nes.cpp index 87b2b9da8..c5789fcfd 100644 --- a/src/engine/platform/nes.cpp +++ b/src/engine/platform/nes.cpp @@ -564,6 +564,12 @@ int DivPlatformNES::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/opl.cpp b/src/engine/platform/opl.cpp index 4464508cb..4acfdb96a 100644 --- a/src/engine/platform/opl.cpp +++ b/src/engine/platform/opl.cpp @@ -1352,6 +1352,12 @@ int DivPlatformOPL::dispatch(DivCommand c) { if (c.chan==adpcmChan) break; chan[c.chan].hardReset=c.value; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/opll.cpp b/src/engine/platform/opll.cpp index 77dea2e7c..508e1f451 100644 --- a/src/engine/platform/opll.cpp +++ b/src/engine/platform/opll.cpp @@ -753,6 +753,12 @@ int DivPlatformOPLL::dispatch(DivCommand c) { drumState=0; } break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/pce.cpp b/src/engine/platform/pce.cpp index f6a8df51e..d63c5d4ea 100644 --- a/src/engine/platform/pce.cpp +++ b/src/engine/platform/pce.cpp @@ -456,6 +456,12 @@ int DivPlatformPCE::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 31; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/pcmdac.cpp b/src/engine/platform/pcmdac.cpp index b961b33e4..7c1ad0c89 100644 --- a/src/engine/platform/pcmdac.cpp +++ b/src/engine/platform/pcmdac.cpp @@ -29,92 +29,92 @@ void DivPlatformPCMDAC::acquire(short* bufL, short* bufR, size_t start, size_t l const int depthScale=(15-outDepth); int output=0; for (size_t h=start; hdata[oscBuf->needle++]=0; continue; } - if (chan.useWave || (chan.sample>=0 && chan.samplesong.sampleLen)) { - chan.audPos+=((!chan.useWave) && chan.audDir)?-(chan.freq>>16):(chan.freq>>16); - chan.audSub+=(chan.freq&0xffff); - if (chan.audSub>=0x10000) { - chan.audSub-=0x10000; - chan.audPos+=((!chan.useWave) && chan.audDir)?-1:1; + if (chan[0].useWave || (chan[0].sample>=0 && chan[0].samplesong.sampleLen)) { + chan[0].audPos+=((!chan[0].useWave) && chan[0].audDir)?-(chan[0].freq>>16):(chan[0].freq>>16); + chan[0].audSub+=(chan[0].freq&0xffff); + if (chan[0].audSub>=0x10000) { + chan[0].audSub-=0x10000; + chan[0].audPos+=((!chan[0].useWave) && chan[0].audDir)?-1:1; } - if (chan.useWave) { - if (chan.audPos>=(int)chan.audLen) { - chan.audPos%=chan.audLen; - chan.audDir=false; + if (chan[0].useWave) { + if (chan[0].audPos>=(int)chan[0].audLen) { + chan[0].audPos%=chan[0].audLen; + chan[0].audDir=false; } - output=(chan.ws.output[chan.audPos]-0x80)<<8; + output=(chan[0].ws.output[chan[0].audPos]-0x80)<<8; } else { - DivSample* s=parent->getSample(chan.sample); + DivSample* s=parent->getSample(chan[0].sample); if (s->samples>0) { - if (chan.audDir) { + if (chan[0].audDir) { if (s->isLoopable()) { switch (s->loopMode) { case DIV_SAMPLE_LOOP_FORWARD: case DIV_SAMPLE_LOOP_PINGPONG: - if (chan.audPosloopStart) { - chan.audPos=s->loopStart+(s->loopStart-chan.audPos); - chan.audDir=false; + if (chan[0].audPosloopStart) { + chan[0].audPos=s->loopStart+(s->loopStart-chan[0].audPos); + chan[0].audDir=false; } break; case DIV_SAMPLE_LOOP_BACKWARD: - if (chan.audPosloopStart) { - chan.audPos=s->loopEnd-1-(s->loopStart-chan.audPos); - chan.audDir=true; + if (chan[0].audPosloopStart) { + chan[0].audPos=s->loopEnd-1-(s->loopStart-chan[0].audPos); + chan[0].audDir=true; } break; default: - if (chan.audPos<0) { - chan.sample=-1; + if (chan[0].audPos<0) { + chan[0].sample=-1; } break; } - } else if (chan.audPos>=(int)s->samples) { - chan.sample=-1; + } else if (chan[0].audPos>=(int)s->samples) { + chan[0].sample=-1; } } else { if (s->isLoopable()) { switch (s->loopMode) { case DIV_SAMPLE_LOOP_FORWARD: - if (chan.audPos>=s->loopEnd) { - chan.audPos=(chan.audPos+s->loopStart)-s->loopEnd; - chan.audDir=false; + if (chan[0].audPos>=s->loopEnd) { + chan[0].audPos=(chan[0].audPos+s->loopStart)-s->loopEnd; + chan[0].audDir=false; } break; case DIV_SAMPLE_LOOP_BACKWARD: case DIV_SAMPLE_LOOP_PINGPONG: - if (chan.audPos>=s->loopEnd) { - chan.audPos=s->loopEnd-1-(s->loopEnd-1-chan.audPos); - chan.audDir=true; + if (chan[0].audPos>=s->loopEnd) { + chan[0].audPos=s->loopEnd-1-(s->loopEnd-1-chan[0].audPos); + chan[0].audDir=true; } break; default: - if (chan.audPos>=(int)s->samples) { - chan.sample=-1; + if (chan[0].audPos>=(int)s->samples) { + chan[0].sample=-1; } break; } - } else if (chan.audPos>=(int)s->samples) { - chan.sample=-1; + } else if (chan[0].audPos>=(int)s->samples) { + chan[0].sample=-1; } } - if (chan.audPos>=0 && chan.audPos<(int)s->samples) { - output=s->data16[chan.audPos]; + if (chan[0].audPos>=0 && chan[0].audPos<(int)s->samples) { + output=s->data16[chan[0].audPos]; } } else { - chan.sample=-1; + chan[0].sample=-1; } } } - output=output*chan.vol*chan.envVol/16384; + output=output*chan[0].vol*chan[0].envVol/16384; oscBuf->data[oscBuf->needle++]=output; if (outStereo) { - bufL[h]=((output*chan.panL)>>(depthScale+8))<>(depthScale+8))<>(depthScale+8))<>(depthScale+8))<>depthScale)<calcArp(chan.note,chan.std.arp.val)); + if (chan[0].std.arp.had) { + if (!chan[0].inPorta) { + chan[0].baseFreq=NOTE_FREQUENCY(parent->calcArp(chan[0].note,chan[0].std.arp.val)); } - chan.freqChanged=true; + chan[0].freqChanged=true; } - if (chan.useWave && chan.std.wave.had) { - if (chan.wave!=chan.std.wave.val || chan.ws.activeChanged()) { - chan.wave=chan.std.wave.val; - chan.ws.changeWave1(chan.wave); - if (!chan.keyOff) chan.keyOn=true; + if (chan[0].useWave && chan[0].std.wave.had) { + if (chan[0].wave!=chan[0].std.wave.val || chan[0].ws.activeChanged()) { + chan[0].wave=chan[0].std.wave.val; + chan[0].ws.changeWave1(chan[0].wave); + if (!chan[0].keyOff) chan[0].keyOn=true; } } - if (chan.useWave && chan.active) { - chan.ws.tick(); + if (chan[0].useWave && chan[0].active) { + chan[0].ws.tick(); } - if (chan.std.pitch.had) { - if (chan.std.pitch.mode) { - chan.pitch2+=chan.std.pitch.val; - CLAMP_VAR(chan.pitch2,-32768,32767); + if (chan[0].std.pitch.had) { + if (chan[0].std.pitch.mode) { + chan[0].pitch2+=chan[0].std.pitch.val; + CLAMP_VAR(chan[0].pitch2,-32768,32767); } else { - chan.pitch2=chan.std.pitch.val; + chan[0].pitch2=chan[0].std.pitch.val; } - chan.freqChanged=true; + chan[0].freqChanged=true; } - if (chan.std.panL.had) { - int val=chan.std.panL.val&0x7f; - chan.panL=val*2; + if (chan[0].std.panL.had) { + int val=chan[0].std.panL.val&0x7f; + chan[0].panL=val*2; } - if (chan.std.panR.had) { - int val=chan.std.panR.val&0x7f; - chan.panR=val*2; + if (chan[0].std.panR.had) { + int val=chan[0].std.panR.val&0x7f; + chan[0].panR=val*2; } - if (chan.std.phaseReset.had) { - if (chan.std.phaseReset.val==1) { - chan.audDir=false; - chan.audPos=0; + if (chan[0].std.phaseReset.had) { + if (chan[0].std.phaseReset.val==1) { + chan[0].audDir=false; + chan[0].audPos=0; } } - if (chan.freqChanged || chan.keyOn || chan.keyOff) { - //DivInstrument* ins=parent->getIns(chan.ins,DIV_INS_AMIGA); + if (chan[0].freqChanged || chan[0].keyOn || chan[0].keyOff) { + //DivInstrument* ins=parent->getIns(chan[0].ins,DIV_INS_AMIGA); double off=1.0; - if (!chan.useWave && chan.sample>=0 && chan.samplesong.sampleLen) { - DivSample* s=parent->getSample(chan.sample); + if (!chan[0].useWave && chan[0].sample>=0 && chan[0].samplesong.sampleLen) { + DivSample* s=parent->getSample(chan[0].sample); off=(s->centerRate>=1)?((double)s->centerRate/8363.0):1.0; } - chan.freq=off*parent->calcFreq(chan.baseFreq,chan.pitch,false,2,chan.pitch2,chipClock,CHIP_FREQBASE); - if (chan.freq>16777215) chan.freq=16777215; - if (chan.keyOn) { - if (!chan.std.vol.had) { - chan.envVol=64; + chan[0].freq=off*parent->calcFreq(chan[0].baseFreq,chan[0].pitch,false,2,chan[0].pitch2,chipClock,CHIP_FREQBASE); + if (chan[0].freq>16777215) chan[0].freq=16777215; + if (chan[0].keyOn) { + if (!chan[0].std.vol.had) { + chan[0].envVol=64; } - chan.keyOn=false; + chan[0].keyOn=false; } - if (chan.keyOff) { - chan.keyOff=false; + if (chan[0].keyOff) { + chan[0].keyOff=false; } - chan.freqChanged=false; + chan[0].freqChanged=false; } } int DivPlatformPCMDAC::dispatch(DivCommand c) { switch (c.cmd) { case DIV_CMD_NOTE_ON: { - DivInstrument* ins=parent->getIns(chan.ins,DIV_INS_AMIGA); + DivInstrument* ins=parent->getIns(chan[0].ins,DIV_INS_AMIGA); if (ins->amiga.useWave) { - chan.useWave=true; - chan.audLen=ins->amiga.waveLen+1; - if (chan.insChanged) { - if (chan.wave<0) { - chan.wave=0; - chan.ws.setWidth(chan.audLen); - chan.ws.changeWave1(chan.wave); + chan[0].useWave=true; + chan[0].audLen=ins->amiga.waveLen+1; + if (chan[0].insChanged) { + if (chan[0].wave<0) { + chan[0].wave=0; + chan[0].ws.setWidth(chan[0].audLen); + chan[0].ws.changeWave1(chan[0].wave); } } } else { - chan.sample=ins->amiga.getSample(c.value); - chan.useWave=false; + chan[0].sample=ins->amiga.getSample(c.value); + chan[0].useWave=false; } if (c.value!=DIV_NOTE_NULL) { - chan.baseFreq=round(NOTE_FREQUENCY(c.value)); + chan[0].baseFreq=round(NOTE_FREQUENCY(c.value)); } - if (chan.useWave || chan.sample<0 || chan.sample>=parent->song.sampleLen) { - chan.sample=-1; + if (chan[0].useWave || chan[0].sample<0 || chan[0].sample>=parent->song.sampleLen) { + chan[0].sample=-1; } - if (chan.setPos) { - chan.setPos=false; + if (chan[0].setPos) { + chan[0].setPos=false; } else { - chan.audDir=false; - chan.audPos=0; + chan[0].audDir=false; + chan[0].audPos=0; } - chan.audSub=0; + chan[0].audSub=0; if (c.value!=DIV_NOTE_NULL) { - chan.freqChanged=true; - chan.note=c.value; + chan[0].freqChanged=true; + chan[0].note=c.value; } - chan.active=true; - chan.keyOn=true; - chan.macroInit(ins); - if (!parent->song.brokenOutVol && !chan.std.vol.will) { - chan.envVol=64; + chan[0].active=true; + chan[0].keyOn=true; + chan[0].macroInit(ins); + if (!parent->song.brokenOutVol && !chan[0].std.vol.will) { + chan[0].envVol=64; } - if (chan.useWave) { - chan.ws.init(ins,chan.audLen,255,chan.insChanged); + if (chan[0].useWave) { + chan[0].ws.init(ins,chan[0].audLen,255,chan[0].insChanged); } - chan.insChanged=false; + chan[0].insChanged=false; break; } case DIV_CMD_NOTE_OFF: - chan.sample=-1; - chan.active=false; - chan.keyOff=true; - chan.macroInit(NULL); + chan[0].sample=-1; + chan[0].active=false; + chan[0].keyOff=true; + chan[0].macroInit(NULL); break; case DIV_CMD_NOTE_OFF_ENV: case DIV_CMD_ENV_RELEASE: - chan.std.release(); + chan[0].std.release(); break; case DIV_CMD_INSTRUMENT: - if (chan.ins!=c.value || c.value2==1) { - chan.ins=c.value; - chan.insChanged=true; + if (chan[0].ins!=c.value || c.value2==1) { + chan[0].ins=c.value; + chan[0].insChanged=true; } break; case DIV_CMD_VOLUME: - if (chan.vol!=c.value) { - chan.vol=c.value; - if (!chan.std.vol.has) { - chan.envVol=64; + if (chan[0].vol!=c.value) { + chan[0].vol=c.value; + if (!chan[0].std.vol.has) { + chan[0].envVol=64; } } break; case DIV_CMD_GET_VOLUME: - return chan.vol; + return chan[0].vol; break; case DIV_CMD_PANNING: - chan.panL=c.value; - chan.panR=c.value2; + chan[0].panL=c.value; + chan[0].panR=c.value2; break; case DIV_CMD_PITCH: - chan.pitch=c.value; - chan.freqChanged=true; + chan[0].pitch=c.value; + chan[0].freqChanged=true; break; case DIV_CMD_WAVE: - if (!chan.useWave) break; - chan.wave=c.value; - chan.keyOn=true; - chan.ws.changeWave1(chan.wave); + if (!chan[0].useWave) break; + chan[0].wave=c.value; + chan[0].keyOn=true; + chan[0].ws.changeWave1(chan[0].wave); break; case DIV_CMD_NOTE_PORTA: { - DivInstrument* ins=parent->getIns(chan.ins,DIV_INS_AMIGA); - chan.sample=ins->amiga.getSample(c.value2); + DivInstrument* ins=parent->getIns(chan[0].ins,DIV_INS_AMIGA); + chan[0].sample=ins->amiga.getSample(c.value2); int destFreq=round(NOTE_FREQUENCY(c.value2)); bool return2=false; - if (destFreq>chan.baseFreq) { - chan.baseFreq+=c.value; - if (chan.baseFreq>=destFreq) { - chan.baseFreq=destFreq; + if (destFreq>chan[0].baseFreq) { + chan[0].baseFreq+=c.value; + if (chan[0].baseFreq>=destFreq) { + chan[0].baseFreq=destFreq; return2=true; } } else { - chan.baseFreq-=c.value; - if (chan.baseFreq<=destFreq) { - chan.baseFreq=destFreq; + chan[0].baseFreq-=c.value; + if (chan[0].baseFreq<=destFreq) { + chan[0].baseFreq=destFreq; return2=true; } } - chan.freqChanged=true; + chan[0].freqChanged=true; if (return2) { - chan.inPorta=false; + chan[0].inPorta=false; return 2; } break; } case DIV_CMD_LEGATO: { - chan.baseFreq=round(NOTE_FREQUENCY(c.value+((chan.std.arp.will && !chan.std.arp.mode)?(chan.std.arp.val):(0)))); - chan.freqChanged=true; - chan.note=c.value; + chan[0].baseFreq=round(NOTE_FREQUENCY(c.value+((chan[0].std.arp.will && !chan[0].std.arp.mode)?(chan[0].std.arp.val):(0)))); + chan[0].freqChanged=true; + chan[0].note=c.value; break; } case DIV_CMD_PRE_PORTA: - if (chan.active && c.value2) { - if (parent->song.resetMacroOnPorta) chan.macroInit(parent->getIns(chan.ins,DIV_INS_AMIGA)); + if (chan[0].active && c.value2) { + if (parent->song.resetMacroOnPorta) chan[0].macroInit(parent->getIns(chan[0].ins,DIV_INS_AMIGA)); } - chan.inPorta=c.value; + chan[0].inPorta=c.value; break; case DIV_CMD_SAMPLE_POS: - if (chan.useWave) break; - chan.audPos=c.value; - chan.setPos=true; + if (chan[0].useWave) break; + chan[0].audPos=c.value; + chan[0].setPos=true; break; case DIV_CMD_GET_VOLMAX: return 255; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; @@ -336,11 +342,11 @@ void DivPlatformPCMDAC::muteChannel(int ch, bool mute) { } void DivPlatformPCMDAC::forceIns() { - chan.insChanged=true; - chan.freqChanged=true; - chan.audDir=false; - chan.audPos=0; - chan.sample=-1; + chan[0].insChanged=true; + chan[0].freqChanged=true; + chan[0].audDir=false; + chan[0].audPos=0; + chan[0].sample=-1; } void* DivPlatformPCMDAC::getChanState(int ch) { @@ -352,10 +358,10 @@ DivDispatchOscBuffer* DivPlatformPCMDAC::getOscBuffer(int ch) { } void DivPlatformPCMDAC::reset() { - chan=DivPlatformPCMDAC::Channel(); - chan.std.setEngine(parent); - chan.ws.setEngine(parent); - chan.ws.init(NULL,32,255); + chan[0]=DivPlatformPCMDAC::Channel(); + chan[0].std.setEngine(parent); + chan[0].ws.setEngine(parent); + chan[0].ws.init(NULL,32,255); } bool DivPlatformPCMDAC::isStereo() { @@ -363,23 +369,23 @@ bool DivPlatformPCMDAC::isStereo() { } DivMacroInt* DivPlatformPCMDAC::getChanMacroInt(int ch) { - return &chan.std; + return &chan[0].std; } void DivPlatformPCMDAC::notifyInsChange(int ins) { - if (chan.ins==ins) { - chan.insChanged=true; + if (chan[0].ins==ins) { + chan[0].insChanged=true; } } void DivPlatformPCMDAC::notifyWaveChange(int wave) { - if (chan.useWave && chan.wave==wave) { - chan.ws.changeWave1(wave); + if (chan[0].useWave && chan[0].wave==wave) { + chan[0].ws.changeWave1(wave); } } void DivPlatformPCMDAC::notifyInsDeletion(void* ins) { - chan.std.notifyInsDeletion((DivInstrument*)ins); + chan[0].std.notifyInsDeletion((DivInstrument*)ins); } void DivPlatformPCMDAC::setFlags(const DivConfig& flags) { diff --git a/src/engine/platform/pcmdac.h b/src/engine/platform/pcmdac.h index 7a16ec547..dcdb45873 100644 --- a/src/engine/platform/pcmdac.h +++ b/src/engine/platform/pcmdac.h @@ -51,7 +51,7 @@ class DivPlatformPCMDAC: public DivDispatch { setPos(false), envVol(64) {} }; - Channel chan; + Channel chan[1]; DivDispatchOscBuffer* oscBuf; bool isMuted; int outDepth; diff --git a/src/engine/platform/pcspkr.cpp b/src/engine/platform/pcspkr.cpp index 59154dcae..5ec95616a 100644 --- a/src/engine/platform/pcspkr.cpp +++ b/src/engine/platform/pcspkr.cpp @@ -464,6 +464,12 @@ int DivPlatformPCSpeaker::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 1; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/pet.cpp b/src/engine/platform/pet.cpp index 3722d52f5..b99e2f646 100644 --- a/src/engine/platform/pet.cpp +++ b/src/engine/platform/pet.cpp @@ -44,12 +44,12 @@ void DivPlatformPET::rWrite(unsigned int addr, unsigned char val) { case 9: // simulate phase reset from switching between hw/sw shift registers if ((regPool[9]==0)^(val==0)) { - chan.sreg=chan.wave; + chan[0].sreg=chan[0].wave; } break; case 10: - chan.sreg=val; - if (hwSROutput) chan.cnt=2; + chan[0].sreg=val; + if (hwSROutput) chan[0].cnt=2; break; } regPool[addr]=val; @@ -57,27 +57,27 @@ void DivPlatformPET::rWrite(unsigned int addr, unsigned char val) { void DivPlatformPET::acquire(short* bufL, short* bufR, size_t start, size_t len) { bool hwSROutput=((regPool[11]>>2)&7)==4; - if (chan.enable) { + if (chan[0].enable) { int reload=regPool[8]*2+4; if (!hwSROutput) { reload+=regPool[9]*512; } for (size_t h=start; hchan.cnt) { - chan.out=(chan.sreg&1)*32767; - chan.sreg=(chan.sreg>>1)|((chan.sreg&1)<<7); - chan.cnt+=reload-SAMP_DIVIDER; + if (SAMP_DIVIDER>chan[0].cnt) { + chan[0].out=(chan[0].sreg&1)*32767; + chan[0].sreg=(chan[0].sreg>>1)|((chan[0].sreg&1)<<7); + chan[0].cnt+=reload-SAMP_DIVIDER; } else { - chan.cnt-=SAMP_DIVIDER; + chan[0].cnt-=SAMP_DIVIDER; } - bufL[h]=chan.out; - bufR[h]=chan.out; - oscBuf->data[oscBuf->needle++]=chan.out; + bufL[h]=chan[0].out; + bufR[h]=chan[0].out; + oscBuf->data[oscBuf->needle++]=chan[0].out; } // emulate driver writes to PCR - if (!hwSROutput) regPool[12]=chan.out?0xe0:0xc0; + if (!hwSROutput) regPool[12]=chan[0].out?0xe0:0xc0; } else { - chan.out=0; + chan[0].out=0; for (size_t h=start; h0) { - chan.enable=true; + if (chan[0].active && !isMuted && chan[0].outVol>0) { + chan[0].enable=true; rWrite(11,regPool[9]==0?16:0); } else { - chan.enable=false; + chan[0].enable=false; rWrite(11,0); } } void DivPlatformPET::tick(bool sysTick) { - chan.std.next(); - if (chan.std.vol.had) { - chan.outVol=chan.std.vol.val&chan.vol; + chan[0].std.next(); + if (chan[0].std.vol.had) { + chan[0].outVol=chan[0].std.vol.val&chan[0].vol; writeOutVol(); } - if (chan.std.arp.had) { - if (!chan.inPorta) { - chan.baseFreq=NOTE_PERIODIC(parent->calcArp(chan.note,chan.std.arp.val)); + if (chan[0].std.arp.had) { + if (!chan[0].inPorta) { + chan[0].baseFreq=NOTE_PERIODIC(parent->calcArp(chan[0].note,chan[0].std.arp.val)); } - chan.freqChanged=true; + chan[0].freqChanged=true; } - if (chan.std.wave.had) { - if (chan.wave!=chan.std.wave.val) { - chan.wave=chan.std.wave.val; - rWrite(10,chan.wave); + if (chan[0].std.wave.had) { + if (chan[0].wave!=chan[0].std.wave.val) { + chan[0].wave=chan[0].std.wave.val; + rWrite(10,chan[0].wave); } } - if (chan.std.pitch.had) { - if (chan.std.pitch.mode) { - chan.pitch2+=chan.std.pitch.val; - CLAMP_VAR(chan.pitch2,-32768,32767); + if (chan[0].std.pitch.had) { + if (chan[0].std.pitch.mode) { + chan[0].pitch2+=chan[0].std.pitch.val; + CLAMP_VAR(chan[0].pitch2,-32768,32767); } else { - chan.pitch2=chan.std.pitch.val; + chan[0].pitch2=chan[0].std.pitch.val; } - chan.freqChanged=true; + chan[0].freqChanged=true; } - if (chan.freqChanged || chan.keyOn || chan.keyOff) { - chan.freq=parent->calcFreq(chan.baseFreq,chan.pitch,true,0,chan.pitch2,chipClock,CHIP_DIVIDER)-2; - if (chan.freq>65535) chan.freq=65535; - if (chan.freq<0) chan.freq=0; - rWrite(8,chan.freq&0xff); - rWrite(9,chan.freq>>8); - if (chan.keyOn) { - if (!chan.std.vol.will) { - chan.outVol=chan.vol; + if (chan[0].freqChanged || chan[0].keyOn || chan[0].keyOff) { + chan[0].freq=parent->calcFreq(chan[0].baseFreq,chan[0].pitch,true,0,chan[0].pitch2,chipClock,CHIP_DIVIDER)-2; + if (chan[0].freq>65535) chan[0].freq=65535; + if (chan[0].freq<0) chan[0].freq=0; + rWrite(8,chan[0].freq&0xff); + rWrite(9,chan[0].freq>>8); + if (chan[0].keyOn) { + if (!chan[0].std.vol.will) { + chan[0].outVol=chan[0].vol; } - chan.keyOn=false; + chan[0].keyOn=false; } - if (chan.keyOff) { - chan.keyOff=false; + if (chan[0].keyOff) { + chan[0].keyOff=false; } // update mode setting and channel enable writeOutVol(); - chan.freqChanged=false; + chan[0].freqChanged=false; } } int DivPlatformPET::dispatch(DivCommand c) { switch (c.cmd) { case DIV_CMD_NOTE_ON: { - DivInstrument* ins=parent->getIns(chan.ins,DIV_INS_PET); + DivInstrument* ins=parent->getIns(chan[0].ins,DIV_INS_PET); if (c.value!=DIV_NOTE_NULL) { - chan.baseFreq=NOTE_PERIODIC(c.value); - chan.freqChanged=true; - chan.note=c.value; + chan[0].baseFreq=NOTE_PERIODIC(c.value); + chan[0].freqChanged=true; + chan[0].note=c.value; } - chan.active=true; - chan.keyOn=true; - chan.macroInit(ins); - if (!parent->song.brokenOutVol && !chan.std.vol.will) { - chan.outVol=chan.vol; + chan[0].active=true; + chan[0].keyOn=true; + chan[0].macroInit(ins); + if (!parent->song.brokenOutVol && !chan[0].std.vol.will) { + chan[0].outVol=chan[0].vol; } break; } case DIV_CMD_NOTE_OFF: - chan.active=false; - chan.keyOff=true; - chan.macroInit(NULL); + chan[0].active=false; + chan[0].keyOff=true; + chan[0].macroInit(NULL); break; case DIV_CMD_NOTE_OFF_ENV: case DIV_CMD_ENV_RELEASE: - chan.std.release(); + chan[0].std.release(); break; case DIV_CMD_INSTRUMENT: - if (chan.ins!=c.value || c.value2==1) { - chan.ins=c.value; + if (chan[0].ins!=c.value || c.value2==1) { + chan[0].ins=c.value; } break; case DIV_CMD_VOLUME: - if (chan.vol!=c.value) { - chan.vol=c.value; - if (!chan.std.vol.had) { - chan.outVol=chan.vol; + if (chan[0].vol!=c.value) { + chan[0].vol=c.value; + if (!chan[0].std.vol.had) { + chan[0].outVol=chan[0].vol; writeOutVol(); } } break; case DIV_CMD_GET_VOLUME: - return chan.vol; + return chan[0].vol; break; case DIV_CMD_PITCH: - chan.pitch=c.value; - chan.freqChanged=true; + chan[0].pitch=c.value; + chan[0].freqChanged=true; break; case DIV_CMD_WAVE: - chan.wave=c.value; - rWrite(10,chan.wave); + chan[0].wave=c.value; + rWrite(10,chan[0].wave); break; case DIV_CMD_NOTE_PORTA: { int destFreq=NOTE_PERIODIC(c.value2); bool return2=false; - if (destFreq>chan.baseFreq) { - chan.baseFreq+=c.value; - if (chan.baseFreq>=destFreq) { - chan.baseFreq=destFreq; + if (destFreq>chan[0].baseFreq) { + chan[0].baseFreq+=c.value; + if (chan[0].baseFreq>=destFreq) { + chan[0].baseFreq=destFreq; return2=true; } } else { - chan.baseFreq-=c.value; - if (chan.baseFreq<=destFreq) { - chan.baseFreq=destFreq; + chan[0].baseFreq-=c.value; + if (chan[0].baseFreq<=destFreq) { + chan[0].baseFreq=destFreq; return2=true; } } - chan.freqChanged=true; + chan[0].freqChanged=true; if (return2) { - chan.inPorta=false; + chan[0].inPorta=false; return 2; } break; } case DIV_CMD_LEGATO: - chan.baseFreq=NOTE_PERIODIC(c.value+((chan.std.arp.will && !chan.std.arp.mode)?(chan.std.arp.val):(0))); - chan.freqChanged=true; - chan.note=c.value; + chan[0].baseFreq=NOTE_PERIODIC(c.value+((chan[0].std.arp.will && !chan[0].std.arp.mode)?(chan[0].std.arp.val):(0))); + chan[0].freqChanged=true; + chan[0].note=c.value; break; case DIV_CMD_PRE_PORTA: - if (chan.active && c.value2) { - if (parent->song.resetMacroOnPorta) chan.macroInit(parent->getIns(chan.ins,DIV_INS_PET)); + if (chan[0].active && c.value2) { + if (parent->song.resetMacroOnPorta) chan[0].macroInit(parent->getIns(chan[0].ins,DIV_INS_PET)); } - if (!chan.inPorta && c.value && !parent->song.brokenPortaArp && chan.std.arp.will) chan.baseFreq=NOTE_PERIODIC(chan.note); - chan.inPorta=c.value; + if (!chan[0].inPorta && c.value && !parent->song.brokenPortaArp && chan[0].std.arp.will) chan[0].baseFreq=NOTE_PERIODIC(chan[0].note); + chan[0].inPorta=c.value; break; case DIV_CMD_GET_VOLMAX: return 1; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; @@ -248,8 +254,8 @@ void DivPlatformPET::muteChannel(int ch, bool mute) { } void DivPlatformPET::forceIns() { - chan.insChanged=true; - chan.freqChanged=true; + chan[0].insChanged=true; + chan[0].freqChanged=true; writeOutVol(); } @@ -258,7 +264,7 @@ void* DivPlatformPET::getChanState(int ch) { } DivMacroInt* DivPlatformPET::getChanMacroInt(int ch) { - return &chan.std; + return &chan[0].std; } DivDispatchOscBuffer* DivPlatformPET::getOscBuffer(int ch) { @@ -275,8 +281,8 @@ int DivPlatformPET::getRegisterPoolSize() { void DivPlatformPET::reset() { memset(regPool,0,16); - chan=Channel(); - chan.std.setEngine(parent); + chan[0]=Channel(); + chan[0].std.setEngine(parent); } bool DivPlatformPET::isStereo() { @@ -284,7 +290,7 @@ bool DivPlatformPET::isStereo() { } void DivPlatformPET::notifyInsDeletion(void* ins) { - chan.std.notifyInsDeletion((DivInstrument*)ins); + chan[0].std.notifyInsDeletion((DivInstrument*)ins); } void DivPlatformPET::poke(unsigned int addr, unsigned short val) { diff --git a/src/engine/platform/pet.h b/src/engine/platform/pet.h index 46c565562..0078e3f3f 100644 --- a/src/engine/platform/pet.h +++ b/src/engine/platform/pet.h @@ -37,7 +37,7 @@ class DivPlatformPET: public DivDispatch { cnt(0), out(0) {} }; - Channel chan; + Channel chan[1]; DivDispatchOscBuffer* oscBuf; bool isMuted; diff --git a/src/engine/platform/pokemini.cpp b/src/engine/platform/pokemini.cpp index 396322944..34900654d 100644 --- a/src/engine/platform/pokemini.cpp +++ b/src/engine/platform/pokemini.cpp @@ -199,6 +199,12 @@ int DivPlatformPokeMini::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 2; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/pong.cpp b/src/engine/platform/pong.cpp index a98fe7baf..c5f81654e 100644 --- a/src/engine/platform/pong.cpp +++ b/src/engine/platform/pong.cpp @@ -172,6 +172,12 @@ int DivPlatformPong::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 1; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/qsound.cpp b/src/engine/platform/qsound.cpp index e513d5313..4d06a781d 100644 --- a/src/engine/platform/qsound.cpp +++ b/src/engine/platform/qsound.cpp @@ -573,6 +573,12 @@ int DivPlatformQSound::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 255; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/rf5c68.cpp b/src/engine/platform/rf5c68.cpp index f13a25aa0..f237cd505 100644 --- a/src/engine/platform/rf5c68.cpp +++ b/src/engine/platform/rf5c68.cpp @@ -273,6 +273,12 @@ int DivPlatformRF5C68::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 255; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/saa.cpp b/src/engine/platform/saa.cpp index c3e48f1fe..27f88fc64 100644 --- a/src/engine/platform/saa.cpp +++ b/src/engine/platform/saa.cpp @@ -308,6 +308,12 @@ int DivPlatformSAA1099::dispatch(DivCommand c) { saaEnv[c.chan/3]=c.value; rWrite(0x18+(c.chan/3),c.value); break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/scc.cpp b/src/engine/platform/scc.cpp index a75496d55..f10ef8743 100644 --- a/src/engine/platform/scc.cpp +++ b/src/engine/platform/scc.cpp @@ -255,6 +255,12 @@ int DivPlatformSCC::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/segapcm.cpp b/src/engine/platform/segapcm.cpp index 25de33957..ef518d5de 100644 --- a/src/engine/platform/segapcm.cpp +++ b/src/engine/platform/segapcm.cpp @@ -358,6 +358,12 @@ int DivPlatformSegaPCM::dispatch(DivCommand c) { sampleBank=parent->song.sample.size()/12; } break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp index d6da280cd..833a50422 100644 --- a/src/engine/platform/sms.cpp +++ b/src/engine/platform/sms.cpp @@ -378,6 +378,12 @@ int DivPlatformSMS::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/snes.cpp b/src/engine/platform/snes.cpp index 2ab2c62cf..0248769ec 100644 --- a/src/engine/platform/snes.cpp +++ b/src/engine/platform/snes.cpp @@ -561,6 +561,12 @@ int DivPlatformSNES::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 127; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; default: break; } diff --git a/src/engine/platform/su.cpp b/src/engine/platform/su.cpp index d85a9d94d..7d6762c88 100644 --- a/src/engine/platform/su.cpp +++ b/src/engine/platform/su.cpp @@ -412,6 +412,12 @@ int DivPlatformSoundUnit::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 127; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/swan.cpp b/src/engine/platform/swan.cpp index 852450a74..90604942f 100644 --- a/src/engine/platform/swan.cpp +++ b/src/engine/platform/swan.cpp @@ -406,6 +406,12 @@ int DivPlatformSwan::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/t6w28.cpp b/src/engine/platform/t6w28.cpp index 0d294836c..506475243 100644 --- a/src/engine/platform/t6w28.cpp +++ b/src/engine/platform/t6w28.cpp @@ -262,6 +262,12 @@ int DivPlatformT6W28::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/tia.cpp b/src/engine/platform/tia.cpp index 2a28cb0a0..5902f6c9d 100644 --- a/src/engine/platform/tia.cpp +++ b/src/engine/platform/tia.cpp @@ -253,6 +253,12 @@ int DivPlatformTIA::dispatch(DivCommand c) { rWrite(0x15+c.chan,chan[c.chan].shape); chan[c.chan].freqChanged=true; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/tx81z.cpp b/src/engine/platform/tx81z.cpp index fb6369668..577f38913 100644 --- a/src/engine/platform/tx81z.cpp +++ b/src/engine/platform/tx81z.cpp @@ -784,6 +784,12 @@ int DivPlatformTX81Z::dispatch(DivCommand c) { } break; } + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/vb.cpp b/src/engine/platform/vb.cpp index 1523a153c..54a24ad98 100644 --- a/src/engine/platform/vb.cpp +++ b/src/engine/platform/vb.cpp @@ -380,6 +380,12 @@ int DivPlatformVB::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/vera.cpp b/src/engine/platform/vera.cpp index 9294a3444..14a31c544 100644 --- a/src/engine/platform/vera.cpp +++ b/src/engine/platform/vera.cpp @@ -356,6 +356,12 @@ int DivPlatformVERA::dispatch(DivCommand c) { return 15; } break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/vic20.cpp b/src/engine/platform/vic20.cpp index 20ff0c8b4..d8849fc49 100644 --- a/src/engine/platform/vic20.cpp +++ b/src/engine/platform/vic20.cpp @@ -231,6 +231,12 @@ int DivPlatformVIC20::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/vrc6.cpp b/src/engine/platform/vrc6.cpp index 56df0e83b..7341e337e 100644 --- a/src/engine/platform/vrc6.cpp +++ b/src/engine/platform/vrc6.cpp @@ -403,6 +403,12 @@ int DivPlatformVRC6::dispatch(DivCommand c) { if (c.chan==2) return 63; // sawtooth has 6 bit volume return 15; // pulse has 4 bit volume break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/x1_010.cpp b/src/engine/platform/x1_010.cpp index b7382c284..a0a00a446 100644 --- a/src/engine/platform/x1_010.cpp +++ b/src/engine/platform/x1_010.cpp @@ -819,6 +819,12 @@ int DivPlatformX1_010::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/ym2203.cpp b/src/engine/platform/ym2203.cpp index 558e164b3..ee204bff5 100644 --- a/src/engine/platform/ym2203.cpp +++ b/src/engine/platform/ym2203.cpp @@ -729,6 +729,12 @@ int DivPlatformYM2203::dispatch(DivCommand c) { case DIV_CMD_FM_HARD_RESET: chan[c.chan].hardReset=c.value; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ym2203ext.cpp b/src/engine/platform/ym2203ext.cpp index ace50bee2..f6c8a6d18 100644 --- a/src/engine/platform/ym2203ext.cpp +++ b/src/engine/platform/ym2203ext.cpp @@ -317,6 +317,12 @@ int DivPlatformYM2203Ext::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 127; break; + case DIV_CMD_MACRO_OFF: + opChan[ch].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + opChan[ch].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ym2608.cpp b/src/engine/platform/ym2608.cpp index 65537f4ee..1a2457b5e 100644 --- a/src/engine/platform/ym2608.cpp +++ b/src/engine/platform/ym2608.cpp @@ -1123,6 +1123,12 @@ int DivPlatformYM2608::dispatch(DivCommand c) { case DIV_CMD_FM_HARD_RESET: chan[c.chan].hardReset=c.value; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ym2608ext.cpp b/src/engine/platform/ym2608ext.cpp index 7a244e4db..9954be541 100644 --- a/src/engine/platform/ym2608ext.cpp +++ b/src/engine/platform/ym2608ext.cpp @@ -334,6 +334,12 @@ int DivPlatformYM2608Ext::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 127; break; + case DIV_CMD_MACRO_OFF: + opChan[ch].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + opChan[ch].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ym2610.cpp b/src/engine/platform/ym2610.cpp index 16bb0922a..56d539684 100644 --- a/src/engine/platform/ym2610.cpp +++ b/src/engine/platform/ym2610.cpp @@ -1103,6 +1103,12 @@ int DivPlatformYM2610::dispatch(DivCommand c) { case DIV_CMD_FM_HARD_RESET: chan[c.chan].hardReset=c.value; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ym2610b.cpp b/src/engine/platform/ym2610b.cpp index 18b99cf87..3b72a93b4 100644 --- a/src/engine/platform/ym2610b.cpp +++ b/src/engine/platform/ym2610b.cpp @@ -1166,6 +1166,12 @@ int DivPlatformYM2610B::dispatch(DivCommand c) { case DIV_CMD_FM_HARD_RESET: chan[c.chan].hardReset=c.value; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ym2610bext.cpp b/src/engine/platform/ym2610bext.cpp index 80298dcb0..d43140a37 100644 --- a/src/engine/platform/ym2610bext.cpp +++ b/src/engine/platform/ym2610bext.cpp @@ -330,6 +330,12 @@ int DivPlatformYM2610BExt::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 127; break; + case DIV_CMD_MACRO_OFF: + opChan[ch].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + opChan[ch].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ym2610ext.cpp b/src/engine/platform/ym2610ext.cpp index 52af18545..9f9b8a088 100644 --- a/src/engine/platform/ym2610ext.cpp +++ b/src/engine/platform/ym2610ext.cpp @@ -330,6 +330,12 @@ int DivPlatformYM2610Ext::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 127; break; + case DIV_CMD_MACRO_OFF: + opChan[ch].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + opChan[ch].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 0; break; diff --git a/src/engine/platform/ymz280b.cpp b/src/engine/platform/ymz280b.cpp index 28d50acf7..c8ced88d2 100644 --- a/src/engine/platform/ymz280b.cpp +++ b/src/engine/platform/ymz280b.cpp @@ -311,6 +311,12 @@ int DivPlatformYMZ280B::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 255; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/platform/zxbeeper.cpp b/src/engine/platform/zxbeeper.cpp index 7f3dfedf0..5608bd03d 100644 --- a/src/engine/platform/zxbeeper.cpp +++ b/src/engine/platform/zxbeeper.cpp @@ -209,6 +209,12 @@ int DivPlatformZXBeeper::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 1; break; + case DIV_CMD_MACRO_OFF: + chan[c.chan].std.mask(c.value,true); + break; + case DIV_CMD_MACRO_ON: + chan[c.chan].std.mask(c.value,false); + break; case DIV_ALWAYS_SET_VOLUME: return 1; break; diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp index 3a81d25b6..18304ae70 100644 --- a/src/engine/playback.cpp +++ b/src/engine/playback.cpp @@ -206,9 +206,12 @@ const char* cmdName[]={ "SNES_ECHO_FEEDBACK", "SNES_ECHO_FIR", - "DIV_CMD_NES_ENV_MODE", - "DIV_CMD_NES_LENGTH", - "DIV_CMD_NES_COUNT_MODE", + "NES_ENV_MODE", + "NES_LENGTH", + "NES_COUNT_MODE", + + "MACRO_OFF", + "MACRO_ON", "ALWAYS_SET_VOLUME" }; @@ -824,6 +827,12 @@ void DivEngine::processRow(int i, bool afterDelay) { chan[i].volSpeed=-effectVal; dispatchCmd(DivCommand(DIV_CMD_HINT_VOL_SLIDE,i,chan[i].volSpeed)); break; + case 0xf5: // disable macro + dispatchCmd(DivCommand(DIV_CMD_MACRO_OFF,i,effectVal&0xff)); + break; + case 0xf6: // enable macro + dispatchCmd(DivCommand(DIV_CMD_MACRO_ON,i,effectVal&0xff)); + break; case 0xf8: // single volume ramp up chan[i].volume=MIN(chan[i].volume+effectVal*256,chan[i].volMax); dispatchCmd(DivCommand(DIV_CMD_VOLUME,i,chan[i].volume>>8)); diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp index 017efd1a0..40098ec77 100644 --- a/src/gui/guiConst.cpp +++ b/src/gui/guiConst.cpp @@ -440,8 +440,8 @@ const FurnaceGUIColors fxColors[256]={ GUI_COLOR_PATTERN_EFFECT_PITCH, // F2 GUI_COLOR_PATTERN_EFFECT_VOLUME, // F3 GUI_COLOR_PATTERN_EFFECT_VOLUME, // F4 - GUI_COLOR_PATTERN_EFFECT_INVALID, // F5 - GUI_COLOR_PATTERN_EFFECT_INVALID, // F6 + GUI_COLOR_PATTERN_EFFECT_MISC, // F5 + GUI_COLOR_PATTERN_EFFECT_MISC, // F6 GUI_COLOR_PATTERN_EFFECT_INVALID, // F7 GUI_COLOR_PATTERN_EFFECT_VOLUME, // F8 GUI_COLOR_PATTERN_EFFECT_VOLUME, // F9