aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he
diff options
context:
space:
mode:
authorMax Horn2010-01-23 00:35:14 +0000
committerMax Horn2010-01-23 00:35:14 +0000
commit8508a97adde127b151d80d003b19f73160938f52 (patch)
tree25538c077e35e93684d330f183297d918aa79cbf /engines/scumm/he
parent409e44e7c34ed901f884eeea2824fae6c5cad068 (diff)
downloadscummvm-rg350-8508a97adde127b151d80d003b19f73160938f52.tar.gz
scummvm-rg350-8508a97adde127b151d80d003b19f73160938f52.tar.bz2
scummvm-rg350-8508a97adde127b151d80d003b19f73160938f52.zip
Get rid of two more FLAG_LOOP instances
svn-id: r47459
Diffstat (limited to 'engines/scumm/he')
-rw-r--r--engines/scumm/he/cup_player_he.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index fcf3c5477e..49084d6a71 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -169,14 +169,12 @@ void CUP_Player::updateSfx() {
uint8 *soundData = _sfxBuffer + offset;
if (READ_BE_UINT32(soundData) == MKID_BE('DATA')) {
uint32 soundSize = READ_BE_UINT32(soundData + 4);
- uint32 flags = Audio::FLAG_UNSIGNED;
- uint32 loopEnd = 0;
- if (sfx->flags & kSfxFlagLoop) {
- flags |= Audio::FLAG_LOOP;
- loopEnd = soundSize - 8;
- }
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle,
- Audio::makeRawMemoryStream(soundData + 8, soundSize - 8, DisposeAfterUse::NO, 11025, flags, 0, loopEnd));
+ Audio::makeLoopingAudioStream(
+ Audio::makeRawMemoryStream(soundData + 8, soundSize - 8, DisposeAfterUse::NO, 11025, Audio::FLAG_UNSIGNED),
+ (sfx->flags & kSfxFlagLoop) ? 0 : 1
+ )
+ );
}
} else {
warning("Unable to find a free channel to play sound %d", sfx->num);