aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2010-01-08 16:27:29 +0000
committerJohannes Schickel2010-01-08 16:27:29 +0000
commit616e4626f59ba354d420c60d59cb797b351de407 (patch)
tree4d605d91da4527ccefc59b0c8c51ab5ee8230c67 /engines/kyra
parente976b1199538aa32067aed50f1886f2393ca148b (diff)
downloadscummvm-rg350-616e4626f59ba354d420c60d59cb797b351de407.tar.gz
scummvm-rg350-616e4626f59ba354d420c60d59cb797b351de407.tar.bz2
scummvm-rg350-616e4626f59ba354d420c60d59cb797b351de407.zip
Since AudioStream looping is no longer handled by the Mixer, drop Mixer::playAudioStreamLooping. (There's Audio::makeLoopingAudioStream).
svn-id: r47160
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/sound_digital.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp
index a6d89ba7ee..84b18ebc33 100644
--- a/engines/kyra/sound_digital.cpp
+++ b/engines/kyra/sound_digital.cpp
@@ -481,13 +481,7 @@ int SoundDigital::playSound(const char *filename, uint8 priority, Audio::Mixer::
if (type == Audio::Mixer::kSpeechSoundType && _vm->heliumMode())
use->stream->setRate(32765);
- if (loop) {
- Audio::Timestamp zero(0, 1000);
- _mixer->playInputStreamLooping(type, &use->handle, use->stream, 0, zero, zero, -1, volume);
- } else {
- _mixer->playInputStream(type, &use->handle, use->stream, -1, volume);
- }
-
+ _mixer->playInputStream(type, &use->handle, makeLoopingAudioStream(use->stream, loop ? 0 : 1), -1, volume);
return use - _sounds;
}