diff options
| author | Max Horn | 2010-03-11 23:39:51 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-11 23:39:51 +0000 |
| commit | 9b837d66d4647a7642a761cefe5798d30a21504a (patch) | |
| tree | e5e96cd1a48850a699f0e77a748d415921f7b18e /backends/platform/wince/wince-sdl.cpp | |
| parent | 5886a0cc7715c874919a7056dfb6b65d3be19dce (diff) | |
| download | scummvm-rg350-9b837d66d4647a7642a761cefe5798d30a21504a.tar.gz scummvm-rg350-9b837d66d4647a7642a761cefe5798d30a21504a.tar.bz2 scummvm-rg350-9b837d66d4647a7642a761cefe5798d30a21504a.zip | |
Replace Audio::MixerImpl::setOutputRate with a new 'sampleRate' param to the MixerImpl constructor
svn-id: r48238
Diffstat (limited to 'backends/platform/wince/wince-sdl.cpp')
| -rw-r--r-- | backends/platform/wince/wince-sdl.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index e359ba1744..068935582b 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -785,7 +785,7 @@ void OSystem_WINCE3::setupMixer() { uint32 sampleRate = compute_sample_rate(); if (sampleRate == 0) - warning("setSoundCallback called with sample rate 0 - audio will not work"); + warning("OSystem_WINCE3::setupMixer called with sample rate 0 - audio will not work"); else if (_mixer && _mixer->getOutputRate() == sampleRate) { debug(1, "Skipping sound mixer re-init: samplerate is good"); return; @@ -801,7 +801,7 @@ void OSystem_WINCE3::setupMixer() { // Create the mixer instance if (_mixer == 0) - _mixer = new Audio::MixerImpl(this); + _mixer = new Audio::MixerImpl(this, sampleRate); // Add sound thread priority if (!ConfMan.hasKey("sound_thread_priority")) @@ -825,12 +825,11 @@ void OSystem_WINCE3::setupMixer() { int vol3 = _mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType); int vol4 = _mixer->getVolumeForSoundType(Audio::Mixer::kSpeechSoundType); delete _mixer; - _mixer = new Audio::MixerImpl(this); + _mixer = new Audio::MixerImpl(this, sampleRate); _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, vol1); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, vol2); _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, vol3); _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, vol4); - _mixer->setOutputRate(sampleRate); _mixer->setReady(true); SDL_PauseAudio(0); } |