From 28a9d2c4a3b7a40e0c8ef60f0a351d9217fba858 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Tue, 14 Dec 2021 12:40:26 -0500 Subject: [PATCH] now the GUI --- src/engine/platform/arcade.cpp | 1 + src/engine/playback.cpp | 4 ++-- src/gui/gui.cpp | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/engine/platform/arcade.cpp b/src/engine/platform/arcade.cpp index e5563604..b4e00f29 100644 --- a/src/engine/platform/arcade.cpp +++ b/src/engine/platform/arcade.cpp @@ -313,6 +313,7 @@ int DivPlatformArcade::dispatch(DivCommand c) { } else { rWrite(0x0f,0); } + break; } case DIV_CMD_SAMPLE_BANK: sampleBank=c.value; diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp index 9428cdfb..bb9df452 100644 --- a/src/engine/playback.cpp +++ b/src/engine/playback.cpp @@ -262,8 +262,7 @@ bool DivEngine::perSystemPostEffect(int ch, unsigned char effect, unsigned char return false; } break; - case DIV_SYSTEM_C64_6581: - case DIV_SYSTEM_C64_8580: + case DIV_SYSTEM_C64_6581: case DIV_SYSTEM_C64_8580: switch (effect) { case 0x10: // select waveform dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal)); @@ -298,6 +297,7 @@ bool DivEngine::perSystemPostEffect(int ch, unsigned char effect, unsigned char default: return false; } + break; default: return false; } diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 12b77498..e0db7acc 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -159,7 +159,7 @@ void FurnaceGUI::drawOrders() { void FurnaceGUI::drawInsList() { if (!insListOpen) return; if (ImGui::Begin("Instruments",&insListOpen)) { - for (int i=0; isong.ins.size(); i++) { + for (int i=0; i<(int)e->song.ins.size(); i++) { DivInstrument* ins=e->song.ins[i]; if (ImGui::Selectable(fmt::sprintf("%d: %s##_INS%d\n",i,ins->name,i).c_str(),curIns==i)) { curIns=i; @@ -172,7 +172,7 @@ void FurnaceGUI::drawInsList() { void FurnaceGUI::drawInsEdit() { if (!insEditOpen) return; if (ImGui::Begin("Instrument Editor",&insEditOpen,ImGuiWindowFlags_NoDocking)) { - if (curIns>=e->song.ins.size()) { + if (curIns>=(int)e->song.ins.size()) { ImGui::Text("no instrument selected"); } else { DivInstrument* ins=e->song.ins[curIns]; @@ -501,7 +501,7 @@ void FurnaceGUI::drawPattern() { float lineHeight=(ImGui::GetTextLineHeight()+2*dpiScale); ImVec2 threeChars=ImVec2(oneCharSize*3.0f,lineHeight); ImVec2 twoChars=ImVec2(oneCharSize*2.0f,lineHeight); - ImVec2 oneChar=ImVec2(oneCharSize,lineHeight); + //ImVec2 oneChar=ImVec2(oneCharSize,lineHeight); int dummyRows=(ImGui::GetWindowSize().y/lineHeight)/2; for (int i=0; i