zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-04-22 08:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom into g1.8

Browse source
This commit is contained in:
alexey.lysiuk 2016-02-03 12:15:14 +02:00
commit 50215880ff
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/sound/music_dumb.cpp
View file

@ -129,6 +129,11 @@ 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_scan, 500, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
CVAR(Int, mod_autochip_scan_threshold, 12, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
CUSTOM_CVAR(Float, mod_dumb_mastervolume, 1.f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
{
if (self < 0.5f) self = 0.5f;
else if (self > 16.f) self = 16.f;
}
// PRIVATE DATA DEFINITIONS ------------------------------------------------
@ -974,7 +979,7 @@ bool input_mod::read(SoundStream *stream, void *buffer, int sizebytes, void *use
// Convert to float
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;

2
src/sound/oalsound.h
View file

@ -7,6 +7,8 @@
#ifndef NO_OPENAL
#define AL_NO_PROTOTYPES
#include "al.h"
#include "alc.h"

1
wadsrc/static/menudef.txt
View file

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