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/titanic/support | |
| 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/titanic/support')
| -rw-r--r-- | engines/titanic/support/avi_surface.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/support/avi_surface.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp index 28b509a297..e52c2a7ea5 100644 --- a/engines/titanic/support/avi_surface.cpp +++ b/engines/titanic/support/avi_surface.cpp @@ -52,7 +52,7 @@ AVISurface::AVISurface(const CResourceKey &key) : _movieName(key.getString()) { _priorFrame = -1; // Create a decoder - _decoder = new AVIDecoder(Audio::Mixer::kPlainSoundType); + _decoder = new AVIDecoder(); if (!_decoder->loadFile(_movieName)) error("Could not open video - %s", key.getString().c_str()); diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h index b7afac3988..fd21c9ceab 100644 --- a/engines/titanic/support/avi_surface.h +++ b/engines/titanic/support/avi_surface.h @@ -43,10 +43,9 @@ enum MovieFlag { class AVIDecoder : public Video::AVIDecoder { public: - AVIDecoder(Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType) : - Video::AVIDecoder(soundType) {} - AVIDecoder(const Common::Rational &frameRateOverride, Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType) : - Video::AVIDecoder(frameRateOverride, soundType) {} + AVIDecoder() {} + AVIDecoder(const Common::Rational &frameRateOverride) : + Video::AVIDecoder(frameRateOverride) {} /** * Returns the number of video tracks the decoder has |