diff --git a/src/engine/dispatch.h b/src/engine/dispatch.h index a71d87c69..d736fcfe0 100644 --- a/src/engine/dispatch.h +++ b/src/engine/dispatch.h @@ -250,8 +250,8 @@ enum DivDispatchCmds { DIV_CMD_MACRO_RESTART, // (which) - DIV_CMD_POWER_NOISE_COUNTER_LOAD, // (which, val) - DIV_CMD_POWER_NOISE_IO_WRITE, // (port, value) + DIV_CMD_POWERNOISE_COUNTER_LOAD, // (which, val) + DIV_CMD_POWERNOISE_IO_WRITE, // (port, value) DIV_CMD_MAX }; diff --git a/src/engine/dispatchContainer.cpp b/src/engine/dispatchContainer.cpp index d6be1ece8..06049a69f 100644 --- a/src/engine/dispatchContainer.cpp +++ b/src/engine/dispatchContainer.cpp @@ -649,7 +649,7 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do case DIV_SYSTEM_ESFM: dispatch=new DivPlatformESFM; break; - case DIV_SYSTEM_POWER_NOISE: + case DIV_SYSTEM_POWERNOISE: dispatch=new DivPlatformPowerNoise; break; case DIV_SYSTEM_DUMMY: diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp index f7f3e26b7..cbaa10f5d 100644 --- a/src/engine/instrument.cpp +++ b/src/engine/instrument.cpp @@ -1043,7 +1043,7 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo featureFM=true; featureEF=true; break; - case DIV_INS_POWER_NOISE: + case DIV_INS_POWERNOISE: break; case DIV_INS_MAX: break; diff --git a/src/engine/instrument.h b/src/engine/instrument.h index 3e7b98e62..6c78ad2f3 100644 --- a/src/engine/instrument.h +++ b/src/engine/instrument.h @@ -86,7 +86,7 @@ enum DivInstrumentType: unsigned short { DIV_INS_C140=53, DIV_INS_C219=54, DIV_INS_ESFM=55, - DIV_INS_POWER_NOISE=56, + DIV_INS_POWERNOISE=56, DIV_INS_MAX, DIV_INS_NULL }; diff --git a/src/engine/platform/powernoise.cpp b/src/engine/platform/powernoise.cpp index de020eaa5..422ef73e5 100644 --- a/src/engine/platform/powernoise.cpp +++ b/src/engine/platform/powernoise.cpp @@ -284,8 +284,8 @@ void DivPlatformPowerNoise::tick(bool sysTick) { int DivPlatformPowerNoise::dispatch(DivCommand c) { switch (c.cmd) { case DIV_CMD_NOTE_ON: { - DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_POWER_NOISE); - if (ins->type==DIV_INS_POWER_NOISE) { + DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_POWERNOISE); + if (ins->type==DIV_INS_POWERNOISE) { if (skipRegisterWrites) break; if (c.value!=DIV_NOTE_NULL) { chan[c.chan].baseFreq=NOTE_PERIODIC(c.value); @@ -378,7 +378,7 @@ int DivPlatformPowerNoise::dispatch(DivCommand c) { } case DIV_CMD_PRE_PORTA: { if (chan[c.chan].active && c.value2) { - if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_POWER_NOISE)); + if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_POWERNOISE)); } if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will && !NEW_ARP_STRAT) { chan[c.chan].baseFreq=NOTE_PERIODIC(c.value); @@ -389,7 +389,7 @@ int DivPlatformPowerNoise::dispatch(DivCommand c) { case DIV_CMD_GET_VOLMAX: return 15; break; - case DIV_CMD_POWER_NOISE_COUNTER_LOAD: { + case DIV_CMD_POWERNOISE_COUNTER_LOAD: { if (chan[c.chan].slope && c.value == 0) { rWrite(0x18, c.value2 & 0x7f); } @@ -398,7 +398,7 @@ int DivPlatformPowerNoise::dispatch(DivCommand c) { } break; } - case DIV_CMD_POWER_NOISE_IO_WRITE: + case DIV_CMD_POWERNOISE_IO_WRITE: rWrite(0x08 + (c.value << 3), c.value2); break; case DIV_CMD_MACRO_OFF: diff --git a/src/engine/platform/powernoise.h b/src/engine/platform/powernoise.h index c458d9fcc..8df12af32 100644 --- a/src/engine/platform/powernoise.h +++ b/src/engine/platform/powernoise.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _POWER_NOISE_H -#define _POWER_NOISE_H +#ifndef _POWERNOISE_H +#define _POWERNOISE_H #include "../dispatch.h" #include "../../../extern/pwrnoise/pwrnoise.h" diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp index 4494736d8..be8bc6de4 100644 --- a/src/engine/playback.cpp +++ b/src/engine/playback.cpp @@ -247,8 +247,8 @@ const char* cmdName[]={ "ESFM_MODIN", "ESFM_ENV_DELAY", - "POWER_NOISE_COUNTER_LOAD", - "POWER_NOISE_IO_WRITE", + "POWERNOISE_COUNTER_LOAD", + "POWERNOISE_IO_WRITE", "MACRO_RESTART", }; diff --git a/src/engine/song.h b/src/engine/song.h index e9e1f72e0..a4b60238a 100644 --- a/src/engine/song.h +++ b/src/engine/song.h @@ -133,7 +133,7 @@ enum DivSystem { DIV_SYSTEM_C140, DIV_SYSTEM_C219, DIV_SYSTEM_ESFM, - DIV_SYSTEM_POWER_NOISE, + DIV_SYSTEM_POWERNOISE, }; enum DivEffectType: unsigned short { diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp index 1e70e9f94..5739a2312 100644 --- a/src/engine/sysDef.cpp +++ b/src/engine/sysDef.cpp @@ -1985,19 +1985,19 @@ void DivEngine::registerSystems() { fmESFMPostEffectHandlerMap ); - sysDefs[DIV_SYSTEM_POWER_NOISE]=new DivSysDef( + sysDefs[DIV_SYSTEM_POWERNOISE]=new DivSysDef( "PowerNoise", NULL, 0xd4, 0, 4, false, false, 0, false, 0, 0, 0, "a fantasy sound chip designed by jvsTSX and The Beesh-Spweesh!\nused in the Hexheld fantasy console.", {"Noise 1", "Noise 2", "Noise 3", "Slope"}, {"N1", "N2", "N3", "SL"}, {DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_PULSE}, - {DIV_INS_POWER_NOISE, DIV_INS_POWER_NOISE, DIV_INS_POWER_NOISE, DIV_INS_POWER_NOISE}, + {DIV_INS_POWERNOISE, DIV_INS_POWERNOISE, DIV_INS_POWERNOISE, DIV_INS_POWERNOISE}, {}, { - {0x20, {DIV_CMD_POWER_NOISE_COUNTER_LOAD, "20xx: Load low byte of noise channel LFSR (00 to FF) or slope channel accumulator (00 to 7F)", constVal<0>, effectVal}}, - {0x21, {DIV_CMD_POWER_NOISE_COUNTER_LOAD, "21xx: Load high byte of noise channel LFSR (00 to FF)", constVal<1>, effectVal}}, - {0x22, {DIV_CMD_POWER_NOISE_IO_WRITE, "22xx: Write to I/O port A", constVal<0>, effectVal}}, - {0x23, {DIV_CMD_POWER_NOISE_IO_WRITE, "23xx: Write to I/O port B", constVal<1>, effectVal}}, + {0x20, {DIV_CMD_POWERNOISE_COUNTER_LOAD, "20xx: Load low byte of noise channel LFSR (00 to FF) or slope channel accumulator (00 to 7F)", constVal<0>, effectVal}}, + {0x21, {DIV_CMD_POWERNOISE_COUNTER_LOAD, "21xx: Load high byte of noise channel LFSR (00 to FF)", constVal<1>, effectVal}}, + {0x22, {DIV_CMD_POWERNOISE_IO_WRITE, "22xx: Write to I/O port A", constVal<0>, effectVal}}, + {0x23, {DIV_CMD_POWERNOISE_IO_WRITE, "23xx: Write to I/O port B", constVal<1>, effectVal}}, }, {} ); diff --git a/src/gui/gui.h b/src/gui/gui.h index a5da4d865..fc0a495b4 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -291,7 +291,7 @@ enum FurnaceGUIColors { GUI_COLOR_INSTR_C140, GUI_COLOR_INSTR_C219, GUI_COLOR_INSTR_ESFM, - GUI_COLOR_INSTR_POWER_NOISE, + GUI_COLOR_INSTR_POWERNOISE, GUI_COLOR_INSTR_UNKNOWN, GUI_COLOR_CHANNEL_BG, diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp index 3254808d7..5b58c3a99 100644 --- a/src/gui/guiConst.cpp +++ b/src/gui/guiConst.cpp @@ -987,7 +987,7 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={ D(GUI_COLOR_INSTR_C140,"",ImVec4(1.0f,1.0f,0.0f,1.0f)), D(GUI_COLOR_INSTR_C219,"",ImVec4(1.0f,0.8f,0.0f,1.0f)), D(GUI_COLOR_INSTR_ESFM,"",ImVec4(0.1f,0.9f,1.0f,1.0f)), - D(GUI_COLOR_INSTR_POWER_NOISE,"",ImVec4(1.0f,1.0f,0.8f,1.0f)), + D(GUI_COLOR_INSTR_POWERNOISE,"",ImVec4(1.0f,1.0f,0.8f,1.0f)), D(GUI_COLOR_INSTR_UNKNOWN,"",ImVec4(0.3f,0.3f,0.3f,1.0f)), D(GUI_COLOR_CHANNEL_BG,"",ImVec4(0.4f,0.6f,0.8f,1.0f)), @@ -1205,7 +1205,7 @@ const int availableSystems[]={ DIV_SYSTEM_PCM_DAC, DIV_SYSTEM_ESFM, DIV_SYSTEM_PONG, - DIV_SYSTEM_POWER_NOISE, + DIV_SYSTEM_POWERNOISE, 0 // don't remove this last one! }; @@ -1295,7 +1295,7 @@ const int chipsSpecial[]={ DIV_SYSTEM_VRC6, DIV_SYSTEM_MMC5, DIV_SYSTEM_SM8521, - DIV_SYSTEM_POWER_NOISE, + DIV_SYSTEM_POWERNOISE, 0 // don't remove this last one! }; diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index dcda086c8..7f64ad565 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -6906,7 +6906,7 @@ void FurnaceGUI::drawInsEdit() { dutyLabel="OP4 Noise Mode"; dutyMax=3; } - if (ins->type==DIV_INS_POWER_NOISE) { + if (ins->type==DIV_INS_POWERNOISE) { dutyMax=0; } @@ -6943,7 +6943,7 @@ void FurnaceGUI::drawInsEdit() { if (ins->type==DIV_INS_TED) waveMax=0; if (ins->type==DIV_INS_C140) waveMax=0; if (ins->type==DIV_INS_C219) waveMax=0; - if (ins->type==DIV_INS_POWER_NOISE) waveMax=0; + if (ins->type==DIV_INS_POWERNOISE) waveMax=0; if (ins->type==DIV_INS_SU || ins->type==DIV_INS_POKEY) waveMax=7; if (ins->type==DIV_INS_PET) { waveMax=8; @@ -7082,7 +7082,7 @@ void FurnaceGUI::drawInsEdit() { if (ins->type==DIV_INS_ES5506) { panMax=4095; } - if (ins->type==DIV_INS_POWER_NOISE) { + if (ins->type==DIV_INS_POWERNOISE) { panMax=15; } @@ -7173,7 +7173,7 @@ void FurnaceGUI::drawInsEdit() { ins->type==DIV_INS_C219 || ins->type==DIV_INS_TED || ins->type==DIV_INS_ESFM || - ins->type==DIV_INS_POWER_NOISE) { + ins->type==DIV_INS_POWERNOISE) { macroList.push_back(FurnaceGUIMacroDesc("Phase Reset",&ins->std.phaseResetMacro,0,1,32,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true)); } if (ex1Max>0) { @@ -7266,7 +7266,7 @@ void FurnaceGUI::drawInsEdit() { if (ins->type==DIV_INS_MSM5232) { macroList.push_back(FurnaceGUIMacroDesc("Noise",&ins->std.ex3Macro,0,1,32,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true)); } - if (ins->type==DIV_INS_POWER_NOISE) { + if (ins->type==DIV_INS_POWERNOISE) { macroList.push_back(FurnaceGUIMacroDesc("Control",&ins->std.ex1Macro,0,6,96,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true,powernoiseControlBits)); macroList.push_back(FurnaceGUIMacroDesc("Portion A Length",&ins->std.ex2Macro,0,255,128,uiColors[GUI_COLOR_MACRO_OTHER])); macroList.push_back(FurnaceGUIMacroDesc("Portion B Length",&ins->std.ex3Macro,0,255,128,uiColors[GUI_COLOR_MACRO_OTHER])); diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 162e6cd3c..b54137dba 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -2747,7 +2747,7 @@ void FurnaceGUI::initSystemPresets() { ); ENTRY( "PowerNoise", { - CH(DIV_SYSTEM_POWER_NOISE, 1.0f, 0, "") + CH(DIV_SYSTEM_POWERNOISE, 1.0f, 0, "") } ); CATEGORY_END;