[Scummvm-cvs-logs] SF.net SVN: scummvm:[47065] scummvm/trunk/sound

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


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

Log Message:
-----------
Change the AudioStream::openStreamFile API to return SeekableAudioStreams and remove parameter for depreacted loop support. (We could consider moving this to SeekableAudioStream).

Modified Paths:
--------------
    scummvm/trunk/sound/audiostream.cpp
    scummvm/trunk/sound/audiostream.h

Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp	2010-01-06 00:01:27 UTC (rev 47064)
+++ scummvm/trunk/sound/audiostream.cpp	2010-01-06 00:01:57 UTC (rev 47065)
@@ -55,8 +55,7 @@
 	 * Pointer to a function which tries to open a file of type StreamFormat.
 	 * Return NULL in case of an error (invalid/nonexisting file).
 	 */
-	SeekableAudioStream *(*openStreamFile)(Common::SeekableReadStream *stream, bool disposeAfterUse,
-					uint32 startTime, uint32 duration, uint numLoops);
+	SeekableAudioStream *(*openStreamFile)(Common::SeekableReadStream *stream, bool disposeAfterUse);
 };
 
 static const StreamFileFormat STREAM_FILEFORMATS[] = {
@@ -75,7 +74,7 @@
 	{ NULL, NULL, NULL } // Terminator
 };
 
-SeekableAudioStream *AudioStream::openStreamFile(const Common::String &basename, uint32 startTime, uint32 duration, uint numLoops) {
+SeekableAudioStream *AudioStream::openStreamFile(const Common::String &basename) {
 	SeekableAudioStream *stream = NULL;
 	Common::File *fileHandle = new Common::File();
 
@@ -84,7 +83,7 @@
 		fileHandle->open(filename);
 		if (fileHandle->isOpen()) {
 			// Create the stream object
-			stream = STREAM_FILEFORMATS[i].openStreamFile(fileHandle, true, startTime, duration, numLoops);
+			stream = STREAM_FILEFORMATS[i].openStreamFile(fileHandle, true);
 			fileHandle = 0;
 			break;
 		}

Modified: scummvm/trunk/sound/audiostream.h
===================================================================
--- scummvm/trunk/sound/audiostream.h	2010-01-06 00:01:27 UTC (rev 47064)
+++ scummvm/trunk/sound/audiostream.h	2010-01-06 00:01:57 UTC (rev 47065)
@@ -97,10 +97,7 @@
 	 * @return	an Audiostream ready to use in case of success;
 	 *			NULL in case of an error (e.g. invalid/nonexisting file)
 	 */
-	static SeekableAudioStream *openStreamFile(const Common::String &basename,
-	                                           uint32 startTime = 0,
-	                                           uint32 duration = 0,
-	                                           uint numLoops = 1);
+	static SeekableAudioStream *openStreamFile(const Common::String &basename);
 
 	/** 
 	 * Sets number of times the stream is supposed to get looped


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