From 8508a97adde127b151d80d003b19f73160938f52 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 23 Jan 2010 00:35:14 +0000 Subject: Get rid of two more FLAG_LOOP instances svn-id: r47459 --- engines/scumm/he/cup_player_he.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'engines/scumm') 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); -- cgit v1.2.3