[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.72,1.73
Max Horn
fingolfin at users.sourceforge.net
Sun Jan 9 07:58:14 CET 2005
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2838/simon
Modified Files:
sound.cpp
Log Message:
Mark some places which probably should use loadWAVFromStream(); maybe some of the engine maintainers can look into using it
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- sound.cpp 1 Jan 2005 16:09:20 -0000 1.72
+++ sound.cpp 9 Jan 2005 15:57:38 -0000 1.73
@@ -28,6 +28,7 @@
#include "sound/mp3.h"
#include "sound/voc.h"
#include "sound/vorbis.h"
+#include "sound/wave.h"
namespace Simon {
@@ -152,6 +153,13 @@
_file->seek(_offsets[sound], SEEK_SET);
+ // TODO: use loadWAVFromStream to load the WAVE data!
+ /*
+ int rate, size;
+ bye flags;
+ isValidWAV = loadWAVFromStream(*_file, size, rate, flags);
+ */
+
if (_file->read(&wave_hdr, sizeof(wave_hdr)) != sizeof(wave_hdr) ||
wave_hdr.riff != MKID('RIFF') || wave_hdr.wave != MKID('WAVE')
|| wave_hdr.fmt != MKID('fmt ') || READ_LE_UINT16(&wave_hdr.format_tag) != 1
More information about the Scummvm-git-logs
mailing list