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 /sky | |
| 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 'sky')
| -rw-r--r-- | sky/sky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp index 9a2fdc6ce1..80d2e05f03 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -239,8 +239,8 @@ int SkyEngine::init(GameDetector &detector) { if (!_mixer->isReady()) warning("Sound initialisation failed"); - _mixer->setVolume(ConfMan.getInt("sfx_volume")); - _mixer->setMusicVolume(ConfMan.getInt("music_volume")); + _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume")); + _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume")); _floppyIntro = ConfMan.getBool("alt_intro"); _skyDisk = new Disk(_gameDataPath); |