otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MIXER STYLE SETTING, fix mac build

Browse source
This commit is contained in:
Eknous-P 2025-10-12 18:21:20 +04:00
parent d6899ed6a6
commit 7591c74e15
3 changed files with 81 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/gui/settings.cpp
View file

@ -1163,7 +1163,7 @@ void FurnaceGUI::drawSettings() {
}
ImGui::Unindent();
if (ImGui::InputText(_("Default author name"), &settings.defaultAuthorName)) settingsChanged=true;
if (ImGui::InputText(_("Default author name"),&settings.defaultAuthorName)) settingsChanged=true;
// SUBSECTION START-UP
CONFIG_SUBSECTION(_("Start-up"));
@ -1231,7 +1231,7 @@ void FurnaceGUI::drawSettings() {
settingsChanged=true;
}
bool sampleImportInstDetuneB=settings.sampleImportInstDetune;
if (ImGui::Checkbox(_("Load sample fine tuning when importing a sample"), &sampleImportInstDetuneB)) {
if (ImGui::Checkbox(_("Load sample fine tuning when importing a sample"),&sampleImportInstDetuneB)) {
settings.sampleImportInstDetune=sampleImportInstDetuneB;
settingsChanged=true;
}
@ -3847,7 +3847,7 @@ void FurnaceGUI::drawSettings() {
// SUBSECTION SONG COMMENTS
CONFIG_SUBSECTION(_("Song Comments"));
bool songNotesWrapB=settings.songNotesWrap;
if (ImGui::Checkbox(_("Wrap text"), &songNotesWrapB)) {
if (ImGui::Checkbox(_("Wrap text"),&songNotesWrapB)) {
settings.songNotesWrap=songNotesWrapB;
settingsChanged=true;
}
@ -3855,11 +3855,29 @@ void FurnaceGUI::drawSettings() {
// SUBSECTION CHIP MANAGER
CONFIG_SUBSECTION(_("Chip Manager"));
bool rackShowLEDsB=settings.rackShowLEDs;
if (ImGui::Checkbox(_("Show channel indicators"), &rackShowLEDsB)) {
if (ImGui::Checkbox(_("Show channel indicators"),&rackShowLEDsB)) {
settings.rackShowLEDs=rackShowLEDsB;
settingsChanged=true;
}
// SUBSECTION MIXER
CONFIG_SUBSECTION(_("Mixer"))
ImGui::Text(_("Mixer style:"));
ImGui::Indent();
if (ImGui::RadioButton(_("No volume meters"),settings.mixerStyle==0)) {
settings.mixerStyle=0;
settingsChanged=true;
}
if (ImGui::RadioButton(_("Volume meters to the side"),settings.mixerStyle==1)) {
settings.mixerStyle=1;
settingsChanged=true;
}
if (ImGui::RadioButton(_("Volume meters in volume sliders"),settings.mixerStyle==2)) {
settings.mixerStyle=2;
settingsChanged=true;
}
ImGui::Unindent();
// SUBSECTION WINDOWS
CONFIG_SUBSECTION(_("Windows"));
bool roundedWindowsB=settings.roundedWindows;
@ -5041,9 +5059,11 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
settings.oscAntiAlias=conf.getInt("oscAntiAlias",1);
settings.oscLineSize=conf.getFloat("oscLineSize",1.0f);
settings.songNotesWrap=conf.getInt("songNotesWrap", 0);
settings.songNotesWrap=conf.getInt("songNotesWrap",0);
settings.rackShowLEDs=conf.getInt("rackShowLEDs", 1);
settings.rackShowLEDs=conf.getInt("rackShowLEDs",1);
settings.mixerStyle=conf.getInt("mixerStyle",0);
settings.channelColors=conf.getInt("channelColors",1);
settings.channelTextColors=conf.getInt("channelTextColors",0);
@ -5381,8 +5401,9 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
clampSetting(settings.playbackTime,0,1);
clampSetting(settings.shaderOsc,0,1);
clampSetting(settings.oscLineSize,0.25f,16.0f);
clampSetting(settings.songNotesWrap, 0, 1);
clampSetting(settings.rackShowLEDs, 0, 1);
clampSetting(settings.songNotesWrap,0,1);
clampSetting(settings.rackShowLEDs,0,1);
clampSetting(settings.mixerStyle,0,2);
clampSetting(settings.cursorWheelStep,0,2);
clampSetting(settings.vsync,0,4);
clampSetting(settings.frameRateLimit,0,1000);
@ -5630,7 +5651,9 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
conf.set("songNotesWrap",settings.songNotesWrap);
conf.set("rackShowLEDs", settings.rackShowLEDs);
conf.set("rackShowLEDs",settings.rackShowLEDs);
conf.set("mixerStyle",settings.mixerStyle);
conf.set("channelColors",settings.channelColors);
conf.set("channelTextColors",settings.channelTextColors);