Since AudioStream looping is no longer handled by the Mixer, drop Mixer::playAudioStreamLooping. (There's Audio::makeLoopingAudioStream).

svn-id: r47160

6 files changed, 13 insertions, 13 deletions

diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index 4481778871..77604eca75 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -788,7 +788,7 @@ void Sound::playSoundData(Audio::SoundHandle *handle, byte *soundData, uint soun
 	convertVolume(vol);
 	convertPan(pan);
 
-	_mixer->playInputStreamLooping(Audio::Mixer::kSFXSoundType, handle, sndStream, loop ? 0 : 1, -1, vol, pan);
+	_mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, Audio::makeLoopingAudioStream(sndStream, loop ? 0 : 1), -1, vol, pan);
 }
 
 void Sound::stopSfx5() {
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;
 }
 
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index de29747db5..a5c28c213e 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -279,7 +279,8 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
 	for (int i = 0; i < 2; ++i) {
 		stream = Audio::SeekableAudioStream::openStreamFile(trackName[i]);
 		if (stream) {
-			_mixer->playInputStreamLooping(Audio::Mixer::kMusicSoundType, &_musicHandle, stream, (flags == MUSIC_LOOP) ? 0 : 1);
+			_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle,
+			                        Audio::makeLoopingAudioStream(stream, (flags == MUSIC_LOOP) ? 0 : 1));
 			_digitalMusic = true;
 			return;
 		}
@@ -336,7 +337,8 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
 
 	if (audioStream) {
 		debug(2, "Playing digitized music");
-		_mixer->playInputStreamLooping(Audio::Mixer::kMusicSoundType, &_musicHandle, audioStream, (flags == MUSIC_LOOP ? 0 : 1));
+		_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle,
+		                        Audio::makeLoopingAudioStream(audioStream, (flags == MUSIC_LOOP ? 0 : 1)));
 		_digitalMusic = true;
 		return;
 	}
diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp
index 03352a2166..213f3e7c83 100644
--- a/engines/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
@@ -340,7 +340,9 @@ int32 Sound::playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vo
 
 	assert(input);
 
-	_vm->_mixer->playInputStreamLooping(soundType, handle, input, loop ? 0 : 1, -1, vol, pan, true, false, isReverseStereo());
+	_vm->_mixer->playInputStream(soundType, handle,
+	                             Audio::makeLoopingAudioStream(input, loop ? 0 : 1),
+	                             -1, vol, pan, true, false, isReverseStereo());
 
 	return RD_OK;
 }
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index af0af41c3d..6c244d070a 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -954,7 +954,8 @@ void TuckerEngine::loadSound(Audio::Mixer::SoundType type, int num, int volume,
 
 	if (stream) {
 		_mixer->stopHandle(*handle);
-		_mixer->playInputStreamLooping(type, handle, stream, loop ? 0 : 1, -1, scaleMixerVolume(volume, kMaxSoundVolume));
+		_mixer->playInputStream(type, handle, Audio::makeLoopingAudioStream(stream, loop ? 0 : 1),
+		                        -1, scaleMixerVolume(volume, kMaxSoundVolume));
 	}
 }
 
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index fd51faf207..cae0f527c2 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -635,7 +635,8 @@ void AnimationSequencePlayer::updateSounds() {
 			break;
 		case 1:
 			if ((s = loadSound(p->num, kAnimationSoundTypeWAV)) != 0) {
-				_mixer->playInputStreamLooping(Audio::Mixer::kSFXSoundType, &_soundsHandle[p->index], s, 0, -1, scaleMixerVolume(p->volume));
+				_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_soundsHandle[p->index], Audio::makeLoopingAudioStream(s, 0),
+				                        -1, scaleMixerVolume(p->volume));
 			}
 			break;
 		case 2: