diff options
author | Max Horn | 2010-03-10 21:01:44 +0000 |
---|---|---|
committer | Max Horn | 2010-03-10 21:01:44 +0000 |
commit | c97ee14a65afc0b8a11ef5c10105e966f67a5934 (patch) | |
tree | 0514519a8d07564c3f572689b5bd75ed99111dea /backends/platform/symbian | |
parent | 5af51ba9a1f60f740401fdb513d1a961c590e527 (diff) | |
download | scummvm-rg350-c97ee14a65afc0b8a11ef5c10105e966f67a5934.tar.gz scummvm-rg350-c97ee14a65afc0b8a11ef5c10105e966f67a5934.tar.bz2 scummvm-rg350-c97ee14a65afc0b8a11ef5c10105e966f67a5934.zip |
Remove last traces of OSystem::getOutputSampleRate()
svn-id: r48229
Diffstat (limited to 'backends/platform/symbian')
-rw-r--r-- | backends/platform/symbian/src/SymbianOS.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index aaa2c87158..480b62849e 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -222,13 +222,13 @@ void OSystem_SDL_Symbian::setupMixer() { memset(&desired, 0, sizeof(desired)); - _samplesPerSec = 0; + uint32 samplesPerSec = 0; if (ConfMan.hasKey("output_rate")) - _samplesPerSec = ConfMan.getInt("output_rate"); + samplesPerSec = ConfMan.getInt("output_rate"); - if (_samplesPerSec <= 0) - _samplesPerSec = SAMPLES_PER_SEC; + if (samplesPerSec <= 0) + samplesPerSec = SAMPLES_PER_SEC; // Originally, we always used 2048 samples. This loop will produce the // same result at 22050 Hz, and should hopefully produce something @@ -237,12 +237,12 @@ void OSystem_SDL_Symbian::setupMixer() { uint32 samples = 0x8000; for (;;) { - if ((1000 * samples) / _samplesPerSec < 100) + if ((1000 * samples) / samplesPerSec < 100) break; samples >>= 1; } - desired.freq = _samplesPerSec; + desired.freq = samplesPerSec; desired.format = AUDIO_S16SYS; desired.channels = 2; desired.samples = (uint16)samples; @@ -256,13 +256,13 @@ void OSystem_SDL_Symbian::setupMixer() { if (SDL_OpenAudio(&desired, &obtained) != 0) { warning("Could not open audio device: %s", SDL_GetError()); - _samplesPerSec = 0; + samplesPerSec = 0; _mixer->setReady(false); } else { // 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; _channels = obtained.channels; // Need to create mixbuffer for stereo mix to downmix @@ -271,7 +271,7 @@ void OSystem_SDL_Symbian::setupMixer() { } // Tell the mixer that we are ready and start the sound processing - _mixer->setOutputRate(_samplesPerSec); + _mixer->setOutputRate(samplesPerSec); _mixer->setReady(true); SDL_PauseAudio(0); } |