From c86b080b3b93e457aba7dbe34aad7d9d76f76d03 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Tue, 22 Jul 2025 02:38:59 -0500 Subject: [PATCH] Revert "waveform labels for su and vera" This reverts commit 98a200c7741bd226385f5f861df1f7079ee495c7. --- src/gui/insEdit.cpp | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index c14283c75..e2ff1867a 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -782,46 +782,6 @@ String macroLFOWaves(int id, float val, void* u) { return "???"; } -String macroVERAWaves(int id, float val, void* u) { - switch (((int)val)&3) { - case 0: - return _("Pulse"); - case 1: - return _("Saw"); - case 2: - return _("Triangle"); - case 3: - return _("Noise"); - default: - return "???"; - } - return "???"; -} - -String macroSoundUnitWaves(int id, float val, void* u) { - switch (((int)val)&7) { - case 0: - return _("Square"); - case 1: - return _("Saw"); - case 2: - return _("Sine"); - case 3: - return _("Triangle"); - case 4: - return _("Noise"); - case 5: - return _("Short Noise"); - case 6: - return _("XOR Sine"); - case 7: - return _("XOR Triangle"); - default: - return "???"; - } - return "???"; -} - String macroSID3SpecialWaves(int id, float val, void* u) { if ((int)val<0 || (int)val>=SID3_NUM_SPECIAL_WAVES) return "???"; @@ -8302,7 +8262,7 @@ void FurnaceGUI::drawInsEdit() { macroList.push_back(FurnaceGUIMacroDesc(_("Volume"),&ins->std.volMacro,0,63,160,uiColors[GUI_COLOR_MACRO_VOLUME])); macroList.push_back(FurnaceGUIMacroDesc(_("Arpeggio"),&ins->std.arpMacro,-120,120,160,uiColors[GUI_COLOR_MACRO_PITCH],true,NULL,macroHoverNote,false,NULL,true,ins->std.arpMacro.val)); macroList.push_back(FurnaceGUIMacroDesc(_("Duty"),&ins->std.dutyMacro,0,63,160,uiColors[GUI_COLOR_MACRO_OTHER])); - macroList.push_back(FurnaceGUIMacroDesc(_("Waveform"),&ins->std.waveMacro,0,3,160,uiColors[GUI_COLOR_MACRO_WAVE],false,NULL,macroVERAWaves,false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Waveform"),&ins->std.waveMacro,0,3,160,uiColors[GUI_COLOR_MACRO_WAVE],false,NULL,NULL,false,NULL)); macroList.push_back(FurnaceGUIMacroDesc(_("Panning"),&ins->std.panLMacro,0,2,32,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true,panBits)); macroList.push_back(FurnaceGUIMacroDesc(_("Pitch"),&ins->std.pitchMacro,-2048,2047,160,uiColors[GUI_COLOR_MACRO_PITCH],true,macroRelativeMode)); break; @@ -8375,7 +8335,7 @@ void FurnaceGUI::drawInsEdit() { macroList.push_back(FurnaceGUIMacroDesc(_("Volume"),&ins->std.volMacro,0,127,160,uiColors[GUI_COLOR_MACRO_VOLUME])); macroList.push_back(FurnaceGUIMacroDesc(_("Arpeggio"),&ins->std.arpMacro,-120,120,160,uiColors[GUI_COLOR_MACRO_PITCH],true,NULL,macroHoverNote,false,NULL,true,ins->std.arpMacro.val)); macroList.push_back(FurnaceGUIMacroDesc(_("Duty/Noise"),&ins->std.dutyMacro,0,127,160,uiColors[GUI_COLOR_MACRO_NOISE])); - macroList.push_back(FurnaceGUIMacroDesc(_("Waveform"),&ins->std.waveMacro,0,7,160,uiColors[GUI_COLOR_MACRO_WAVE],false,NULL,macroSoundUnitWaves,false,NULL)); + macroList.push_back(FurnaceGUIMacroDesc(_("Waveform"),&ins->std.waveMacro,0,7,160,uiColors[GUI_COLOR_MACRO_WAVE],false,NULL,NULL,false,NULL)); macroList.push_back(FurnaceGUIMacroDesc(_("Panning"),&ins->std.panLMacro,-127,127,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL)); macroList.push_back(FurnaceGUIMacroDesc(_("Pitch"),&ins->std.pitchMacro,-2048,2047,160,uiColors[GUI_COLOR_MACRO_PITCH],true,macroRelativeMode)); macroList.push_back(FurnaceGUIMacroDesc(_("Phase Reset"),&ins->std.phaseResetMacro,0,1,32,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true));