[Scummvm-cvs-logs] SF.net SVN: scummvm:[47062] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 47062
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47062&view=rev
Author:   lordhoto
Date:     2010-01-06 00:00:25 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
Adapt KYRA to use the new FLAC, Vorbis and MP3 factories.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound.cpp
    scummvm/trunk/engines/kyra/sound.h
    scummvm/trunk/engines/kyra/sound_digital.cpp

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2010-01-05 23:59:28 UTC (rev 47061)
+++ scummvm/trunk/engines/kyra/sound.cpp	2010-01-06 00:00:25 UTC (rev 47062)
@@ -97,7 +97,7 @@
 		if (!stream)
 			continue;
 
-		audioStream = _supportedCodecs[i].streamFunc(stream, true, 0, 0, 1);
+		audioStream = _supportedCodecs[i].streamFunc(stream, true);
 		break;
 	}
 
@@ -241,7 +241,7 @@
 
 // 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);

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2010-01-05 23:59:28 UTC (rev 47061)
+++ scummvm/trunk/engines/kyra/sound.h	2010-01-06 00:00:25 UTC (rev 47062)
@@ -243,10 +243,7 @@
 		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 @@
 		const char *fileext;
 		Audio::SeekableAudioStream *(*streamFunc)(
 			Common::SeekableReadStream *stream,
-			bool disposeAfterUse,
-			uint32 startTime,
-			uint32 duration,
-			uint numLoops);
+			bool disposeAfterUse);
 	};
 
 	static const AudioCodecs _supportedCodecs[];

Modified: scummvm/trunk/engines/kyra/sound_digital.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_digital.cpp	2010-01-05 23:59:28 UTC (rev 47061)
+++ scummvm/trunk/engines/kyra/sound_digital.cpp	2010-01-06 00:00:25 UTC (rev 47062)
@@ -461,7 +461,7 @@
 
 	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 @@
 
 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);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.