diff options
| author | Max Horn | 2005-01-09 15:57:38 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-09 15:57:38 +0000 |
| commit | 7df70de2b1e070ed6474f81f9da782bc22f21bb1 (patch) | |
| tree | 9be433339c87291a98fee6d968bfd794b1c12169 /simon | |
| parent | 9cea3d393f0c3657f3caef72a13dce5594581bdd (diff) | |
| download | scummvm-rg350-7df70de2b1e070ed6474f81f9da782bc22f21bb1.tar.gz scummvm-rg350-7df70de2b1e070ed6474f81f9da782bc22f21bb1.tar.bz2 scummvm-rg350-7df70de2b1e070ed6474f81f9da782bc22f21bb1.zip | |
Mark some places which probably should use loadWAVFromStream(); maybe some of the engine maintainers can look into using it
svn-id: r16503
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/sound.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp index db67ae58d3..9e4f357628 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -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 @@ void WavSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) { _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 |