thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKENDS: Improve SDL Mixer Output Format Checks and Reporting.

Browse source 
This commit corrects a number of minor issues and adds warnings
for when the desired output parameters given to SDL_OpenAudio()
don't match the obtained.
This commit is contained in:
D G Turner 2011-06-14 00:15:50 +01:00
parent f932a11587
commit 8c485fe2da
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
backends/mixer/sdl/sdl-mixer.cpp
View file

@ -61,18 +61,34 @@ void SdlMixerManager::init() {
// Get the desired audio specs // Get the desired audio specs
SDL_AudioSpec desired = getAudioSpec(SAMPLES_PER_SEC); SDL_AudioSpec desired = getAudioSpec(SAMPLES_PER_SEC);
// Needed as SDL_OpenAudio as of SDL-1.2.14 mutates fields in
// "desired" if used directly.
SDL_AudioSpec fmt = desired;
// Start SDL audio with the desired specs // Start SDL audio with the desired specs
if (SDL_OpenAudio(&desired, &_obtainedRate) != 0) { if (SDL_OpenAudio(&fmt, &_obtained) != 0) {
warning("Could not open audio device: %s", SDL_GetError()); warning("Could not open audio device: %s", SDL_GetError());
_mixer = new Audio::MixerImpl(g_system, desired.freq); _mixer = new Audio::MixerImpl(g_system, desired.freq);
assert(_mixer); assert(_mixer);
_mixer->setReady(false); _mixer->setReady(false);
} else { } else {
debug(1, "Output sample rate: %d Hz", _obtainedRate.freq); debug(1, "Output sample rate: %d Hz", _obtained.freq);
if (_obtained.freq != desired.freq)
warning("SDL mixer output sample rate: %d differs from desired: %d", _obtained.freq, desired.freq);
_mixer = new Audio::MixerImpl(g_system, _obtainedRate.freq); debug(1, "Output buffer size: %d samples", _obtained.samples);
assert(_mixer); if (_obtained.samples != desired.samples)
warning("SDL mixer output buffer size: %d differs from desired: %d", _obtained.samples, desired.samples);
if (_obtained.format != desired.format)
warning("SDL mixer sound format: %d differs from desired: %d", _obtained.format, desired.format);
if (_obtained.channels != 2)
error("SDL mixer output requires stereo output device");
_mixer = new Audio::MixerImpl(g_system, _obtained.freq);
assert(_mixer);
_mixer->setReady(true); _mixer->setReady(true);
startAudio(); startAudio();
@ -133,7 +149,7 @@ void SdlMixerManager::suspendAudio() {
int SdlMixerManager::resumeAudio() { int SdlMixerManager::resumeAudio() {
if (!_audioSuspended) if (!_audioSuspended)
return -2; return -2;
if (SDL_OpenAudio(&_obtainedRate, NULL) < 0){ if (SDL_OpenAudio(&_obtained, NULL) < 0){
return -1; return -1;
} }
SDL_PauseAudio(0); SDL_PauseAudio(0);

2
backends/mixer/sdl/sdl-mixer.h
View file

@ -67,7 +67,7 @@ protected:
* The obtained audio specification after opening the * The obtained audio specification after opening the
* audio system. * audio system.
*/ */
SDL_AudioSpec _obtainedRate; SDL_AudioSpec _obtained;
/** State of the audio system */ /** State of the audio system */
bool _audioSuspended; bool _audioSuspended;