diff options
| author | Johannes Schickel | 2010-01-05 02:27:24 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-05 02:27:24 +0000 |
| commit | f5c3bd887e2257fc7fdfb0d141ddbae592f1e83b (patch) | |
| tree | ebbd8705d76d5d23a2b217f7bd31012afe271d2c /sound/voc.cpp | |
| parent | 00e48f687ff0b0302383abfb9971f5420dc3c265 (diff) | |
| download | scummvm-rg350-f5c3bd887e2257fc7fdfb0d141ddbae592f1e83b.tar.gz scummvm-rg350-f5c3bd887e2257fc7fdfb0d141ddbae592f1e83b.tar.bz2 scummvm-rg350-f5c3bd887e2257fc7fdfb0d141ddbae592f1e83b.zip | |
- Add a new SeekableAudioStream interface. Soon to be used to replace audio stream specific looping code by generic code in Mixer...
- Adapted some existing AudioStreams to implement that interface (not tested!)
svn-id: r47013
Diffstat (limited to 'sound/voc.cpp')
| -rw-r--r-- | sound/voc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/voc.cpp b/sound/voc.cpp index 5db32693eb..05a3618d1b 100644 --- a/sound/voc.cpp +++ b/sound/voc.cpp @@ -292,7 +292,7 @@ int parseVOCFormat(Common::SeekableReadStream& stream, LinearDiskStreamAudioBloc return currentBlock; } -AudioStream *makeVOCDiskStream(Common::SeekableReadStream &stream, byte flags, bool takeOwnership) { +SeekableAudioStream *makeVOCDiskStream(Common::SeekableReadStream &stream, byte flags, bool takeOwnership) { const int MAX_AUDIO_BLOCKS = 256; LinearDiskStreamAudioBlock *block = new LinearDiskStreamAudioBlock[MAX_AUDIO_BLOCKS]; @@ -315,7 +315,7 @@ AudioStream *makeVOCDiskStream(Common::SeekableReadStream &stream, byte flags, b #endif -AudioStream *makeVOCStream(Common::SeekableReadStream &stream, byte flags, uint loopStart, uint loopEnd, bool takeOwnershipOfStream) { +SeekableAudioStream *makeVOCStream(Common::SeekableReadStream &stream, byte flags, uint loopStart, uint loopEnd, bool takeOwnershipOfStream) { #ifdef STREAM_AUDIO_FROM_DISK return makeVOCDiskStream(stream, flags, takeOwnershipOfStream); #else |