zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- cleaned up the sound options menu. 

There were still some leftover definitions from FMod and far too many things were at the top level. Anything non-essential has been moved to the "Advanced Sound Options" submenu and the pointless sound backend switch has been removed entirely.
This commit is contained in:
Christoph Oelckers 2018-11-29 19:42:11 +01:00
parent 110b982031
commit df6fe563c3
2 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wadsrc/static/language.enu
View File

@ -2530,22 +2530,7 @@ OPTSTR_SIMPLEARROW = "Simple arrow";
OPTSTR_HERETIC = "Heretic"; OPTSTR_HERETIC = "Heretic";
OPTSTR_CHEX = "Chex"; OPTSTR_CHEX = "Chex";
OPTSTR_SYSTEMCURSOR = "System cursor"; OPTSTR_SYSTEMCURSOR = "System cursor";
OPTSTR_DIRECTSOUND = "DirectSound";
OPTSTR_WASAPI = "Vista WASAPI";
OPTSTR_ASIO = "ASIO";
OPTSTR_WAVEOUT = "WaveOut";
OPTSTR_NOSOUND = "No Sound"; OPTSTR_NOSOUND = "No Sound";
OPTSTR_OSS = "OSS";
OPTSTR_ALSA = "ALSA";
OPTSTR_SDL = "SDL";
OPTSTR_ESD = "ESD";
OPTSTR_PULSEAUDIO = "PulseAudio";
OPTSTR_COREAUDIO = "Core Audio";
OPTSTR_PCM8BIT = "8-bit";
OPTSTR_PCM16BIT = "16-bit";
OPTSTR_PCM24BIT = "24-bit";
OPTSTR_PCM32BIT = "32-bit";
OPTSTR_PCMFLOAT = "32-bit float";
OPTSTR_AUTO = "Auto"; OPTSTR_AUTO = "Auto";
OPTSTR_MONO = "Mono"; OPTSTR_MONO = "Mono";
OPTSTR_STEREO = "Stereo"; OPTSTR_STEREO = "Stereo";

46
wadsrc/static/menudef.txt
View File

@ -1553,16 +1553,6 @@ OptionString ALResamplers
// filled in by the sound code // filled in by the sound code
} }
OptionString OutputFormats
{
"PCM-8", "$OPTSTR_PCM8BIT"
"PCM-16", "$OPTSTR_PCM16BIT"
"PCM-24", "$OPTSTR_PCM24BIT"
"PCM-32", "$OPTSTR_PCM32BIT"
"PCM-Float", "$OPTSTR_PCMFLOAT"
}
OptionString SpeakerModes OptionString SpeakerModes
{ {
"Auto", "$OPTSTR_AUTO" "Auto", "$OPTSTR_AUTO"
@ -1585,12 +1575,6 @@ OptionString Resamplers
} }
OptionString SoundBackendsOpenALOnly
{
"openal", "$OPTSTR_OPENAL"
"null", "$OPTSTR_NOSOUND"
}
OptionMenu OpenALSoundItems protected OptionMenu OpenALSoundItems protected
{ {
Title "$OPENALMNU_TITLE" Title "$OPENALMNU_TITLE"
@ -1616,23 +1600,8 @@ OptionMenu SoundOptions protected
Option "$SNDMNU_UNDERWATERREVERB", "snd_waterreverb", "OnOff" Option "$SNDMNU_UNDERWATERREVERB", "snd_waterreverb", "OnOff"
Option "$SNDMNU_RANDOMIZEPITCHES", "snd_pitched", "OnOff" Option "$SNDMNU_RANDOMIZEPITCHES", "snd_pitched", "OnOff"
Slider "$SNDMNU_CHANNELS", "snd_channels", 64, 256, 8, 0 Slider "$SNDMNU_CHANNELS", "snd_channels", 64, 256, 8, 0
StaticText " "
Option "$SNDMNU_BACKGROUND", "i_soundinbackground", "OnOff"
StaticText " "
ifoption(openal)
{
Option "$SNDMNU_BACKEND", "snd_backend", "SoundBackendsOpenALOnly"
Submenu "$SNDMNU_OPENAL", "OpenALSoundItems"
}
StaticText " "
Command "$SNDMNU_RESTART", "snd_reset"
StaticText " " StaticText " "
Submenu "$SNDMNU_ADVANCED", "AdvSoundOptions" Submenu "$SNDMNU_ADVANCED", "AdvSoundOptions"
Submenu "$SNDMNU_MIDIPLAYER", "MidiPlayerOptions"
Submenu "$SNDMNU_MODREPLAYER", "ModReplayerOptions"
StaticText " "
Submenu "$OPTMNU_REVERB", "ReverbEdit" Submenu "$OPTMNU_REVERB", "ReverbEdit"
} }
@ -1665,6 +1634,21 @@ OptionMenu AdvSoundOptions protected
Title "$ADVSNDMNU_TITLE" Title "$ADVSNDMNU_TITLE"
Option "$ADVSNDMNU_SAMPLERATE", "snd_samplerate", "SampleRates" Option "$ADVSNDMNU_SAMPLERATE", "snd_samplerate", "SampleRates"
Option "$ADVSNDMNU_HRTF", "snd_hrtf", "AutoOffOn" Option "$ADVSNDMNU_HRTF", "snd_hrtf", "AutoOffOn"
StaticText " "
Option "$SNDMNU_BACKGROUND", "i_soundinbackground", "OnOff"
StaticText " "
ifoption(openal)
{
StaticText " "
Submenu "$SNDMNU_OPENAL", "OpenALSoundItems"
}
StaticText " "
Submenu "$SNDMNU_MIDIPLAYER", "MidiPlayerOptions"
Submenu "$SNDMNU_MODREPLAYER", "ModReplayerOptions"
StaticText " "
Command "$SNDMNU_RESTART", "snd_reset"
} }
OptionMenu GusConfigMenu protected OptionMenu GusConfigMenu protected