diff options
author | Johannes Schickel | 2010-01-07 16:08:41 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-01-07 16:08:41 +0000 |
commit | 2e9bae44c5f80fe18aa0545b6c868682c380497c (patch) | |
tree | 50b97e4d1ab49e7ece8ecf9902d3e7df89eb8a52 /sound/adpcm.h | |
parent | 8c03fffbf0c246b77b5d60604405aa898c58e6ea (diff) | |
download | scummvm-rg350-2e9bae44c5f80fe18aa0545b6c868682c380497c.tar.gz scummvm-rg350-2e9bae44c5f80fe18aa0545b6c868682c380497c.tar.bz2 scummvm-rg350-2e9bae44c5f80fe18aa0545b6c868682c380497c.zip |
Let ADPCM streams subclass RewindableAudioStreams and thus allow them to be looped with the new looping code.
svn-id: r47127
Diffstat (limited to 'sound/adpcm.h')
-rw-r--r-- | sound/adpcm.h | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/sound/adpcm.h b/sound/adpcm.h index 48d003ae78..46ccb582c3 100644 --- a/sound/adpcm.h +++ b/sound/adpcm.h @@ -42,6 +42,7 @@ namespace Audio { class AudioStream; +class RewindableAudioStream; // There are several types of ADPCM encoding, only some are supported here // For all the different encodings, refer to: @@ -61,27 +62,24 @@ enum typesADPCM { /** * Takes an input stream containing ADPCM compressed sound data and creates - * an AudioStream from that. + * an RewindableAudioStream from that. * - * @param stream the SeekableReadStream from which to read the ADPCM data - * @param disposeAfterUse whether to delete the stream after use - * @param size how many bytes to read from the stream (0 = all) - * @param type the compression type used - * @param rate the sampling rate (default = 22050) - * @param channels the number of channels (default = 2) - * @param blockAlign block alignment ??? (default = 0) - * @param numLoop how many types the sounds should loop, 0 for infinite loop (default = 1) - * @return a new AudioStream, or NULL, if an error occured + * @param stream the SeekableReadStream from which to read the ADPCM data + * @param disposeAfterUse whether to delete the stream after use + * @param size how many bytes to read from the stream (0 = all) + * @param type the compression type used + * @param rate the sampling rate + * @param channels the number of channels + * @param blockAlign block alignment ??? + * @return a new RewindableAudioStream, or NULL, if an error occured */ -AudioStream *makeADPCMStream( - Common::SeekableReadStream *stream, - bool disposeAfterUse, - uint32 size, - typesADPCM type, - int rate = 22050, - int channels = 2, - uint32 blockAlign = 0, - uint numLoops = 1); +RewindableAudioStream *makeADPCMStream( + Common::SeekableReadStream *stream, + bool disposeAfterUse, + uint32 size, typesADPCM type, + int rate = 22050, + int channels = 2, + uint32 blockAlign = 0); } // End of namespace Audio |