diff options
| author | Bastien Bouclet | 2017-07-10 21:36:19 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2017-07-27 06:40:07 +0200 |
| commit | ec49730711399c7705211f76bf583ad73a681e16 (patch) | |
| tree | cedf79022d82766108a26a589958cf5a43383ca8 /video/avi_decoder.h | |
| parent | 22ce8dbf385c08a58222049333554ee206bf933d (diff) | |
| download | scummvm-rg350-ec49730711399c7705211f76bf583ad73a681e16.tar.gz scummvm-rg350-ec49730711399c7705211f76bf583ad73a681e16.tar.bz2 scummvm-rg350-ec49730711399c7705211f76bf583ad73a681e16.zip | |
VIDEO: Allow setting the mixer sound type used to play audio tracks
Diffstat (limited to 'video/avi_decoder.h')
| -rw-r--r-- | video/avi_decoder.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/video/avi_decoder.h b/video/avi_decoder.h index a3dbddf015..dd5773fb7f 100644 --- a/video/avi_decoder.h +++ b/video/avi_decoder.h @@ -62,8 +62,8 @@ namespace Video { */ class AVIDecoder : public VideoDecoder { public: - AVIDecoder(Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType); - AVIDecoder(const Common::Rational &frameRateOverride, Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType); + AVIDecoder(); + AVIDecoder(const Common::Rational &frameRateOverride); virtual ~AVIDecoder(); bool loadStream(Common::SeekableReadStream *stream); @@ -263,7 +263,6 @@ protected: 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); virtual void resetStream(); uint32 getCurChunk() const { return _curChunk; } @@ -288,7 +287,6 @@ protected: AVIStreamHeader _audsHeader; PCMWaveFormat _wvInfo; - Audio::Mixer::SoundType _soundType; Audio::AudioStream *_audioStream; Audio::PacketizedAudioStream *_packetStream; uint32 _curChunk; @@ -317,7 +315,6 @@ protected: bool _foundMovieList; uint32 _movieListStart, _movieListEnd; - Audio::Mixer::SoundType _soundType; Common::Rational _frameRateOverride; int _videoTrackCounter, _audioTrackCounter; |