ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALL: add support for --midi-gain and --soundfont

Browse Source
This commit is contained in:
grisenti
2022-05-29 13:56:21 +02:00
committed by Eugene Sandulenko
parent f71e98ddf5
commit 7dd0c1ddf8
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/commandLine.cpp
+6 -1
View File
@@ -1872,7 +1872,12 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo
if (settings.contains("multi-midi")) {
ConfMan.set("multi_midi", settings["multi-midi"], Common::ConfigManager::kSessionDomain);
}
if (settings.contains("midi-gain")) {
ConfMan.set("midi_gain", settings["midi-gain"], Common::ConfigManager::kSessionDomain);
}
if (settings.contains("soundfont")) {
ConfMan.set("soundfont", settings["soundfont"], Common::ConfigManager::kSessionDomain);
}
// Finally, store the command line settings into the config manager.
for (Common::StringMap::const_iterator x = settings.begin(); x != settings.end(); ++x) {
Common::String key(x->_key);
gui/options.cpp
+19 -6
View File
@@ -458,6 +458,9 @@ void OptionsDialog::build() {
_multiMidiCheckbox->setOverride(true);
Common::String soundFont(ConfMan.get("soundfont", _domain));
if (ConfMan.isKeyTemporary("soundfont")) {
_soundFont->setFontColor(ThemeEngine::FontColor::kFontColorOverride);
}
if (soundFont.empty() || !ConfMan.hasKey("soundfont", _domain)) {
_soundFont->setLabel(_c("None", "soundfont"));
_soundFontClearButton->setEnabled(false);
@@ -469,6 +472,8 @@ void OptionsDialog::build() {
// MIDI gain setting
_midiGainSlider->setValue(ConfMan.getInt("midi_gain", _domain));
_midiGainLabel->setLabel(Common::String::format("%.2f", (double)_midiGainSlider->getValue() / 100.0));
if (ConfMan.isKeyTemporary("midi_gain"))
_midiGainDesc->setFontColor(ThemeEngine::FontColor::kFontColorOverride);
}
// MT-32 options
@@ -884,18 +889,27 @@ void OptionsDialog::apply() {
ConfMan.setBool("multi_midi", _multiMidiCheckbox->getState(), _domain);
_multiMidiCheckbox->setOverride(false);
}
ConfMan.setInt("midi_gain", _midiGainSlider->getValue(), _domain);
if (_midiGainSlider->getValue() != ConfMan.getInt("midi_gain", _domain)) {
ConfMan.setInt("midi_gain", _midiGainSlider->getValue(), _domain);
_midiGainDesc->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
}
Common::U32String soundFont(_soundFont->getLabel());
if (!soundFont.empty() && (soundFont != _c("None", "soundfont")))
ConfMan.set("soundfont", soundFont.encode(), _domain);
else
ConfMan.removeKey("soundfont", _domain);
if (soundFont != ConfMan.get("soundfont", _domain)) {
_soundFont->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
if (soundFont.empty() || (soundFont != _c("None", "soundfont")))
ConfMan.removeKey("soundpath", _domain);
else
ConfMan.set("soundfont", soundFont.encode(), _domain);
}
} else {
ConfMan.removeKey("gm_device", _domain);
ConfMan.removeKey("multi_midi", _domain);
_multiMidiCheckbox->setOverride(false);
ConfMan.removeKey("midi_gain", _domain);
_midiGainDesc->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
ConfMan.removeKey("soundfont", _domain);
_soundFont->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
}
}
@@ -2163,7 +2177,6 @@ void GlobalOptionsDialog::build() {
} else {
widget->setLabel(path);
}
};
setPath(_savePath, "savepath", _("Default"));