etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI: swap position of FB and ALG in ins edit

This commit is contained in:
tildearrow 2022-01-29 04:25:28 -05:00
parent 54a84c2ce1
commit 28a0f8775f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/gui.cpp
View File

@ -1140,10 +1140,10 @@ void FurnaceGUI::drawInsEdit() {
float loopIndicator[256];
if (ImGui::BeginTabItem("FM")) {
ImGui::Columns(3,NULL,false);
P(ImGui::SliderScalar(FM_NAME(FM_ALG),ImGuiDataType_U8,&ins->fm.alg,&_ZERO,&_SEVEN));
ImGui::NextColumn();
P(ImGui::SliderScalar(FM_NAME(FM_FB),ImGuiDataType_U8,&ins->fm.fb,&_ZERO,&_SEVEN));
ImGui::NextColumn();
P(ImGui::SliderScalar(FM_NAME(FM_ALG),ImGuiDataType_U8,&ins->fm.alg,&_ZERO,&_SEVEN));
ImGui::NextColumn();
ImGui::Text("%s",fourOpAlgs[ins->fm.alg&7]);
ImGui::NextColumn();
P(ImGui::SliderScalar(FM_NAME(FM_FMS),ImGuiDataType_U8,&ins->fm.fms,&_ZERO,&_SEVEN));
@ -4897,9 +4897,12 @@ bool FurnaceGUI::loop() {
exportAudio(copyOfName,DIV_EXPORT_MODE_MANY_CHAN);
break;
case GUI_FILE_INS_OPEN:
e->addInstrumentFromFile(copyOfName.c_str());
if (!e->getWarnings().empty()) {
showWarning(e->getWarnings(),GUI_WARN_GENERIC);
if (e->addInstrumentFromFile(copyOfName.c_str())) {
if (!e->getWarnings().empty()) {
showWarning(e->getWarnings(),GUI_WARN_GENERIC);
}
} else {
showError("cannot load instrument! ("+e->getLastError()+")");
}
break;
case GUI_FILE_WAVE_OPEN: