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/coktel_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/coktel_decoder.cpp')
| -rw-r--r-- | video/coktel_decoder.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index daebbd3ea9..245319a931 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -2784,6 +2784,7 @@ void VMDDecoder::setAutoStartSound(bool autoStartSound) { } AdvancedVMDDecoder::AdvancedVMDDecoder(Audio::Mixer::SoundType soundType) { + setSoundType(soundType); _decoder = new VMDDecoder(g_system->getMixer(), soundType); _decoder->setAutoStartSound(false); } @@ -2860,11 +2861,9 @@ Common::Rational AdvancedVMDDecoder::VMDVideoTrack::getFrameRate() const { return _decoder->getFrameRate(); } -AdvancedVMDDecoder::VMDAudioTrack::VMDAudioTrack(VMDDecoder *decoder) : _decoder(decoder) { -} - -Audio::Mixer::SoundType AdvancedVMDDecoder::VMDAudioTrack::getSoundType() const { - return _decoder->getSoundType(); +AdvancedVMDDecoder::VMDAudioTrack::VMDAudioTrack(VMDDecoder *decoder) : + AudioTrack(decoder->getSoundType()), + _decoder(decoder) { } Audio::AudioStream *AdvancedVMDDecoder::VMDAudioTrack::getAudioStream() const { |