From e16b4ec2b8637ec9ad19e8964d2e07d92c0f0dc8 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Tue, 4 Nov 2025 16:53:26 -0500 Subject: [PATCH] a couple fixes --- src/gui/doAction.cpp | 4 ++-- src/gui/editControls.cpp | 7 +++++++ src/gui/gui.cpp | 12 ++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/gui/doAction.cpp b/src/gui/doAction.cpp index e85ef3f07..99b29b1f8 100644 --- a/src/gui/doAction.cpp +++ b/src/gui/doAction.cpp @@ -321,10 +321,10 @@ void FurnaceGUI::doAction(int what) { nextWindow=GUI_WINDOW_NOTES; break; case GUI_ACTION_WINDOW_TUNER: - nextWindow = GUI_WINDOW_TUNER; + nextWindow=GUI_WINDOW_TUNER; break; case GUI_ACTION_WINDOW_SPECTRUM: - nextWindow = GUI_WINDOW_SPECTRUM; + nextWindow=GUI_WINDOW_SPECTRUM; break; case GUI_ACTION_WINDOW_CHANNELS: nextWindow=GUI_WINDOW_CHANNELS; diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp index 04e4da807..3b16af41b 100644 --- a/src/gui/editControls.cpp +++ b/src/gui/editControls.cpp @@ -651,6 +651,13 @@ void FurnaceGUI::drawMobileControls() { if (ImGui::Button(_("RefPlayer"))) { refPlayerOpen=!refPlayerOpen; } + if (ImGui::Button(_("Tuner"))) { + tunerOpen=!tunerOpen; + } + ImGui::SameLine(); + if (ImGui::Button(_("Spectrum"))) { + spectrumOpen=!spectrumOpen; + } if (ImGui::Button(_("Switch to Desktop Mode"))) { toggleMobileUI(!mobileUI); } diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index f8a486237..6976eadb9 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -4878,8 +4878,8 @@ bool FurnaceGUI::loop() { if (ImGui::MenuItem(_("oscilloscope (per-channel)"),BIND_FOR(GUI_ACTION_WINDOW_CHAN_OSC),chanOscOpen)) chanOscOpen=!chanOscOpen; if (ImGui::MenuItem(_("oscilloscope (X-Y)"),BIND_FOR(GUI_ACTION_WINDOW_XY_OSC),xyOscOpen)) xyOscOpen=!xyOscOpen; if (ImGui::MenuItem(_("volume meter"),BIND_FOR(GUI_ACTION_WINDOW_VOL_METER),volMeterOpen)) volMeterOpen=!volMeterOpen; - if (ImGui::MenuItem(_("tuner"), BIND_FOR(GUI_ACTION_WINDOW_TUNER), tunerOpen)) tunerOpen = !tunerOpen; - if (ImGui::MenuItem(_("spectrum"), BIND_FOR(GUI_ACTION_WINDOW_SPECTRUM), spectrumOpen)) spectrumOpen = !spectrumOpen; + if (ImGui::MenuItem(_("tuner"),BIND_FOR(GUI_ACTION_WINDOW_TUNER),tunerOpen)) tunerOpen=!tunerOpen; + if (ImGui::MenuItem(_("spectrum"),BIND_FOR(GUI_ACTION_WINDOW_SPECTRUM),spectrumOpen)) spectrumOpen=!spectrumOpen; ImGui::EndMenu(); } if (ImGui::BeginMenu(_("tempo"))) { @@ -5104,7 +5104,8 @@ bool FurnaceGUI::loop() { MEASURE(refPlayer,drawRefPlayer()); MEASURE(multiInsSetup,drawMultiInsSetup()); MEASURE(patManager,drawPatManager()); - + MEASURE(tuner,drawTuner()); + MEASURE(spectrum,drawSpectrum()); } else { globalWinFlags=0; ImGui::DockSpaceOverViewport(0,NULL,lockLayout?(ImGuiDockNodeFlags_NoWindowMenuButton|ImGuiDockNodeFlags_NoMove|ImGuiDockNodeFlags_NoResize|ImGuiDockNodeFlags_NoCloseButton|ImGuiDockNodeFlags_NoDocking|ImGuiDockNodeFlags_NoDockingSplit|ImGuiDockNodeFlags_NoDockingSplitOther):0); @@ -5141,7 +5142,7 @@ bool FurnaceGUI::loop() { MEASURE(piano,drawPiano()); MEASURE(notes,drawNotes()); MEASURE(tuner,drawTuner()); - MEASURE(spectrum, drawSpectrum()); + MEASURE(spectrum,drawSpectrum()); MEASURE(channels,drawChannels()); MEASURE(patManager,drawPatManager()); MEASURE(sysManager,drawSysManager()); @@ -8907,6 +8908,7 @@ FurnaceGUI::FurnaceGUI(): pianoOpen(false), notesOpen(false), tunerOpen(false), + spectrumOpen(false), channelsOpen(false), regViewOpen(false), logOpen(false), @@ -9212,6 +9214,8 @@ FurnaceGUI::FurnaceGUI(): xyOscDecayTime(10.0f), xyOscIntensity(2.0f), xyOscThickness(2.0f), + tunerFFTInBuf(NULL), + tunerFFTOutBuf(NULL), tunerPlan(NULL), fpCueInput(""), fpCueInputFailed(false),