macro step number in label

except sid3 specialized stuff...
This commit is contained in:
Eknous-P 2025-07-23 11:04:39 +04:00 committed by tildearrow
parent d15522a117
commit 9a78903388

View file

@ -767,65 +767,81 @@ String macroHoverES5506FilterMode(int id, float val, void* u) {
} }
String macroLFOWaves(int id, float val, void* u) { String macroLFOWaves(int id, float val, void* u) {
const char* label="???";
switch (((int)val)&3) { switch (((int)val)&3) {
case 0: case 0:
return _("Saw"); label=_("Saw");
break;
case 1: case 1:
return _("Square"); label=_("Square");
break;
case 2: case 2:
return _("Triangle"); label=_("Triangle");
break;
case 3: case 3:
return _("Random"); label=_("Random");
default: break;
return "???"; default: break;
} }
return "???"; return fmt::sprintf("%d: %s",id,label);
} }
String macroVERAWaves(int id, float val, void* u) { String macroVERAWaves(int id, float val, void* u) {
const char* label="???";
switch (((int)val)&3) { switch (((int)val)&3) {
case 0: case 0:
return _("Pulse"); label=_("Pulse");
break;
case 1: case 1:
return _("Saw"); label=_("Saw");
break;
case 2: case 2:
return _("Triangle"); label=_("Triangle");
break;
case 3: case 3:
return _("Noise"); label=_("Noise");
default: break;
return "???"; default: break;
} }
return "???"; return fmt::sprintf("%d: %s",id,label);
} }
String macroSoundUnitWaves(int id, float val, void* u) { String macroSoundUnitWaves(int id, float val, void* u) {
const char* label="???";
switch (((int)val)&7) { switch (((int)val)&7) {
case 0: case 0:
return _("Square"); label=_("Square");
break;
case 1: case 1:
return _("Saw"); label=_("Saw");
break;
case 2: case 2:
return _("Sine"); label=_("Sine");
break;
case 3: case 3:
return _("Triangle"); label=_("Triangle");
break;
case 4: case 4:
return _("Noise"); label=_("Noise");
break;
case 5: case 5:
return _("Short Noise"); label=_("Short Noise");
break;
case 6: case 6:
return _("XOR Sine"); label=_("XOR Sine");
break;
case 7: case 7:
return _("XOR Triangle"); label=_("XOR Triangle");
default: break;
return "???"; default: break;
} }
return "???"; return fmt::sprintf("%d: %s",id,label);
} }
String macroSID3SpecialWaves(int id, float val, void* u) { String macroSID3SpecialWaves(int id, float val, void* u) {
if ((int)val<0 || (int)val>=SID3_NUM_SPECIAL_WAVES) return "???"; if ((int)val<0 || (int)val>=SID3_NUM_SPECIAL_WAVES) return "???";
return _(sid3SpecialWaveforms[(int)val%SID3_NUM_SPECIAL_WAVES]); return fmt::sprintf("%d: %s",id,_(sid3SpecialWaveforms[(int)val%SID3_NUM_SPECIAL_WAVES]));
} }
String macroSID3SourceChan(int id, float val, void* u) { String macroSID3SourceChan(int id, float val, void* u) {
@ -852,13 +868,13 @@ String macroSID3NoiseLFSR(int id, float val, void* u) {
String macroSID2WaveMixMode(int id, float val, void* u) { String macroSID2WaveMixMode(int id, float val, void* u) {
if ((int)val<0 || (int)val>3) return "???"; if ((int)val<0 || (int)val>3) return "???";
return _(sid2WaveMixModes[(int)val]); return fmt::sprintf("%d: %s",id,_(sid2WaveMixModes[(int)val]));
} }
String macroSID3WaveMixMode(int id, float val, void* u) { String macroSID3WaveMixMode(int id, float val, void* u) {
if ((int)val<0 || (int)val>4) return "???"; if ((int)val<0 || (int)val>4) return "???";
return _(sid3WaveMixModes[(int)val]); return fmt::sprintf("%d: %s",id,_(sid3WaveMixModes[(int)val]));
} }
void addAALine(ImDrawList* dl, const ImVec2& p1, const ImVec2& p2, const ImU32 color, float thickness=1.0f) { void addAALine(ImDrawList* dl, const ImVec2& p1, const ImVec2& p2, const ImU32 color, float thickness=1.0f) {