[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.133,1.134

Max Horn fingolfin at users.sourceforge.net
Sun Jan 9 07:58:15 CET 2005


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2838/sword2/driver

Modified Files:
	d_sound.cpp 
Log Message:
Mark some places which probably should use loadWAVFromStream(); maybe some of the engine maintainers can look into using it

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- d_sound.cpp	1 Jan 2005 15:07:04 -0000	1.133
+++ d_sound.cpp	9 Jan 2005 15:57:38 -0000	1.134
@@ -29,6 +29,7 @@
 #include "sound/vorbis.h"
 #include "sound/flac.h"
 #include "sound/rate.h"
+#include "sound/wave.h"
 #include "sword2/sword2.h"
 #include "sword2/resman.h"
 #include "sword2/driver/d_draw.h"
@@ -1128,6 +1129,16 @@
 
 	WavInfo wavInfo;
 
+	// TODO: use loadWAVFromStream to load the WAVE data!
+	/*
+	int rate, size;
+	bye flags;
+	// FIXME: Instead of passing an arbitrary large size for the memory stream
+	// here, we should instead determine the real size of the memory area.
+	Common::MemoryReadStream stream(data, 10000000);
+	isValidWAV = loadWAVFromStream(stream, size, rate, flags);
+	*/
+
 	if (!getWavInfo(data, &wavInfo)) {
 		warning("playFx: Not a valid WAV file");
 		return RDERR_INVALIDWAV;





More information about the Scummvm-git-logs mailing list