diff options
| author | Torbjörn Andersson | 2004-07-16 10:24:29 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-07-16 10:24:29 +0000 |
| commit | 70f8f689a152aee9a599c310a09da0a72508af6d (patch) | |
| tree | b6151287e1a67cb5eae6efd00333dc0ddf200753 /sound | |
| parent | 078dc6220f2f2cb829429c1075c9c66bd0f717c3 (diff) | |
| download | scummvm-rg350-70f8f689a152aee9a599c310a09da0a72508af6d.tar.gz scummvm-rg350-70f8f689a152aee9a599c310a09da0a72508af6d.tar.bz2 scummvm-rg350-70f8f689a152aee9a599c310a09da0a72508af6d.zip | |
Applied patch #957544 to make output sample rate configurable at runtime.
svn-id: r14225
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mixer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index b67b0c782b..40dfe8b3be 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -111,11 +111,6 @@ SoundMixer::SoundMixer() { _premixProc = 0; int i = 0; - _outputRate = (uint) _syst->getOutputSampleRate(); - - if (_outputRate == 0) - error("OSystem returned invalid sample rate"); - _globalVolume = 0; _musicVolume = 0; @@ -125,6 +120,12 @@ SoundMixer::SoundMixer() { _channels[i] = 0; _mixerReady = _syst->setSoundCallback(mixCallback, this); + _outputRate = (uint) _syst->getOutputSampleRate(); + + if (_outputRate == 0) + error("OSystem returned invalid sample rate"); + + debug(1, "Output sample rate: %d Hz", _outputRate); } SoundMixer::~SoundMixer() { |