Merge branch 'tildearrow:master' into SID3

This commit is contained in:
LTVA1 2024-08-03 06:02:14 +03:00 committed by GitHub
commit a008707498
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 163 additions and 2 deletions

View file

@ -8180,6 +8180,22 @@ void FurnaceGUI::drawInsEdit() {
drawMacros(macroList,macroEditStateMacros);
ImGui::EndTabItem();
}
if (ins->type==DIV_INS_AY) {
if (!ins->amiga.useSample)
{
if (ImGui::BeginTabItem(_("Timer Macros")))
{
ImGui::Text(_("warning: timer effects are not supported by VGM export!"));
macroList.push_back(FurnaceGUIMacroDesc(_("Timer FX"),&ins->std.ex6Macro,0,3,64,uiColors[GUI_COLOR_MACRO_OTHER]));
macroList.push_back(FurnaceGUIMacroDesc(_("TFX Offset"),&ins->std.ex7Macro,-2048,2047,160,uiColors[GUI_COLOR_MACRO_PITCH],true));
macroList.push_back(FurnaceGUIMacroDesc(_("Timer Num"),&ins->std.ex8Macro,0,15,64,uiColors[GUI_COLOR_MACRO_OTHER]));
macroList.push_back(FurnaceGUIMacroDesc(_("Timer Den"),&ins->std.fmsMacro,0,15,64,uiColors[GUI_COLOR_MACRO_OTHER]));
macroList.push_back(FurnaceGUIMacroDesc(_("PWM Boundary"),&ins->std.amsMacro,0,15,64,uiColors[GUI_COLOR_MACRO_OTHER]));
drawMacros(macroList,macroEditStateMacros);
ImGui::EndTabItem();
}
}
}
if (ins->type==DIV_INS_POWERNOISE || ins->type==DIV_INS_POWERNOISE_SLOPE) {
if (ImGui::BeginTabItem("PowerNoise")) {
int pnOctave=ins->powernoise.octave;