From 1733bafbda15665dad525eb1d0be8ae4a71efd21 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 21 Jun 2003 20:57:01 +0000 Subject: 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 --- scumm/smush/smush_mixer.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'scumm/smush/smush_mixer.cpp') 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; -- cgit v1.2.3