libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDL: fix --output-rate commandline option

Browse Source 
The commandline otion was ignored. The code would only query the scummvm.ini setting but not the transient domain (=commandline) setting.
This commit is contained in:
athrxx 2020-06-18 18:11:28 +02:00
parent 77dc9dfd09
commit 43678ae0c8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backends/mixer/sdl/sdl-mixer.cpp
View File

@ -146,14 +146,12 @@ static uint32 roundDownPowerOfTwo(uint32 samples) {
SDL_AudioSpec SdlMixerManager::getAudioSpec(uint32 outputRate) {
SDL_AudioSpec desired;
const char *const appDomain = Common::ConfigManager::kApplicationDomain;
// There was once a GUI option for this, but it was never used;
// configurability is retained for advanced users only who wish to modify
// their ScummVM config file directly
// There was once a GUI option for this, which was removed. Configurability
// is retained for advanced users only who wish to use the commandline
// option (--output-rate) or modify their ScummVM config file directly.
uint32 freq = 0;
if (ConfMan.hasKey("output_rate", appDomain))
freq = ConfMan.getInt("output_rate", appDomain);
if (ConfMan.hasKey("output_rate"))
freq = ConfMan.getInt("output_rate");
if (freq <= 0)
freq = outputRate;
@ -164,8 +162,8 @@ SDL_AudioSpec SdlMixerManager::getAudioSpec(uint32 outputRate) {
// characteristics which are not easily measured, so allow advanced users to
// tweak their audio buffer size if they are experience excess latency or
// drop-outs by setting this value in their ScummVM config file directly
if (ConfMan.hasKey("audio_buffer_size", appDomain))
samples = ConfMan.getInt("audio_buffer_size", appDomain);
if (ConfMan.hasKey("audio_buffer_size", Common::ConfigManager::kApplicationDomain))
samples = ConfMan.getInt("audio_buffer_size", Common::ConfigManager::kApplicationDomain);
// 256 is an arbitrary minimum; 32768 is the largest power-of-two value
// representable with uint16