diff --git a/README.md b/README.md index a1a7ae87c6..781f869d6f 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ for other operating systems, you may [build the source](#developer-info). --- # quick references -- **discussion**: see the [Discussions](https://github.com/tildearrow/furnace/discussions) section. +- **discussion**: see the [Discussions](https://github.com/tildearrow/furnace/discussions) section, or the [Discord](https://discord.gg/QhA26dXD23). - **help**: check out the [documentation](doc/README.md). ## packages diff --git a/TODO.md b/TODO.md index 37f473d9ec..d08d0ea17b 100644 --- a/TODO.md +++ b/TODO.md @@ -1,3 +1,7 @@ +# to-do for 0.6.8 + +- OPL3 mute fix + # to-do long term - CSM macros diff --git a/src/gui/about.cpp b/src/gui/about.cpp index e0677be010..29f8ece104 100644 --- a/src/gui/about.cpp +++ b/src/gui/about.cpp @@ -346,14 +346,8 @@ void FurnaceGUI::drawAbout() { float r=0; float g=0; float b=0; - float peakMix=settings.partyTime?0:0.3; - if (settings.partyTime) { - for (int j=0; jgetAudioDescGot().outChans; j++) { - peakMix+=peak[j]; - } - peakMix/=e->getAudioDescGot().outChans; - } - ImGui::ColorConvertHSVtoRGB(aboutHue,1.0,0.25+MIN(0.75f,peakMix*0.75f),r,g,b); + float peakMix=0.3; + ImGui::ColorConvertHSVtoRGB(aboutHue,1.0,0.475,r,g,b); dl->AddRectFilled(ImVec2(0,0),ImVec2(canvasW,canvasH),0xff000000); bool skip=false; bool skip2=false; diff --git a/src/gui/gui.h b/src/gui/gui.h index 068ff1102e..617f3a419c 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -1836,7 +1836,6 @@ class FurnaceGUI { int allowEditDocking; int chipNames; int overflowHighlight; - int partyTime; int flatNotes; int germanNotation; int stepOnDelete; @@ -2098,7 +2097,6 @@ class FurnaceGUI { allowEditDocking(1), chipNames(0), overflowHighlight(0), - partyTime(0), germanNotation(0), stepOnDelete(0), scrollStep(0), diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 4fbd424c10..d1f57fc3dd 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -1231,15 +1231,6 @@ void FurnaceGUI::drawSettings() { settingsChanged=true; } - bool partyTimeB=settings.partyTime; - if (ImGui::Checkbox(_("About screen party time"),&partyTimeB)) { - settings.partyTime=partyTimeB; - settingsChanged=true; - } - if (ImGui::IsItemHovered()) { - ImGui::SetTooltip(_("Warning: may cause epileptic seizures.")); - } - // SUBSECTION BEHAVIOR CONFIG_SUBSECTION(_("Behavior")); bool blankInsB=settings.blankIns; @@ -4959,7 +4950,6 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { settings.chipNames=conf.getInt("chipNames",0); settings.overflowHighlight=conf.getInt("overflowHighlight",0); - settings.partyTime=conf.getInt("partyTime",0); settings.flatNotes=conf.getInt("flatNotes",0); settings.germanNotation=conf.getInt("germanNotation",0); @@ -5172,7 +5162,6 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { clampSetting(settings.allowEditDocking,0,1); clampSetting(settings.chipNames,0,1); clampSetting(settings.overflowHighlight,0,1); - clampSetting(settings.partyTime,0,1); clampSetting(settings.flatNotes,0,1); clampSetting(settings.germanNotation,0,1); clampSetting(settings.stepOnDelete,0,1); @@ -5552,7 +5541,6 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { conf.set("chipNames",settings.chipNames); conf.set("overflowHighlight",settings.overflowHighlight); - conf.set("partyTime",settings.partyTime); conf.set("flatNotes",settings.flatNotes); conf.set("germanNotation",settings.germanNotation);