diff options
| author | Matthew Hoops | 2015-08-11 22:54:00 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2015-08-30 21:01:39 -0400 |
| commit | 561d1a1d62b8abd3f5ff51d66e0c32ea436e68de (patch) | |
| tree | 011941f3a2f61272c83aed30cf630e38899109ae /video/avi_decoder.h | |
| parent | 72239a25f9608935024560ab07f17a47863de0d7 (diff) | |
| download | scummvm-rg350-561d1a1d62b8abd3f5ff51d66e0c32ea436e68de.tar.gz scummvm-rg350-561d1a1d62b8abd3f5ff51d66e0c32ea436e68de.tar.bz2 scummvm-rg350-561d1a1d62b8abd3f5ff51d66e0c32ea436e68de.zip | |
VIDEO: Switch to all packetized streams for AVI
ZVision does not currently, but that's OK
Diffstat (limited to 'video/avi_decoder.h')
| -rw-r--r-- | video/avi_decoder.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/avi_decoder.h b/video/avi_decoder.h index 8b12c23adf..96d9e821ff 100644 --- a/video/avi_decoder.h +++ b/video/avi_decoder.h @@ -32,8 +32,8 @@ #include "audio/mixer.h" namespace Audio { +class AudioStream; class PacketizedAudioStream; -class QueuingAudioStream; } namespace Common { @@ -216,6 +216,7 @@ protected: AVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType); ~AVIAudioTrack(); + virtual void createAudioStream(); virtual void queueSound(Common::SeekableReadStream *stream); Audio::Mixer::SoundType getSoundType() const { return _soundType; } void skipAudio(const Audio::Timestamp &time, const Audio::Timestamp &frameTime); @@ -227,7 +228,7 @@ protected: bool rewind(); protected: - Audio::AudioStream *getAudioStream() const; + Audio::AudioStream *getAudioStream() const { return _audioStream; } // Audio Codecs enum { @@ -242,9 +243,8 @@ protected: AVIStreamHeader _audsHeader; PCMWaveFormat _wvInfo; Audio::Mixer::SoundType _soundType; - Audio::QueuingAudioStream *_queueStream; + Audio::AudioStream *_audioStream; Audio::PacketizedAudioStream *_packetStream; - void createAudioStream(); uint32 _curChunk; }; |