Adapt KYRA to use the new FLAC, Vorbis and MP3 factories.

svn-id: r47062

3 files changed, 6 insertions, 12 deletions

diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index 34c9b3d223..4049d2b456 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -97,7 +97,7 @@ Audio::SeekableAudioStream *Sound::getVoiceStream(const char *file) {
 		if (!stream)
 			continue;
 
-		audioStream = _supportedCodecs[i].streamFunc(stream, true, 0, 0, 1);
+		audioStream = _supportedCodecs[i].streamFunc(stream, true);
 		break;
 	}
 
@@ -241,7 +241,7 @@ namespace {
 
 // A simple wrapper to create VOC streams the way like creating MP3, OGG/Vorbis and FLAC streams.
 // Possible TODO: Think of making this complete and moving it to sound/voc.cpp ?
-Audio::SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, bool disposeAfterUse, uint32 startTime, uint32 duration, uint numLoops) {
+Audio::SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, bool disposeAfterUse) {
 
 #ifdef STREAM_AUDIO_FROM_DISK
 	Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, 0, 0, disposeAfterUse);
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 5d54a1603b..6db31bface 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -243,10 +243,7 @@ private:
 		const char *fileext;
 		Audio::SeekableAudioStream *(*streamFunc)(
 			Common::SeekableReadStream *stream,
-			bool disposeAfterUse,
-			uint32 startTime,
-			uint32 duration,
-			uint numLoops);
+			bool disposeAfterUse);
 	};
 
 	static const SpeechCodecs _supportedCodecs[];
@@ -361,10 +358,7 @@ private:
 		const char *fileext;
 		Audio::SeekableAudioStream *(*streamFunc)(
 			Common::SeekableReadStream *stream,
-			bool disposeAfterUse,
-			uint32 startTime,
-			uint32 duration,
-			uint numLoops);
+			bool disposeAfterUse);
 	};
 
 	static const AudioCodecs _supportedCodecs[];
diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp
index 567d7c0132..8c23f05626 100644
--- a/engines/kyra/sound_digital.cpp
+++ b/engines/kyra/sound_digital.cpp
@@ -461,7 +461,7 @@ int SoundDigital::playSound(const char *filename, uint8 priority, Audio::Mixer::
 
 	strncpy(use->filename, filename, sizeof(use->filename));
 	use->priority = priority;
-	Audio::SeekableAudioStream *audioStream = _supportedCodecs[usedCodec].streamFunc(stream, true, 0, 0, 1);
+	Audio::SeekableAudioStream *audioStream = _supportedCodecs[usedCodec].streamFunc(stream, true);
 	if (!audioStream) {
 		warning("Couldn't create audio stream for file '%s'", filename);
 		return -1;
@@ -529,7 +529,7 @@ void SoundDigital::beginFadeOut(int channel, int ticks) {
 
 namespace {
 
-Audio::SeekableAudioStream *makeAUDStream(Common::SeekableReadStream *stream, bool disposeAfterUse, uint32 startTime, uint32 duration, uint numLoops) {
+Audio::SeekableAudioStream *makeAUDStream(Common::SeekableReadStream *stream, bool disposeAfterUse) {
 	return new AUDStream(stream);
 }