diff options
| author | Paweł Kołodziejski | 2002-10-16 07:59:11 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-10-16 07:59:11 +0000 |
| commit | 41b61adac07d3fc0cce03ef460a655d7d7cf2e20 (patch) | |
| tree | 3ab1ec09e8cbf3a0a850e6d36eb8709f656e0898 /scumm/sound.cpp | |
| parent | 138aa3ce246449c6b060af7afb76e283203fff2e (diff) | |
| download | scummvm-rg350-41b61adac07d3fc0cce03ef460a655d7d7cf2e20.tar.gz scummvm-rg350-41b61adac07d3fc0cce03ef460a655d7d7cf2e20.tar.bz2 scummvm-rg350-41b61adac07d3fc0cce03ef460a655d7d7cf2e20.zip | |
fixes to imuse
svn-id: r5161
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 2b790799d4..12db8dc8c5 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -943,7 +943,9 @@ void Sound::bundleMusicHandler(Scumm * scumm) { if (_musicBundleToBeRemoved == true) { _scumm->_timer->releaseProcedure(&music_handler); _nameBundleMusic = NULL; - _scumm->_mixer->stop(_bundleMusicTrack); + if (_bundleMusicTrack != -1) { + _scumm->_mixer->stop(_bundleMusicTrack); + } _bundleMusicTrack = -1; if (_musicBundleBufFinal) { free(_musicBundleBufFinal); @@ -1034,7 +1036,7 @@ void Sound::bundleMusicHandler(Scumm * scumm) { if (_bundleMusicTrack == -1) { _bundleMusicTrack = _scumm->_mixer->playStream(NULL, _scumm->_mixer->_beginSlots - 1, buffer, final_size, rate, - SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, -1, 800000); + SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, -1, 2000000); } else { _scumm->_mixer->append(_bundleMusicTrack, buffer, final_size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO); |