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/sci/graphics | |
| 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/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/video32.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp index da34a734e8..2b1f7219fd 100644 --- a/engines/sci/graphics/video32.cpp +++ b/engines/sci/graphics/video32.cpp @@ -328,8 +328,10 @@ void SEQPlayer::play(const Common::String &fileName, const int16 numTicks, const #pragma mark AVIPlayer AVIPlayer::AVIPlayer(EventManager *eventMan) : - VideoPlayer(eventMan, new Video::AVIDecoder(Audio::Mixer::kSFXSoundType)), - _status(kAVINotOpen) {} + VideoPlayer(eventMan, new Video::AVIDecoder()), + _status(kAVINotOpen) { + _decoder->setSoundType(Audio::Mixer::kSFXSoundType); +} AVIPlayer::IOStatus AVIPlayer::open(const Common::String &fileName) { if (_status != kAVINotOpen) { @@ -981,11 +983,13 @@ void VMDPlayer::restrictPalette(const uint8 startColor, const int16 endColor) { #pragma mark DuckPlayer DuckPlayer::DuckPlayer(EventManager *eventMan, SegManager *segMan) : - VideoPlayer(eventMan, new Video::AVIDecoder(Audio::Mixer::kSFXSoundType)), + VideoPlayer(eventMan, new Video::AVIDecoder()), _plane(nullptr), _status(kDuckClosed), _volume(Audio::Mixer::kMaxChannelVolume), - _doFrameOut(false) {} + _doFrameOut(false) { + _decoder->setSoundType(Audio::Mixer::kSFXSoundType); +} void DuckPlayer::open(const GuiResourceId resourceId, const int displayMode, const int16 x, const int16 y) { if (_status != kDuckClosed) { |