zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added a mastervolume setting for DUMB because its default volume is far less than all the other music options.

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-02 14:45:32 +01:00
parent 5d19901cb7
commit c002c2fde9
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/sound/music_dumb.cpp
View file

@ -129,6 +129,7 @@ CVAR(Bool, mod_autochip, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
CVAR(Int, mod_autochip_size_force, 100, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR(Int, mod_autochip_size_force, 100, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
CVAR(Int, mod_autochip_size_scan, 500, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR(Int, mod_autochip_size_scan, 500, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
CVAR(Int, mod_autochip_scan_threshold, 12, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); CVAR(Int, mod_autochip_scan_threshold, 12, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
CVAR(Float, mod_dumb_mastervolume, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
// PRIVATE DATA DEFINITIONS ------------------------------------------------ // PRIVATE DATA DEFINITIONS ------------------------------------------------
@ -974,7 +975,7 @@ bool input_mod::read(SoundStream *stream, void *buffer, int sizebytes, void *use
// Convert to float // Convert to float
for (int i = 0; i < written * 2; ++i) for (int i = 0; i < written * 2; ++i)
{ {
((float *)buffer)[i] = ((int *)buffer)[i] / (float)(1 << 24); ((float *)buffer)[i] = (((int *)buffer)[i] / (float)(1 << 24)) * mod_dumb_mastervolume;
} }
} }
buffer = (BYTE *)buffer + written * 8; buffer = (BYTE *)buffer + written * 8;

1
wadsrc/static/menudef.txt
View file

@ -1651,6 +1651,7 @@ OptionMenu ModReplayerOptions
Title "MODULE REPLAYER OPTIONS" Title "MODULE REPLAYER OPTIONS"
Option "Replayer engine", "mod_dumb", "ModReplayers" Option "Replayer engine", "mod_dumb", "ModReplayers"
StaticText " " StaticText " "
Slider "Master Volume", "mod_dumb_mastervolume", 1, 32, 1, 1
Option "Sample rate", "mod_samplerate", "SampleRates", "mod_dumb" Option "Sample rate", "mod_samplerate", "SampleRates", "mod_dumb"
Option "Quality", "mod_interp", "ModQuality", "mod_dumb" Option "Quality", "mod_interp", "ModQuality", "mod_dumb"
Option "Volume ramping", "mod_volramp", "ModVolumeRamps", "mod_dumb" Option "Volume ramping", "mod_volramp", "ModVolumeRamps", "mod_dumb"