citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #3046 from MerryMage/sdl-disallow-device-changes 

sdl2_sink: Disallow audio device from changing any parameter other than the frequency
This commit is contained in:
James Rowe 2017-10-24 09:22:28 -06:00 committed by GitHub
parent b4c1c26511 211cc5e28f
commit b36f748acd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio_core/sdl2_sink.cpp
View File

@ -55,8 +55,8 @@ SDL2Sink::SDL2Sink() : impl(std::make_unique<Impl>()) {
device = Settings::values.audio_device_id.c_str(); device = Settings::values.audio_device_id.c_str();
} }
impl->audio_device_id = SDL_OpenAudioDevice(device, false, &desired_audiospec, impl->audio_device_id = SDL_OpenAudioDevice(
&obtained_audiospec, SDL_AUDIO_ALLOW_ANY_CHANGE); device, false, &desired_audiospec, &obtained_audiospec, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE);
if (impl->audio_device_id <= 0) { if (impl->audio_device_id <= 0) {
LOG_CRITICAL(Audio_Sink, "SDL_OpenAudioDevice failed with code %d for device \"%s\"", LOG_CRITICAL(Audio_Sink, "SDL_OpenAudioDevice failed with code %d for device \"%s\"",
impl->audio_device_id, Settings::values.audio_device_id.c_str()); impl->audio_device_id, Settings::values.audio_device_id.c_str());