[Scummvm-cvs-logs] SF.net SVN: scummvm:[47066] scummvm/trunk/engines/touche/resource.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Wed Jan 6 01:02:19 CET 2010


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

Log Message:
-----------
Adapt TOUCHE to use the new FLAC, Vorbis and MP3 factories (it didn't use any looping features anyway).

Modified Paths:
--------------
    scummvm/trunk/engines/touche/resource.cpp

Modified: scummvm/trunk/engines/touche/resource.cpp
===================================================================
--- scummvm/trunk/engines/touche/resource.cpp	2010-01-06 00:01:57 UTC (rev 47065)
+++ scummvm/trunk/engines/touche/resource.cpp	2010-01-06 00:02:19 UTC (rev 47066)
@@ -47,10 +47,7 @@
 	const char *filename;
 	Audio::SeekableAudioStream *(*makeStream)(
 			Common::SeekableReadStream *stream,
-			bool disposeAfterUse,
-			uint32 startTime,
-			uint32 duration,
-			uint numLoops);
+			bool disposeAfterUse);
 };
 
 static const CompressedSpeechFile compressedSpeechFilesTable[] = {
@@ -669,9 +666,8 @@
 			}
 			_fSpeech[0].seek(offs);
 			Common::MemoryReadStream *tmp = _fSpeech[0].readStream(size);
-			if (tmp) {
-				stream = (compressedSpeechFilesTable[_compressedSpeechData].makeStream)(tmp, true, 0, 0, 1);
-			}
+			if (tmp)
+				stream = (compressedSpeechFilesTable[_compressedSpeechData].makeStream)(tmp, true);
 		}
 		if (stream) {
 			_speechPlaying = true;


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




More information about the Scummvm-git-logs mailing list