aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/smush/smush_mixer.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-05-18 21:46:07 +0000
committerTorbjörn Andersson2006-05-18 21:46:07 +0000
commit2531fd58737b1e02b32f496ac891e5a96bf95828 (patch)
tree4b05196eebcff9bd67618bc809d98dee18db1b0a /engines/scumm/smush/smush_mixer.cpp
parent4ead8dff26c85f76ffcb46e35f8ed8684664713a (diff)
downloadscummvm-rg350-2531fd58737b1e02b32f496ac891e5a96bf95828.tar.gz
scummvm-rg350-2531fd58737b1e02b32f496ac891e5a96bf95828.tar.bz2
scummvm-rg350-2531fd58737b1e02b32f496ac891e5a96bf95828.zip
Added player for the Kyra 3 VQA cutscenes, based on my earlier prototype. It
could use some cleanup, and there are a couple of TODOs sprinkled throughout the code, but it seems to work reasonably well. Until the Kyra 3 main menu is implemented, it won't actually be used though. It uses the appendable audio stream class, which I have moved out of the SCUMM engine. svn-id: r22526
Diffstat (limited to 'engines/scumm/smush/smush_mixer.cpp')
-rw-r--r--engines/scumm/smush/smush_mixer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp
index a7b8fb9b27..b5002609df 100644
--- a/engines/scumm/smush/smush_mixer.cpp
+++ b/engines/scumm/smush/smush_mixer.cpp
@@ -129,7 +129,7 @@ bool SmushMixer::handleFrame() {
if (_mixer->isReady()) {
if (!_channels[i].stream) {
- _channels[i].stream = makeAppendableAudioStream(rate, flags, 500000);
+ _channels[i].stream = Audio::makeAppendableAudioStream(rate, flags, 500000);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_channels[i].handle, _channels[i].stream);
}
_mixer->setChannelVolume(_channels[i].handle, vol);