diff options
Diffstat (limited to 'scumm/smush')
-rw-r--r-- | scumm/smush/smush_mixer.cpp | 8 | ||||
-rw-r--r-- | scumm/smush/smush_player.cpp | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index e6113d3ae3..157a9457d2 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -122,11 +122,9 @@ bool SmushMixer::handleFrame() { } if (_silentMixer == false) { - if (_channels[i].handle == 0) { - _mixer->newStream(&_channels[i].handle, data, size, rate, flags, 500000, 255, 0); - } else { - _mixer->appendStream(_channels[i].handle, data, size); - } + if (_channels[i].handle == 0) + _mixer->newStream(&_channels[i].handle, rate, flags, 500000); + _mixer->appendStream(_channels[i].handle, data, size); } free(data); } diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index b97b771aa2..6db4b3457b 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -471,12 +471,9 @@ void SmushPlayer::handleImuseAction(Chunk &b) { } } while (--count); - if (_IACTchannel == 0) { - _scumm->_mixer->newStream(&_IACTchannel, output_data, 0x1000, 22050, - SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 200000, 255, 0); - } else { - _scumm->_mixer->appendStream(_IACTchannel, output_data, 0x1000); - } + if (_IACTchannel == 0) + _scumm->_mixer->newStream(&_IACTchannel, 22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 200000); + _scumm->_mixer->appendStream(_IACTchannel, output_data, 0x1000); bsize -= len; d_src += len; |