[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.63,1.64 audiostream.h,1.38,1.39

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29111

Modified Files:
	audiostream.cpp audiostream.h 
Log Message:
Remove obsolete path param

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- audiostream.cpp	11 Jul 2004 04:41:48 -0000	1.63
+++ audiostream.cpp	25 Sep 2004 23:33:34 -0000	1.64
@@ -67,7 +67,7 @@
 	{ NULL, NULL, NULL } // Terminator
 };
 
-AudioStream* AudioStream::openStreamFile(const char* filename, const char *path)
+AudioStream* AudioStream::openStreamFile(const char *filename)
 {
 	char buffer[1024];
 	const uint len = strlen(filename);
@@ -82,10 +82,7 @@
 
 	for (int i = 0; i < ARRAYSIZE(STREAM_FILEFORMATS)-1 && stream == NULL; ++i) {
 		strcpy(ext, STREAM_FILEFORMATS[i].fileExtension);
-		if (path != NULL)
-			fileHandle->open(buffer, File::kFileReadMode, path);
-		else
-			fileHandle->open(buffer);
+		fileHandle->open(buffer);
 		if (fileHandle->isOpen())
 			stream = STREAM_FILEFORMATS[i].openStreamFile(fileHandle, fileHandle->size());
 	}

Index: audiostream.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- audiostream.h	25 Sep 2004 23:26:46 -0000	1.38
+++ audiostream.h	25 Sep 2004 23:33:34 -0000	1.39
@@ -82,11 +82,10 @@
 	 * In case of an error, the file handle will be closed, but deleting
 	 * it is still the responsibilty of the caller.
 	 * @param filename	a filename without an extension
-	 * @param path		an (optional) file path which is passed to File::open()
 	 * @return	an Audiostream ready to use in case of success; 
 	 *			NULL in case of an error (e.g. invalid/nonexisting file)
 	 */
-	static AudioStream* openStreamFile(const char *filename, const char *path = NULL);
+	static AudioStream* openStreamFile(const char *filename);
 };
 
 class AppendableAudioStream : public AudioStream {