aboutsummaryrefslogtreecommitdiff
path: root/graphics/video/smk_decoder.cpp
diff options
context:
space:
mode:
authorSven Hesse2009-07-29 10:17:44 +0000
committerSven Hesse2009-07-29 10:17:44 +0000
commit5213cf9aa21083b6a3f9557a0d75f608913625a2 (patch)
treea7a6bd8d6ea5de0945b05f4c783458fd06737556 /graphics/video/smk_decoder.cpp
parent8bf0424832aaeb55f90af4332e5e02e4d69f58ce (diff)
downloadscummvm-rg350-5213cf9aa21083b6a3f9557a0d75f608913625a2.tar.gz
scummvm-rg350-5213cf9aa21083b6a3f9557a0d75f608913625a2.tar.bz2
scummvm-rg350-5213cf9aa21083b6a3f9557a0d75f608913625a2.zip
Adding a SoundType parameter to SmackerDecoder, defaulting to kSFXSoundType
svn-id: r42887
Diffstat (limited to 'graphics/video/smk_decoder.cpp')
-rw-r--r--graphics/video/smk_decoder.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/video/smk_decoder.cpp b/graphics/video/smk_decoder.cpp
index 9db8f0c730..8952f553b7 100644
--- a/graphics/video/smk_decoder.cpp
+++ b/graphics/video/smk_decoder.cpp
@@ -348,8 +348,8 @@ uint32 BigHuffmanTree::getCode(BitStream &bs) {
return v;
}
-SmackerDecoder::SmackerDecoder(Audio::Mixer *mixer)
- : _audioStarted(false), _audioStream(0), _mixer(mixer) {
+SmackerDecoder::SmackerDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType)
+ : _audioStarted(false), _audioStream(0), _mixer(mixer), _soundType(soundType) {
}
SmackerDecoder::~SmackerDecoder() {
@@ -583,7 +583,7 @@ bool SmackerDecoder::decodeNextFrame() {
}
if (!_audioStarted) {
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_audioHandle, _audioStream, -1, 255);
+ _mixer->playInputStream(_soundType, &_audioHandle, _audioStream, -1, 255);
_audioStarted = true;
}
} else {