Skip to content

Commit

Permalink
GUI: get rid of party mode
Browse files Browse the repository at this point in the history
  • Loading branch information
tildearrow committed Sep 22, 2024
1 parent 8b38ab7 commit f8b3c81
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# to-do for 0.6.8

- OPL3 mute fix

# to-do long term

- CSM macros
Expand Down
10 changes: 2 additions & 8 deletions src/gui/about.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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; j<e->getAudioDescGot().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;
Expand Down
2 changes: 0 additions & 2 deletions src/gui/gui.h
Original file line number Diff line number Diff line change
Expand Up @@ -1836,7 +1836,6 @@ class FurnaceGUI {
int allowEditDocking;
int chipNames;
int overflowHighlight;
int partyTime;
int flatNotes;
int germanNotation;
int stepOnDelete;
Expand Down Expand Up @@ -2098,7 +2097,6 @@ class FurnaceGUI {
allowEditDocking(1),
chipNames(0),
overflowHighlight(0),
partyTime(0),
germanNotation(0),
stepOnDelete(0),
scrollStep(0),
Expand Down
12 changes: 0 additions & 12 deletions src/gui/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit f8b3c81

Please sign in to comment.