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 /engines/zvision/video | |
| 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 'engines/zvision/video')
| -rw-r--r-- | engines/zvision/video/zork_avi_decoder.cpp | 4 | ||||
| -rw-r--r-- | engines/zvision/video/zork_avi_decoder.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp index 412cd456ef..314f00da0d 100644 --- a/engines/zvision/video/zork_avi_decoder.cpp +++ b/engines/zvision/video/zork_avi_decoder.cpp @@ -35,10 +35,10 @@ namespace ZVision { Video::AVIDecoder::AVIAudioTrack *ZorkAVIDecoder::createAudioTrack(Video::AVIDecoder::AVIStreamHeader sHeader, Video::AVIDecoder::PCMWaveFormat wvInfo) { if (wvInfo.tag != kWaveFormatZorkPCM) - return new AVIAudioTrack(sHeader, wvInfo, _soundType); + return new AVIAudioTrack(sHeader, wvInfo, getSoundType()); assert(wvInfo.size == 8); - return new ZorkAVIAudioTrack(sHeader, wvInfo, _soundType); + return new ZorkAVIAudioTrack(sHeader, wvInfo, getSoundType()); } ZorkAVIDecoder::ZorkAVIAudioTrack::ZorkAVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType) : diff --git a/engines/zvision/video/zork_avi_decoder.h b/engines/zvision/video/zork_avi_decoder.h index 8befaf5f5f..69a5e0a1fd 100644 --- a/engines/zvision/video/zork_avi_decoder.h +++ b/engines/zvision/video/zork_avi_decoder.h @@ -31,8 +31,7 @@ namespace ZVision { class ZorkAVIDecoder : public Video::AVIDecoder { public: - ZorkAVIDecoder(Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType) : - Video::AVIDecoder(soundType) {} + ZorkAVIDecoder() {} virtual ~ZorkAVIDecoder() {} |