empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Audio: Make default volume 100, and changed volume scale so that 100 is identical to the SPC's output.

Browse source
This commit is contained in:
Sour 2019-05-20 14:41:24 -04:00
parent bdc06f5dda
commit d519c5bb86
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/SettingTypes.h
View file

@ -103,7 +103,7 @@ struct AudioConfig
bool EnableAudio = true;
bool DisableDynamicSampleRate = false;
uint32_t MasterVolume = 25;
uint32_t MasterVolume = 100;
uint32_t SampleRate = 48000;
uint32_t AudioLatency = 60;

4
Core/SoundMixer.cpp
View file

@ -55,10 +55,10 @@ void SoundMixer::PlayAudioBuffer(int16_t* samples, uint32_t sampleCount)
ProcessEqualizer(samples, sampleCount);
}
if(cfg.MasterVolume != 25) {
if(cfg.MasterVolume < 100) {
//Apply volume if not using the default value
for(uint32_t i = 0; i < sampleCount * 2; i++) {
samples[i] = (int32_t)samples[i] * (int32_t)cfg.MasterVolume / 25;
samples[i] = (int32_t)samples[i] * (int32_t)cfg.MasterVolume / 100;
}
}

2
UI/Config/AudioConfig.cs
View file

@ -14,7 +14,7 @@ namespace Mesen.GUI.Config
[MarshalAs(UnmanagedType.I1)] public bool EnableAudio = true;
[MarshalAs(UnmanagedType.I1)] public bool DisableDynamicSampleRate = false;
[MinMax(0, 100)] public UInt32 MasterVolume = 25;
[MinMax(0, 100)] public UInt32 MasterVolume = 100;
[ValidValues(11025, 22050, 32000, 44100, 48000, 96000)] public UInt32 SampleRate = 48000;
[MinMax(15, 300)] public UInt32 AudioLatency = 60;