From 67b311713d8f4cfcd460a9649e0075f24278a048 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 27 Dec 2004 00:27:00 +0000 Subject: Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type svn-id: r16330 --- scumm/smush/smush_mixer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scumm/smush/smush_mixer.cpp') diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index f7309cb87e..8378200ecd 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -122,7 +122,7 @@ bool SmushMixer::handleFrame() { if (_mixer->isReady()) { if (!_channels[i].handle.isActive()) { _channels[i].stream = makeAppendableAudioStream(rate, flags, 500000); - _mixer->playInputStream(&_channels[i].handle, _channels[i].stream, false); + _mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_channels[i].handle, _channels[i].stream); } _mixer->setChannelVolume(_channels[i].handle, vol); _mixer->setChannelBalance(_channels[i].handle, pan); -- cgit v1.2.3