diff options
| author | Max Horn | 2009-01-27 00:42:43 +0000 |
|---|---|---|
| committer | Max Horn | 2009-01-27 00:42:43 +0000 |
| commit | 8e447d1ee93d3238d35a665c5ec63671ed890210 (patch) | |
| tree | fc980ae05de56de256385cc2d2311f88897eccac /sound/wave.h | |
| parent | c08cc29b965f31dd7c233714d0a052ab357c4bc5 (diff) | |
| download | scummvm-rg350-8e447d1ee93d3238d35a665c5ec63671ed890210.tar.gz scummvm-rg350-8e447d1ee93d3238d35a665c5ec63671ed890210.tar.bz2 scummvm-rg350-8e447d1ee93d3238d35a665c5ec63671ed890210.zip | |
Extended makeWAVStream by a 'disposeAfterUse' param; changed makeWAVStream to directly return the AudioStream created by makeADPCMStream
svn-id: r36085
Diffstat (limited to 'sound/wave.h')
| -rw-r--r-- | sound/wave.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sound/wave.h b/sound/wave.h index 37b390c934..6b035bd722 100644 --- a/sound/wave.h +++ b/sound/wave.h @@ -38,8 +38,8 @@ class AudioStream; * Try to load a WAVE from the given seekable stream. Returns true if * successful. In that case, the stream's seek position will be set to the * start of the audio data, and size, rate and flags contain information - * necessary for playback. Currently this function only supports uncompressed - * raw PCM data as well as IMA ADPCM. + * necessary for playback. Currently this function supports uncompressed + * raw PCM data, MS IMA ADPCM and MS ADPCM (uses makeADPCMStream internally). */ extern bool loadWAVFromStream( Common::SeekableReadStream &stream, @@ -51,12 +51,18 @@ extern bool loadWAVFromStream( /** * Try to load a WAVE from the given seekable stream and create an AudioStream - * from that data. Currently this function only supports uncompressed raw PCM - * data as well as IMA ADPCM. + * from that data. Currently this function supports uncompressed + * raw PCM data, MS IMA ADPCM and MS ADPCM (uses makeADPCMStream internally). * * This function uses loadWAVFromStream() internally. + * + * @param stream the SeekableReadStream from which to read the WAVE data + * @param disposeAfterUse whether to delete the stream after use + * @return a new AudioStream, or NULL, if an error occured */ -AudioStream *makeWAVStream(Common::SeekableReadStream &stream); +AudioStream *makeWAVStream( + Common::SeekableReadStream *stream, + bool disposeAfterUse = false); } // End of namespace Audio |