diff options
author | Johannes Schickel | 2013-01-26 14:00:04 +0100 |
---|---|---|
committer | Johannes Schickel | 2013-01-26 14:00:04 +0100 |
commit | 94edb3409fa949a6391c54adb4bf7fc4a1d210ad (patch) | |
tree | a5b93cc6a9d2f323460684c9588e97709397cc94 /base/commandLine.cpp | |
parent | 3b77a97b404dd423005ae1a3545ca028c48f3f01 (diff) | |
parent | e4a77aff06645a76b575aaf4b8253760e0cd3710 (diff) | |
download | scummvm-rg350-94edb3409fa949a6391c54adb4bf7fc4a1d210ad.tar.gz scummvm-rg350-94edb3409fa949a6391c54adb4bf7fc4a1d210ad.tar.bz2 scummvm-rg350-94edb3409fa949a6391c54adb4bf7fc4a1d210ad.zip |
Merge branch 'eriktorbjorn-fluidsynth-settings'
This is a manual merge of a slightly adapted pull request #296.
The changes made are:
- Each time the theme format changes, the version was increased
- default.inc has been regenerated in the same commit as the theme changes
Diffstat (limited to 'base/commandLine.cpp')
-rw-r--r-- | base/commandLine.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 7f88dc0b63..c5c9fe3c90 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -239,6 +239,26 @@ void registerDefaults() { ConfMan.registerDefault("gui_saveload_chooser", "grid"); ConfMan.registerDefault("gui_saveload_last_pos", "0"); + +#ifdef USE_FLUIDSYNTH + // The settings are deliberately stored the same way as in Qsynth. The + // FluidSynth music driver is responsible for transforming them into + // their appropriate values. + ConfMan.registerDefault("fluidsynth_chorus_activate", true); + ConfMan.registerDefault("fluidsynth_chorus_nr", 3); + ConfMan.registerDefault("fluidsynth_chorus_level", 100); + ConfMan.registerDefault("fluidsynth_chorus_speed", 30); + ConfMan.registerDefault("fluidsynth_chorus_depth", 80); + ConfMan.registerDefault("fluidsynth_chorus_waveform", "sine"); + + ConfMan.registerDefault("fluidsynth_reverb_activate", true); + ConfMan.registerDefault("fluidsynth_reverb_roomsize", 20); + ConfMan.registerDefault("fluidsynth_reverb_damping", 0); + ConfMan.registerDefault("fluidsynth_reverb_width", 1); + ConfMan.registerDefault("fluidsynth_reverb_level", 90); + + ConfMan.registerDefault("fluidsynth_misc_interpolation", "4th"); +#endif } // |