diff options
| author | Max Horn | 2003-12-21 01:17:03 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-21 01:17:03 +0000 |
| commit | 7fbb3e05597e88d0421af2f720ec7d136605836e (patch) | |
| tree | ff31a330fff91117d54944c9f7a733ab8e641ab6 /scumm/sound.cpp | |
| parent | 2bbaff0890b2f5920052257d7297daa72bb09606 (diff) | |
| download | scummvm-rg350-7fbb3e05597e88d0421af2f720ec7d136605836e.tar.gz scummvm-rg350-7fbb3e05597e88d0421af2f720ec7d136605836e.tar.bz2 scummvm-rg350-7fbb3e05597e88d0421af2f720ec7d136605836e.zip | |
Cleaned up SoundMixer::newStream() a bit (I plan to replace all usages of this by playInputStream(), this cleanup eases this a bit)
svn-id: r11803
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 6a5ade9e5c..9da499b67e 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -1193,12 +1193,9 @@ void Sound::bundleMusicHandler(ScummEngine *scumm) { _bundleSongPosInMs = (_bundleMusicPosition * 5) / (_outputMixerSize / 200); _bundleMusicPosition += final_size; - if (_bundleMusicTrack == 0) { - _scumm->_mixer->newStream(&_bundleMusicTrack, buffer, final_size, rate, - SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, 300000); - } else { - _scumm->_mixer->appendStream(_bundleMusicTrack, buffer, final_size); - } + if (_bundleMusicTrack == 0) + _scumm->_mixer->newStream(&_bundleMusicTrack, rate, SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, 300000); + _scumm->_mixer->appendStream(_bundleMusicTrack, buffer, final_size); free(buffer); } |