aboutsummaryrefslogtreecommitdiff
path: root/video/avi_decoder.h
diff options
context:
space:
mode:
Diffstat (limited to 'video/avi_decoder.h')
-rw-r--r--video/avi_decoder.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 6c1ce1a4b9..96d9e821ff 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -32,7 +32,8 @@
#include "audio/mixer.h"
namespace Audio {
-class QueuingAudioStream;
+class AudioStream;
+class PacketizedAudioStream;
}
namespace Common {
@@ -215,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);
@@ -226,7 +228,7 @@ protected:
bool rewind();
protected:
- Audio::AudioStream *getAudioStream() const;
+ Audio::AudioStream *getAudioStream() const { return _audioStream; }
// Audio Codecs
enum {
@@ -241,8 +243,8 @@ protected:
AVIStreamHeader _audsHeader;
PCMWaveFormat _wvInfo;
Audio::Mixer::SoundType _soundType;
- Audio::QueuingAudioStream *_audStream;
- Audio::QueuingAudioStream *createAudioStream();
+ Audio::AudioStream *_audioStream;
+ Audio::PacketizedAudioStream *_packetStream;
uint32 _curChunk;
};