[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.62,1.63 audiostream.h,1.36,1.37

[James Brown]

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

Modified Files:
	audiostream.cpp audiostream.h 
Log Message:
Use extrapath in Sword1 engine (from 0.6.0 branch). More verbose errors to go with the forthcoming new manual. Sword1 CD swapping doesn't work as expected HERE, either :)


Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- audiostream.cpp	1 Jul 2004 04:43:32 -0000	1.62
+++ audiostream.cpp	11 Jul 2004 04:41:48 -0000	1.63
@@ -67,7 +67,7 @@
 	{ NULL, NULL, NULL } // Terminator
 };
 
-AudioStream* AudioStream::openStreamFile(const char* filename)
+AudioStream* AudioStream::openStreamFile(const char* filename, const char *path)
 {
 	char buffer[1024];
 	const uint len = strlen(filename);
@@ -82,7 +82,10 @@
 
 	for (int i = 0; i < ARRAYSIZE(STREAM_FILEFORMATS)-1 && stream == NULL; ++i) {
 		strcpy(ext, STREAM_FILEFORMATS[i].fileExtension);
-		fileHandle->open(buffer);
+		if (path != NULL)
+			fileHandle->open(buffer, File::kFileReadMode, path);
+		else
+			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.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- audiostream.h	1 Jul 2004 04:43:32 -0000	1.36
+++ audiostream.h	11 Jul 2004 04:41:48 -0000	1.37
@@ -86,7 +86,7 @@
 	 * @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);
+	static AudioStream* openStreamFile(const char* filename, const char* path=NULL);
 };
 
 class AppendableAudioStream : public AudioStream {