Patch #2826508: "Motorola A1200/E6/A1600 (motoezx) patch"
svn-id: r43636
This commit is contained in:
parent
ea87405ae4
commit
70b7ebb339
19 changed files with 582 additions and 6 deletions
|
@ -695,7 +695,6 @@ void OSystem_SDL::mixCallback(void *sys, byte *samples, int len) {
|
|||
|
||||
void OSystem_SDL::setupMixer() {
|
||||
SDL_AudioSpec desired;
|
||||
SDL_AudioSpec obtained;
|
||||
|
||||
// Determine the desired output sampling frequency.
|
||||
_samplesPerSec = 0;
|
||||
|
@ -725,7 +724,7 @@ void OSystem_SDL::setupMixer() {
|
|||
_mixer = new Audio::MixerImpl(this);
|
||||
assert(_mixer);
|
||||
|
||||
if (SDL_OpenAudio(&desired, &obtained) != 0) {
|
||||
if (SDL_OpenAudio(&desired, &_obtained) != 0) {
|
||||
warning("Could not open audio device: %s", SDL_GetError());
|
||||
_samplesPerSec = 0;
|
||||
_mixer->setReady(false);
|
||||
|
@ -733,7 +732,7 @@ void OSystem_SDL::setupMixer() {
|
|||
// Note: This should be the obtained output rate, but it seems that at
|
||||
// least on some platforms SDL will lie and claim it did get the rate
|
||||
// even if it didn't. Probably only happens for "weird" rates, though.
|
||||
_samplesPerSec = obtained.freq;
|
||||
_samplesPerSec = _obtained.freq;
|
||||
debug(1, "Output sample rate: %d Hz", _samplesPerSec);
|
||||
|
||||
// Tell the mixer that we are ready and start the sound processing
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue