diff options
| author | Max Horn | 2007-03-02 15:34:22 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-02 15:34:22 +0000 |
| commit | cfe86c096d6b4823f9489f2fedc928163b0b4c09 (patch) | |
| tree | 8512869a0fba7d49dacf124cb38880f2b2e3edc7 | |
| parent | 029b8c43238ab363bcc1c518b3c4de312b240ae1 (diff) | |
| download | scummvm-rg350-cfe86c096d6b4823f9489f2fedc928163b0b4c09.tar.gz scummvm-rg350-cfe86c096d6b4823f9489f2fedc928163b0b4c09.tar.bz2 scummvm-rg350-cfe86c096d6b4823f9489f2fedc928163b0b4c09.zip | |
cleanup
svn-id: r25927
| -rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index d0691e3869..6b1d31a435 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -22,6 +22,7 @@ #include "common/stdafx.h" #include "common/system.h" +#include "sound/audiostream.h" #include "sound/mixer.h" #include "scumm/scumm.h" #include "scumm/util.h" @@ -170,7 +171,8 @@ void CUP_Player::updateSfx() { flags |= Audio::Mixer::FLAG_LOOP; loopEnd = soundSize - 8; } - _mixer->playRaw(Audio::Mixer::kSFXSoundType, &sfxChannel->handle, soundData + 8, soundSize - 8, 11025, flags, -1, 255, 0, 0, loopEnd); + _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle, + Audio::makeLinearInputStream(soundData + 8, soundSize - 8, 11025, flags, 0, loopEnd)); } } else { warning("Unable to find a free channel to play sound %d", sfx->num); diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index 17cc10c59e..a9ec98c53a 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -535,7 +535,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) musicFile.close(); if (_vm->_game.heversion == 70) { - _mixer->playRaw(type, &_heSoundChannels[heChannel], spoolPtr, size, 11025, flags, soundID, 255, 0, 0, 0); + _mixer->playRaw(type, &_heSoundChannels[heChannel], spoolPtr, size, 11025, flags, soundID); return; } } @@ -586,7 +586,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) } _mixer->stopHandle(_heSoundChannels[heChannel]); - _mixer->playRaw(type, &_heSoundChannels[heChannel], sound, size, rate, flags, soundID, 255, 0, 0,0); + _mixer->playRaw(type, &_heSoundChannels[heChannel], sound, size, rate, flags, soundID); } // Support for sound in Humongous Entertainment games else if (READ_BE_UINT32(ptr) == MKID_BE('DIGI') || READ_BE_UINT32(ptr) == MKID_BE('TALK')) { @@ -642,7 +642,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) } _mixer->stopHandle(_heSoundChannels[heChannel]); - _mixer->playRaw(type, &_heSoundChannels[heChannel], ptr + heOffset + 8, size, rate, flags, soundID, 255, 0, 0,0); + _mixer->playRaw(type, &_heSoundChannels[heChannel], ptr + heOffset + 8, size, rate, flags, soundID); } // Support for PCM music in 3DO versions of Humongous Entertainment games @@ -660,7 +660,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) _mixer->stopID(_currentMusic); _currentMusic = soundID; - _mixer->playRaw(Audio::Mixer::kMusicSoundType, NULL, ptr + 8, size, rate, flags, soundID, 255, 0, 0,0); + _mixer->playRaw(Audio::Mixer::kMusicSoundType, NULL, ptr + 8, size, rate, flags, soundID); } else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) { if (_vm->_imuse) { |