diff options
| author | Max Horn | 2004-12-27 00:27:00 +0000 |
|---|---|---|
| committer | Max Horn | 2004-12-27 00:27:00 +0000 |
| commit | 67b311713d8f4cfcd460a9649e0075f24278a048 (patch) | |
| tree | b3cc2c445a34084ab1baa645c1ae818c44268eff /scumm/smush/smush_mixer.cpp | |
| parent | 6670b2969a3669ae7bda7103407e8e5e22c2916a (diff) | |
| download | scummvm-rg350-67b311713d8f4cfcd460a9649e0075f24278a048.tar.gz scummvm-rg350-67b311713d8f4cfcd460a9649e0075f24278a048.tar.bz2 scummvm-rg350-67b311713d8f4cfcd460a9649e0075f24278a048.zip | |
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
Diffstat (limited to 'scumm/smush/smush_mixer.cpp')
| -rw-r--r-- | scumm/smush/smush_mixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |