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/theora_decoder.cpp | |
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/theora_decoder.cpp')
-rw-r--r-- | video/theora_decoder.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/video/theora_decoder.cpp b/video/theora_decoder.cpp index ba596c6032..7ed9738ea9 100644 --- a/video/theora_decoder.cpp +++ b/video/theora_decoder.cpp @@ -47,7 +47,7 @@ namespace Video { -TheoraDecoder::TheoraDecoder(Audio::Mixer::SoundType soundType) : _soundType(soundType) { +TheoraDecoder::TheoraDecoder() { _fileStream = 0; _videoTrack = 0; @@ -177,7 +177,7 @@ bool TheoraDecoder::loadStream(Common::SeekableReadStream *stream) { th_setup_free(theoraSetup); if (_hasAudio) { - _audioTrack = new VorbisAudioTrack(_soundType, _vorbisInfo); + _audioTrack = new VorbisAudioTrack(getSoundType(), _vorbisInfo); // Get enough audio data to start us off while (!_audioTrack->hasAudio()) { @@ -330,7 +330,8 @@ void TheoraDecoder::TheoraVideoTrack::translateYUVtoRGBA(th_ycbcr_buffer &YUVBuf static vorbis_info *info = 0; -TheoraDecoder::VorbisAudioTrack::VorbisAudioTrack(Audio::Mixer::SoundType soundType, vorbis_info &vorbisInfo) : _soundType(soundType) { +TheoraDecoder::VorbisAudioTrack::VorbisAudioTrack(Audio::Mixer::SoundType soundType, vorbis_info &vorbisInfo) : + AudioTrack(soundType) { vorbis_synthesis_init(&_vorbisDSP, &vorbisInfo); vorbis_block_init(&_vorbisDSP, &_vorbisBlock); info = &vorbisInfo; |