[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.67,1.68

Max Horn fingolfin at users.sourceforge.net
Sat Jul 31 04:48:16 CEST 2004


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

Modified Files:
	sound.cpp 
Log Message:
changed loadVOCFile to work on a generic ReadStream instead of a File, and renamed it to loadVOCFromStream; removed readVOCFromMemory as it isn't used anymore, and in the future, a MemoryReadstream plus loadVOCFromStream can achieve the same effect

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- sound.cpp	30 Jul 2004 09:00:29 -0000	1.67
+++ sound.cpp	31 Jul 2004 11:46:58 -0000	1.68
@@ -175,7 +175,7 @@
 	_file->seek(_offsets[sound], SEEK_SET);
 
 	int size, samples_per_sec;
-	byte *buffer = loadVOCFile(_file, size, samples_per_sec);
+	byte *buffer = loadVOCFromStream(_file, size, samples_per_sec);
 
 	_mixer->playRaw(handle, buffer, size, samples_per_sec, flags | SoundMixer::FLAG_AUTOFREE);
 }





More information about the Scummvm-git-logs mailing list