diff options
author | Johannes Schickel | 2011-07-10 18:14:42 +0200 |
---|---|---|
committer | Johannes Schickel | 2011-07-10 18:14:42 +0200 |
commit | 5f5daadedbd3dafa80836d6c9a2c865ce0a22f8b (patch) | |
tree | 2c45621ba627bceaa477ee7539ed0035b9f105e3 /engines | |
parent | adb2bbbb5902f0cb9f9c6ca6db81d57b723e1a23 (diff) | |
download | scummvm-rg350-5f5daadedbd3dafa80836d6c9a2c865ce0a22f8b.tar.gz scummvm-rg350-5f5daadedbd3dafa80836d6c9a2c865ce0a22f8b.tar.bz2 scummvm-rg350-5f5daadedbd3dafa80836d6c9a2c865ce0a22f8b.zip |
SCUMM: Let PC Speaker output be controlable via music volume.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/scumm/imuse/pcspk.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/scumm/imuse/pcspk.cpp b/engines/scumm/imuse/pcspk.cpp index 1b8afcabe5..51f6950bf5 100644 --- a/engines/scumm/imuse/pcspk.cpp +++ b/engines/scumm/imuse/pcspk.cpp @@ -53,7 +53,11 @@ int PcSpkDriver::open() { _lastActiveChannel = 0; _lastActiveOut = 0; - _mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); + // We set the output sound type to music here to allow sound volume + // adjustment. The drawback here is that we can not control the music and + // sfx separately here. But the AdLib output has the same issue so it + // should not be that bad. + _mixer->playStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); return 0; } |