diff options
| author | Johannes Schickel | 2010-01-10 15:20:14 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-10 15:20:14 +0000 |
| commit | 6ca0570fe3bb3f3765677ff8cd3f9e0cbf062d6b (patch) | |
| tree | 732a2cc846d6f70dd2c42b0dc0cd52d45de34bb2 /sound/voc.h | |
| parent | bda3fc940c3ecca011b04a32fb20970f53f49d1c (diff) | |
| download | scummvm-rg350-6ca0570fe3bb3f3765677ff8cd3f9e0cbf062d6b.tar.gz scummvm-rg350-6ca0570fe3bb3f3765677ff8cd3f9e0cbf062d6b.tar.bz2 scummvm-rg350-6ca0570fe3bb3f3765677ff8cd3f9e0cbf062d6b.zip | |
- Add a SubLoopingAudioStream, which loops a nested part of a stream and thus features the same looping capabilites as LinearMemoryStream and LinearDiskStream.
- Remove custom looping code from LinearMemoryStream and LinearDiskStream.
- Adapt various client code to the changes.
svn-id: r47226
Diffstat (limited to 'sound/voc.h')
| -rw-r--r-- | sound/voc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/voc.h b/sound/voc.h index 44bef758f3..e16d8169f9 100644 --- a/sound/voc.h +++ b/sound/voc.h @@ -93,7 +93,12 @@ extern byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate) * * This function uses loadVOCFromStream() internally. */ -SeekableAudioStream *makeVOCStream(Common::SeekableReadStream &stream, byte flags = 0, uint loopStart = 0, uint loopEnd = 0, bool takeOwnershipOfStream = false); +AudioStream *makeVOCStream(Common::SeekableReadStream &stream, byte flags = 0, uint loopStart = 0, uint loopEnd = 0, bool takeOwnershipOfStream = false); + +/** + * This does not use any of the looping features from VOC files! + */ +SeekableAudioStream *makeVOCStream(Common::SeekableReadStream &stream, byte flags, bool takeOwnershipOfStream); } // End of namespace Audio |