diff options
| author | Matthew Hoops | 2011-04-25 12:45:33 -0400 |
|---|---|---|
| committer | Sven Hesse | 2011-11-27 15:52:05 +0100 |
| commit | 6bbff583146843baade8f6268a2e1ea92be416ba (patch) | |
| tree | e80281c7d7a99a9a2c523e0b6684d17089797280 /audio | |
| parent | 5518721a17e751a2ac6deefe56ef0ce446f184ab (diff) | |
| download | scummvm-rg350-6bbff583146843baade8f6268a2e1ea92be416ba.tar.gz scummvm-rg350-6bbff583146843baade8f6268a2e1ea92be416ba.tar.bz2 scummvm-rg350-6bbff583146843baade8f6268a2e1ea92be416ba.zip | |
VIDEO: Rewrite VMD audio streaming
Audio is now decoded in AudioStream classes instead of being decoded ahead of time and then queued.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/decoders/adpcm_intern.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/audio/decoders/adpcm_intern.h b/audio/decoders/adpcm_intern.h index f7162f5f2a..31747aabaf 100644 --- a/audio/decoders/adpcm_intern.h +++ b/audio/decoders/adpcm_intern.h @@ -43,7 +43,7 @@ namespace Audio { class ADPCMStream : public RewindableAudioStream { protected: Common::DisposablePtr<Common::SeekableReadStream> _stream; - const int32 _startpos; + int32 _startpos; const int32 _endpos; const int _channels; const uint32 _blockAlign; @@ -97,9 +97,7 @@ protected: public: Ima_ADPCMStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, int rate, int channels, uint32 blockAlign) - : ADPCMStream(stream, disposeAfterUse, size, rate, channels, blockAlign) { - memset(&_status, 0, sizeof(_status)); - } + : ADPCMStream(stream, disposeAfterUse, size, rate, channels, blockAlign) {} /** * This table is used by decodeIMA. |