From fbb931b759f4b2cef2f1bd1c1eabf0f222a4d9c2 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 28 Dec 2017 10:21:36 +0200 Subject: [PATCH] Improved Advanced Sound Options menu Added option for FluidSynth chorus Removed fractional part from FluidSynth voices option Removed duplicate localized string --- wadsrc/static/language.enu | 3 +-- wadsrc/static/menudef.txt | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index b05981a5a3..8b40c52da1 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -2162,11 +2162,10 @@ ADVSNDMNU_FLUIDSYNTH = "FluidSynth"; ADVSNDMNU_FLUIDPATCHSET = "Patch set"; ADVSNDMNU_FLUIDGAIN = "Gain"; ADVSNDMNU_REVERB = "Reverb"; -ADVSNDMNU_FLUIDVOICES = "MIDI voices"; +ADVSNDMNU_CHORUS = "Chorus"; ADVSNDMNU_TIMIDITY = "Timidity++"; ADVSNDMNU_TIMIDITYEXE = "Path for executable"; ADVSNDMNU_TIMIDITYCONFIG = "Timidity config file"; -ADVSNDMNU_TIMIDITYCHORUS = "Chorus"; ADVSNDMNU_TIMIDITYVOLUME = "Relative volume"; ADVSNDMNU_WILDMIDI = "WildMidi"; ADVSNDMNU_WILDMIDICONFIG = "WildMidi config file"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 9b2c9a6003..43c86b7124 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1678,7 +1678,8 @@ OptionMenu AdvSoundOptions protected SubMenu "$ADVSNDMNU_SELCONFIG", "FluidPatchsetMenu" Slider "$ADVSNDMNU_FLUIDGAIN", "fluid_gain", 0, 10, 0.5, 1 Option "$ADVSNDMNU_REVERB", "fluid_reverb", "OnOff" - Slider "$ADVSNDMNU_FLUIDVOICES", "fluid_voices", 16, 4096, 16, 1 + Option "$ADVSNDMNU_CHORUS", "fluid_chorus", "OnOff" + Slider "$ADVSNDMNU_MIDIVOICES", "fluid_voices", 16, 4096, 16, 0 // Leaving out the more advanced stuff for now. StaticText " " StaticText "$ADVSNDMNU_TIMIDITY", 1 @@ -1690,7 +1691,7 @@ OptionMenu AdvSoundOptions protected TextField "$ADVSNDMNU_TIMIDITYCONFIG", "timidity_config" SubMenu "$ADVSNDMNU_SELCONFIG", "TimidityConfigMenu" Option "$ADVSNDMNU_REVERB", "timidity_reverb", "OnOff" - Option "$ADVSNDMNU_TIMIDITYCHORUS", "timidity_chorus", "OnOff" + Option "$ADVSNDMNU_CHORUS", "timidity_chorus", "OnOff" Slider "$ADVSNDMNU_TIMIDITYVOLUME", "timidity_mastervolume", 0, 4, 0.2, 1 StaticText " " StaticText "$ADVSNDMNU_WILDMIDI", 1