From dc3df4e897f4938ea2af6126a4bf03ea2792db73 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 22 Apr 2017 10:58:30 +0200 Subject: [PATCH] - remove mod_dumb CVAR. This now effectively disabled module playback because the OpenAL backend cannot substitute for it, unlike FMod. --- src/sound/musicformats/music_dumb.cpp | 6 ------ wadsrc/static/menudef.txt | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/sound/musicformats/music_dumb.cpp b/src/sound/musicformats/music_dumb.cpp index d688d1c2d..7706ff947 100644 --- a/src/sound/musicformats/music_dumb.cpp +++ b/src/sound/musicformats/music_dumb.cpp @@ -135,7 +135,6 @@ typedef struct MODMIDICFG // PUBLIC DATA DEFINITIONS ------------------------------------------------- -CVAR(Bool, mod_dumb, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR(Int, mod_samplerate, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR(Int, mod_volramp, 2, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR(Int, mod_interp, DUMB_LQ_CUBIC, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); @@ -780,11 +779,6 @@ MusInfo *MOD_OpenSong(FileReader &reader) long fpos = 0; input_mod *state = NULL; - if (!mod_dumb) - { - return NULL; - } - bool is_it = false; bool is_dos = true; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 1fb0172c5..039a89cc1 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1723,8 +1723,6 @@ OptionValue ModVolumeRamps OptionMenu ModReplayerOptions { Title "$MODMNU_TITLE" - Option "$MODMNU_REPLAYERENGINE", "mod_dumb", "ModReplayers" - StaticText " " Slider "$MODMNU_MASTERVOLUME", "mod_dumb_mastervolume", 1, 16, 0.5, 1 Option "$ADVSNDMNU_SAMPLERATE", "mod_samplerate", "SampleRates", "mod_dumb" Option "$MODMNU_QUALITY", "mod_interp", "ModQuality", "mod_dumb"