Merge remote-tracking branch 'origin/master' into newFilePicker
This commit is contained in:
commit
f9372ec53f
19 changed files with 224 additions and 67 deletions
|
|
@ -1161,9 +1161,10 @@ void FurnaceGUI::drawSettings() {
|
|||
settings.newSongBehavior=1;
|
||||
settingsChanged=true;
|
||||
}
|
||||
if (ImGui::InputText(_("Default author name"), &settings.defaultAuthorName)) settingsChanged=true;
|
||||
ImGui::Unindent();
|
||||
|
||||
if (ImGui::InputText(_("Default author name"), &settings.defaultAuthorName)) settingsChanged=true;
|
||||
|
||||
// SUBSECTION START-UP
|
||||
CONFIG_SUBSECTION(_("Start-up"));
|
||||
#ifndef NO_INTRO
|
||||
|
|
@ -1229,6 +1230,14 @@ void FurnaceGUI::drawSettings() {
|
|||
settings.s3mOPL3=s3mOPL3B;
|
||||
settingsChanged=true;
|
||||
}
|
||||
bool sampleImportInstDetuneB=settings.sampleImportInstDetune;
|
||||
if (ImGui::Checkbox(_("Load sample fine tuning when importing a sample"), &sampleImportInstDetuneB)) {
|
||||
settings.sampleImportInstDetune=sampleImportInstDetuneB;
|
||||
settingsChanged=true;
|
||||
}
|
||||
if (ImGui::IsItemHovered()) {
|
||||
ImGui::SetTooltip(_("this may result in glitches with some samples."));
|
||||
}
|
||||
|
||||
#ifdef ANDROID
|
||||
// SUBSECTION ANDROID
|
||||
|
|
@ -3843,7 +3852,7 @@ void FurnaceGUI::drawSettings() {
|
|||
settingsChanged=true;
|
||||
}
|
||||
|
||||
// SUBSECTION SONG COMMENTS
|
||||
// SUBSECTION CHIP MANAGER
|
||||
CONFIG_SUBSECTION(_("Chip Manager"));
|
||||
bool rackShowLEDsB=settings.rackShowLEDs;
|
||||
if (ImGui::Checkbox(_("Show channel indicators"), &rackShowLEDsB)) {
|
||||
|
|
@ -4880,6 +4889,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
|
|||
settings.vibrationLength=conf.getInt("vibrationLength",20);
|
||||
|
||||
settings.s3mOPL3=conf.getInt("s3mOPL3",1);
|
||||
settings.sampleImportInstDetune=conf.getInt("sampleImportInstDetune",0);
|
||||
|
||||
settings.backupEnable=conf.getInt("backupEnable",1);
|
||||
settings.backupInterval=conf.getInt("backupInterval",30);
|
||||
|
|
@ -5395,6 +5405,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
|
|||
clampSetting(settings.autoFillSave,0,1);
|
||||
clampSetting(settings.autoMacroStepSize,0,2);
|
||||
clampSetting(settings.s3mOPL3,0,1);
|
||||
clampSetting(settings.sampleImportInstDetune,0,1);
|
||||
clampSetting(settings.backgroundPlay,0,1);
|
||||
clampSetting(settings.noMaximizeWorkaround,0,1);
|
||||
|
||||
|
|
@ -5477,6 +5488,7 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
|
|||
conf.set("vibrationLength",settings.vibrationLength);
|
||||
|
||||
conf.set("s3mOPL3",settings.s3mOPL3);
|
||||
conf.set("sampleImportInstDetune",settings.sampleImportInstDetune);
|
||||
|
||||
conf.set("backupEnable",settings.backupEnable);
|
||||
conf.set("backupInterval",settings.backupInterval);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue