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 /sword2/driver | |
| 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 'sword2/driver')
| -rw-r--r-- | sword2/driver/d_sound.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index cb536de3df..495fcf24b0 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -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 @@ int32 Sound::playFx(int32 id, byte *data, uint8 vol, int8 pan, uint8 type) { 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; |