diff options
| author | Max Horn | 2003-06-21 20:57:01 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-21 20:57:01 +0000 |
| commit | 1733bafbda15665dad525eb1d0be8ae4a71efd21 (patch) | |
| tree | f2d3fac48f64a38be64daa2812c1cebf0971bdb0 /scumm/smush/smush_mixer.cpp | |
| parent | 55e9f4ecbefb93e9726b5b6bccbeca93d595587e (diff) | |
| download | scummvm-rg350-1733bafbda15665dad525eb1d0be8ae4a71efd21.tar.gz scummvm-rg350-1733bafbda15665dad525eb1d0be8ae4a71efd21.tar.bz2 scummvm-rg350-1733bafbda15665dad525eb1d0be8ae4a71efd21.zip | |
get rid of 11025 Hz special case (I hope this is correct; only case I know of where 11025 Hz are used is during the Dig intro
svn-id: r8591
Diffstat (limited to 'scumm/smush/smush_mixer.cpp')
| -rw-r--r-- | scumm/smush/smush_mixer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index e5a41799d4..78f6c02e51 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -117,8 +117,6 @@ bool SmushMixer::handleFrame() { if (is_short) { data = malloc(size * (stereo ? 2 : 1) * 4); _channels[i].chan->getSoundData((int16 *)data, size); - if (_channels[i].chan->getRate() == 11025) - size *= 2; size *= stereo ? 4 : 2; flags |= SoundMixer::FLAG_16BITS; @@ -126,8 +124,6 @@ bool SmushMixer::handleFrame() { } else { data = malloc(size * (stereo ? 2 : 1) * 2); _channels[i].chan->getSoundData((int8 *)data, size); - if (_channels[i].chan->getRate() == 11025) - size *= 2; size *= stereo ? 2 : 1; flags |= SoundMixer::FLAG_UNSIGNED; |